9 files changed, 16 insertions, 110 deletions
diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 4791588170c1..9838d6f88ebf 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.29 2005/03/11 18:55:16 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.30 2005/04/18 16:54:52 luckyduck Exp $
+
+*mkvtoolnix-1.4.2 (18 Apr 2005)
+
+  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -mkvtoolnix-0.9.4-r1.ebuild, -mkvtoolnix-1.0.ebuild,
+  -mkvtoolnix-1.4.0.ebuild, +mkvtoolnix-1.4.2.ebuild:
+  new upstream version, fixes #85078. also did some cleanup
 
 *mkvtoolnix-1.4.0 (11 Mar 2005)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 1a48ce3b3493..2d6b33481b4e 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,24 +2,20 @@
 Hash: SHA1
 
 MD5 66624191f93095d7549ad7eaf9588106 mkvtoolnix-1.0.1.ebuild 1133
-MD5 89ef0b161ba34256e66f4b0120dfbe03 mkvtoolnix-0.9.4-r1.ebuild 1274
 MD5 9d34018fdafbef883f178c4e97389721 mkvtoolnix-0.9.7-r1.ebuild 1192
-MD5 6805982b91209ef5ecd1cdffce63f81c mkvtoolnix-1.0.ebuild 1227
-MD5 13835751fd016cb5b9852d49f33e8ab9 mkvtoolnix-1.4.0.ebuild 1134
+MD5 4e741e0540d201ac85bc03c1cd8c6b19 mkvtoolnix-1.4.2.ebuild 1134
 MD5 240c69ba609af9182deed35a0ba20453 mkvtoolnix-0.9.5-r1.ebuild 1274
-MD5 5464ace5f81821caa2d744aefb285767 ChangeLog 4355
+MD5 12180c8bb89dc277064ecfc7dd3c4b6f ChangeLog 4610
 MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
-MD5 3279a2ed803d5352c6416c3d09881afc files/digest-mkvtoolnix-0.9.4-r1 69
 MD5 2884e660a170f43abfa8d7634cebec36 files/digest-mkvtoolnix-0.9.5-r1 69
 MD5 098605d9da74ba7e766f45d74b6705ff files/digest-mkvtoolnix-0.9.7-r1 69
-MD5 f23f3ecb5f50c579b6e5c7d976117363 files/digest-mkvtoolnix-1.0 67
 MD5 c5f6f35c4f302986ebe5e4e8741554c9 files/configure-wx_config.patch 1285
 MD5 ad428bfa241077dcaf0763b2e5a1462a files/digest-mkvtoolnix-1.0.1 69
-MD5 855bdc9b327db7bf9c0a5880aa49ea3d files/digest-mkvtoolnix-1.4.0 69
+MD5 f54516810bdfda76c7859d328889f01f files/digest-mkvtoolnix-1.4.2 69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD4DBQFCMema06ebR+OMO78RAghGAJirUR4ptQU68osal9sFyCTNS60QAKCKrXr0
-SaQ5LHeZG92rM+1kQZysCg==
-=UXDE
+iD8DBQFCY+Zw06ebR+OMO78RAsfiAJ468tLTn4YGhzkX7qgU9/KaI9OCWwCfcusV
+PpgF3MORw1uvT5OpOZRUnug=
+=NNJG
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.4-r1 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.4-r1
deleted file mode 100644
index 93f5f24b709d..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b2194fa0d78670d18e6aff0359b7dc1 mkvtoolnix-0.9.4.tar.bz2 499321
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.0 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.0
deleted file mode 100644
index aef52dae8b5f..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b2161121d354e9f46956be82749ceea2 mkvtoolnix-1.0.tar.bz2 519780
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.0 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.0
deleted file mode 100644
index 555107c1e913..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 593c9f51ff99c90a017117bad2edd3e4 mkvtoolnix-1.4.0.tar.bz2 632069
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.2 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.2
new file mode 100644
index 000000000000..f75f31cdb610
--- /dev/null
+++ b/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.2
@@ -0,0 +1 @@
+MD5 17d66aae6a1c6ac8dcd36f619a385fe1 mkvtoolnix-1.4.2.tar.bz2 638250
diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.9.4-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.9.4-r1.ebuild
deleted file mode 100644
index ee49b163a12c..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.2 2005/01/29 13:44:05 luckyduck 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 X ; then
-		if ! use gtk2 ; then
-			need-wxwidgets gtk
-		else
-			need-wxwidgets gtk2
-		fi
-	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/*
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.0.ebuild
deleted file mode 100644
index 772b6a4af7c4..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.0.ebuild,v 1.2 2005/01/29 13:44:05 luckyduck 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"
-IUSE="gtk2 X oggvorbis flac"
-
-DEPEND=">=dev-libs/libebml-0.7.2
-	>=media-libs/libmatroska-0.7.4
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
-	X? ( >=x11-libs/wxGTK-2.4.2-r2 )
-	flac? ( >=media-libs/flac-1.1.0 )
-	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}"
-}
-
-src_compile() {
-	if use X ; then
-		if ! use gtk2 ; then
-			need-wxwidgets gtk
-		else
-			need-wxwidgets gtk2
-		fi
-	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/*
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.4.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.4.2.ebuild
index eaa25abfcd9e..bed687ba1206 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-1.4.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.4.0.ebuild,v 1.1 2005/03/11 18:55:16 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.4.2.ebuild,v 1.1 2005/04/18 16:54:52 luckyduck Exp $
 
 inherit eutils wxwidgets