Version bumped. Closes 58284.

5 files changed, 95 insertions, 2 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 043b80829674..bf5feeef81ec 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.19 2004/08/01 12:02:59 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.20 2004/08/25 19:25:53 mholzer Exp $
+
+*mkvtoolnix-0.9.4 (25 Aug 2004)
+
+  25 Aug 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.9.4.ebuild,
+  files/configure-wx_config.patch:
+  Version bumped. Closes 58284.
 
 *mkvtoolnix-0.9.3 (01 Aug 2004)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 10482d2107f3..06fc5e66d3d2 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,4 +1,4 @@
-MD5 fe6a3da46290b09755b0145389add0c6 ChangeLog 2611
+MD5 1004a8f56d820e7f848af1c342b45bad ChangeLog 2787
 MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
 MD5 022df90d4ffca184c10deb69f600a2dc mkvtoolnix-0.8.5.ebuild 1232
 MD5 dd29dc17912c78d5aa0aef1a5b6f9b14 mkvtoolnix-0.8.7.ebuild 1228
@@ -9,6 +9,7 @@ MD5 8ca9bbc2b315bcf75fb687f3108a025a mkvtoolnix-0.9.0.ebuild 1240
 MD5 2148ef238a30d221779161bb38dfc592 mkvtoolnix-0.9.1.ebuild 1240
 MD5 996b7a8c02caa222056b3c04d1f0a3f0 mkvtoolnix-0.9.2.ebuild 1243
 MD5 8cff583ab1ab30a4ab487f9fc97ba608 mkvtoolnix-0.9.3.ebuild 1243
+MD5 66e2bee670cd16dfe72be006a8e4c07a mkvtoolnix-0.9.4.ebuild 1243
 MD5 f005d31d1d31828d70e7bd748af89f51 files/digest-mkvtoolnix-0.8.7 69
 MD5 cff9557227e88163e8117b2c72d514a0 files/digest-mkvtoolnix-0.8.1 69
 MD5 a7e203ac13a7fd3575c2f62502ece1dc files/digest-mkvtoolnix-0.8.8 69
@@ -18,3 +19,5 @@ MD5 cb49b083ecab13d41512758b8e6f9b5a files/digest-mkvtoolnix-0.9.0 69
 MD5 6259fb15b7e8006ee42d0e3eebb86f05 files/digest-mkvtoolnix-0.9.1 69
 MD5 f5c6d64133c8a5f1916f1efa9c618035 files/digest-mkvtoolnix-0.9.2 69
 MD5 1ae151d6db180725ae082124b335ab82 files/digest-mkvtoolnix-0.9.3 69
+MD5 3279a2ed803d5352c6416c3d09881afc files/digest-mkvtoolnix-0.9.4 69
+MD5 c5f6f35c4f302986ebe5e4e8741554c9 files/configure-wx_config.patch 1285
diff --git a/media-video/mkvtoolnix/files/configure-wx_config.patch b/media-video/mkvtoolnix/files/configure-wx_config.patch
new file mode 100644
index 000000000000..86a6660a7f02
--- /dev/null
+++ b/media-video/mkvtoolnix/files/configure-wx_config.patch
@@ -0,0 +1,37 @@
+--- /var/tmp/portage/mkvtoolnix-0.9.4/work/mkvtoolnix-0.9.4/configure	2004-07-25 03:48:01.000000000 -0700
++++ /tmp/configure	2004-08-11 09:42:34.595046336 -0700
+@@ -6037,8 +6037,8 @@
+ 
+   echo "$as_me:$LINENO: checking for wxWindows" >&5
+ echo $ECHO_N "checking for wxWindows... $ECHO_C" >&6
+-  if wx-config --cxxflags > /dev/null 2>&1; then
+-    wxwversion=`wx-config --version`
++  if $WX_CONFIG --cxxflags > /dev/null 2>&1; then
++    wxwversion=`$WX_CONFIG --version`
+     wxw_ver_req_major=2
+     wxw_ver_req_minor=4
+     wxw_ver_req_micro=0
+@@ -6062,9 +6062,9 @@
+     fi
+ 
+     if test "$wxwver_ok" = "1" ; then
+-      WXWINDOWS_CFLAGS=`wx-config --cxxflags`
+-      WXWINDOWS_LDFLAGS=`wx-config --ldflags`
+-      WXWINDOWS_LIBS=`wx-config --libs`
++      WXWINDOWS_CFLAGS=`$WX_CONFIG --cxxflags`
++      WXWINDOWS_LDFLAGS=`$WX_CONFIG --ldflags`
++      WXWINDOWS_LIBS=`$WX_CONFIG --libs`
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_WXWINDOWS 1
+@@ -6080,8 +6080,8 @@
+ echo "${ECHO_T}no: version $wxwversion is too old" >&6
+     fi
+   else
+-    echo "$as_me:$LINENO: result: no: wx-config was not found" >&5
+-echo "${ECHO_T}no: wx-config was not found" >&6
++    echo "$as_me:$LINENO: result: no: $WX_CONFIG was not found" >&5
++echo "${ECHO_T}no: $WX_CONFIG was not found" >&6
+   fi
+ 
+ 
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.4 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.4
new file mode 100644
index 000000000000..93f5f24b709d
--- /dev/null
+++ b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.4
@@ -0,0 +1 @@
+MD5 9b2194fa0d78670d18e6aff0359b7dc1 mkvtoolnix-0.9.4.tar.bz2 499321
diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.9.4.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.9.4.ebuild
new file mode 100644
index 000000000000..4f95b3b3c4d4
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-0.9.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-0.9.4.ebuild,v 1.1 2004/08/25 19:25:53 mholzer Exp $
+
+inherit eutils 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="~x86 ~ppc ~amd64"
+IUSE="gtk2 X oggvorbis"
+
+DEPEND=">=dev-libs/libebml-0.7.1
+	>=media-libs/libmatroska-0.7.1
+	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
+	X? ( >=x11-libs/wxGTK-2.4.2-r2 )
+	dev-libs/expat
+	app-arch/bzip2
+	sys-libs/zlib
+	dev-libs/lzo"
+
+src_unpack() {
+	unpack ${A} || die "Failed to unpack ${A}"
+	cd ${S} || die "Failed to cd ${S}"
+	epatch ${FILESDIR}/configure-wx_config.patch || die "epatch failed"
+
+}
+
+src_compile() {
+	if ! use gtk2 ; then
+		need-wxwidgets gtk
+	else
+		need-wxwidgets gtk2
+	fi
+	./configure || die "configure died"
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall || die "install failed"
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dohtml doc/mkvmerge-gui.html doc/images/*
+}