removed old versions, marked 1.0.1 stable on x86 and added 1.4.0 with ~amd64 KEYWORD.

(Portage version: 2.0.51.19)

23 files changed, 60 insertions, 382 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 8dd0a1901d0c..4791588170c1 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,17 @@
 # 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.28 2005/01/29 13:44:05 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.29 2005/03/11 18:55:16 luckyduck Exp $
+
+*mkvtoolnix-1.4.0 (11 Mar 2005)
+
+  11 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -mkvtoolnix-0.8.1.ebuild,
+  -mkvtoolnix-0.8.5.ebuild, -mkvtoolnix-0.8.7.ebuild,
+  -mkvtoolnix-0.8.8.ebuild, -mkvtoolnix-0.8.9.ebuild,
+  -mkvtoolnix-0.9.0.ebuild, -mkvtoolnix-0.9.1.ebuild,
+  -mkvtoolnix-0.9.2.ebuild, -mkvtoolnix-0.9.3.ebuild, mkvtoolnix-1.0.1.ebuild,
+  +mkvtoolnix-1.4.0.ebuild:
+  removed old versions, marked 1.0.1 stable on x86 and added 1.4.0 with ~amd64
+  KEYWORD.
 
 *mkvtoolnix-1.0.1 (29 Jan 2005)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index f45f383281f3..11d1a5e9c896 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,16 +1,8 @@
-MD5 ac9f321a31e93358f52704d12335aa47 mkvtoolnix-0.8.1.ebuild 1232
-MD5 99823ce78410d0f469077af53fd5077b mkvtoolnix-1.0.1.ebuild 1127
+MD5 a2a8935e9491d87bba59d60f99d850a5 mkvtoolnix-1.0.1.ebuild 1126
 MD5 89ef0b161ba34256e66f4b0120dfbe03 mkvtoolnix-0.9.4-r1.ebuild 1274
-MD5 debba9dcefa4a61434ff1206fd7c7ae1 mkvtoolnix-0.8.8.ebuild 1240
-MD5 f2f3da784c23b327d88e4e731ad569ec mkvtoolnix-0.9.1.ebuild 1241
 MD5 9d34018fdafbef883f178c4e97389721 mkvtoolnix-0.9.7-r1.ebuild 1192
-MD5 90fe74e98576e45b457c57995664a292 mkvtoolnix-0.8.5.ebuild 1232
-MD5 3a9103f733c27b8203c03832d5ecf1fb mkvtoolnix-0.9.3.ebuild 1245
 MD5 6805982b91209ef5ecd1cdffce63f81c mkvtoolnix-1.0.ebuild 1227
-MD5 32a65919de9540cea46b533cf3963b0e mkvtoolnix-0.8.7.ebuild 1232
-MD5 7a473d23772d2ece332be0e744d87a2a mkvtoolnix-0.9.0.ebuild 1241
-MD5 b52b34adf96dca61cbf0b53392340a23 mkvtoolnix-0.8.9.ebuild 1241
-MD5 10cba0c7ca6bdb115202f4c7ff72805c mkvtoolnix-0.9.2.ebuild 1245
+MD5 ad3705548af08fa58ac92e51ac216f86 mkvtoolnix-1.4.0.ebuild 1127
 MD5 240c69ba609af9182deed35a0ba20453 mkvtoolnix-0.9.5-r1.ebuild 1274
 MD5 58476e240e003ea65e6d19704d4ebcaf ChangeLog 3884
 MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
@@ -19,13 +11,5 @@ 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 cff9557227e88163e8117b2c72d514a0 files/digest-mkvtoolnix-0.8.1 69
-MD5 b6700b3ceb68fb86a8c19039180d4766 files/digest-mkvtoolnix-0.8.5 69
-MD5 f005d31d1d31828d70e7bd748af89f51 files/digest-mkvtoolnix-0.8.7 69
-MD5 a7e203ac13a7fd3575c2f62502ece1dc files/digest-mkvtoolnix-0.8.8 69
-MD5 c4c0b94f18dc4db0f9f62d51b983a056 files/digest-mkvtoolnix-0.8.9 69
-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 ad428bfa241077dcaf0763b2e5a1462a files/digest-mkvtoolnix-1.0.1 69
+MD5 855bdc9b327db7bf9c0a5880aa49ea3d files/digest-mkvtoolnix-1.4.0 69
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.1 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.1
deleted file mode 100644
index 1232fdf8500b..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4ba356b09d120cb5e057ef513d975b68 mkvtoolnix-0.8.1.tar.bz2 455520
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.5 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.5
deleted file mode 100644
index 818da5e24240..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c7f2b5a8528356b7bb973c9ca47a1b2 mkvtoolnix-0.8.5.tar.bz2 472888
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.7 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.7
deleted file mode 100644
index 91e79b0db40c..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 229aed44408eaa73b7dc76af76a70aee mkvtoolnix-0.8.7.tar.bz2 477302
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.8 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.8
deleted file mode 100644
index f4374cb07425..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 37cf159f59c2a56e535dd47a7c92a7ff mkvtoolnix-0.8.8.tar.bz2 479167
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.9 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.9
deleted file mode 100644
index 3427ac49ccd5..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.8.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d08798fe9c9306967d9cde0badb9d74d mkvtoolnix-0.8.9.tar.bz2 480771
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.0 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.0
deleted file mode 100644
index 88b60f9b1359..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42fb973aee98974f50da619f26249461 mkvtoolnix-0.9.0.tar.bz2 483208
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.1 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.1
deleted file mode 100644
index 1b8dd54255b0..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5283894a67a18dfb4a4c9629321faa26 mkvtoolnix-0.9.1.tar.bz2 463165
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.2 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.2
deleted file mode 100644
index 8b2d0df7c390..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 418ecec8f247f53d8a7b49e3e2d8d8a8 mkvtoolnix-0.9.2.tar.bz2 481348
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.3 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.3
deleted file mode 100644
index ae32f7ecfc0c..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ebdb8614247ae0abc65021d39821209f mkvtoolnix-0.9.3.tar.bz2 494512
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.0 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.0
new file mode 100644
index 000000000000..555107c1e913
--- /dev/null
+++ b/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.0
@@ -0,0 +1 @@
+MD5 593c9f51ff99c90a017117bad2edd3e4 mkvtoolnix-1.4.0.tar.bz2 632069
diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.8.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.8.1.ebuild
deleted file mode 100644
index cce1f3b94739..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-0.8.1.ebuild
+++ /dev/null
@@ -1,39 +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.8.1.ebuild,v 1.7 2005/01/29 13:44:05 luckyduck Exp $
-
-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/old/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="X oggvorbis"
-
-DEPEND=">=dev-libs/libebml-0.6.3
-	>=media-libs/libmatroska-0.6.2
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
-	X? ( >=x11-libs/wxGTK-2.4.1 )
-	dev-libs/expat
-	app-arch/bzip2
-	sys-libs/zlib
-	dev-libs/lzo"
-
-src_compile() {
-	local myconf=""
-
-	use oggvorbis || myconf="${myconf} --disable-oggtest \
-		--disable-vorbistest --without-ogg --without-vorbis"
-	./configure ${myconf} || die "configure died"
-
-	# v0.7.9 is missing "#include <errno.h>" in some files
-	MAKEOPTS="-j1"
-	emake CXX="${CXX} -include /usr/include/errno.h -include /usr/include/unistd.h" || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dohtml doc/mkvmerge-gui.html
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.8.5.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.8.5.ebuild
deleted file mode 100644
index 8e91a1bd0dbe..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-0.8.5.ebuild
+++ /dev/null
@@ -1,39 +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.8.5.ebuild,v 1.6 2005/01/29 13:44:05 luckyduck Exp $
-
-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/old/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="X oggvorbis"
-
-DEPEND=">=dev-libs/libebml-0.6.4
-	>=media-libs/libmatroska-0.6.3
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
-	X? ( >=x11-libs/wxGTK-2.4.1 )
-	dev-libs/expat
-	app-arch/bzip2
-	sys-libs/zlib
-	dev-libs/lzo"
-
-src_compile() {
-	local myconf=""
-
-	use oggvorbis || myconf="${myconf} --disable-oggtest \
-		--disable-vorbistest --without-ogg --without-vorbis"
-	./configure ${myconf} || die "configure died"
-
-	# v0.7.9 is missing "#include <errno.h>" in some files
-	MAKEOPTS="-j1"
-	emake CXX="${CXX} -include /usr/include/errno.h -include /usr/include/unistd.h" || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dohtml doc/mkvmerge-gui.html
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.8.7.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.8.7.ebuild
deleted file mode 100644
index 5e14a965cd4d..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-0.8.7.ebuild
+++ /dev/null
@@ -1,39 +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.8.7.ebuild,v 1.5 2005/01/29 13:44:05 luckyduck Exp $
-
-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/old/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="X oggvorbis"
-
-DEPEND=">=dev-libs/libebml-0.6.5
-	>=media-libs/libmatroska-0.6.3
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
-	X? ( >=x11-libs/wxGTK-2.4.1 )
-	dev-libs/expat
-	app-arch/bzip2
-	sys-libs/zlib
-	dev-libs/lzo"
-
-src_compile() {
-	local myconf=""
-
-	use oggvorbis || myconf="${myconf} --disable-oggtest \
-		--disable-vorbistest --without-ogg --without-vorbis"
-	./configure ${myconf} || die "configure died"
-
-	# v0.7.9 is missing "#include <errno.h>" in some files
-	MAKEOPTS="-j1"
-	emake CXX="${CXX} -include /usr/include/errno.h -include /usr/include/unistd.h" || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dohtml doc/mkvmerge-gui.html
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.8.8.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.8.8.ebuild
deleted file mode 100644
index 97c7a6429f71..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-0.8.8.ebuild
+++ /dev/null
@@ -1,39 +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.8.8.ebuild,v 1.7 2005/01/29 13:44:05 luckyduck Exp $
-
-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="X oggvorbis"
-
-DEPEND=">=dev-libs/libebml-0.7.0
-	>=media-libs/libmatroska-0.7.0
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
-	X? ( >=x11-libs/wxGTK-2.4.1 )
-	dev-libs/expat
-	app-arch/bzip2
-	sys-libs/zlib
-	dev-libs/lzo"
-
-src_compile() {
-	local myconf=""
-
-	use oggvorbis || myconf="${myconf} --disable-oggtest \
-		--disable-vorbistest --without-ogg --without-vorbis"
-	./configure ${myconf} || die "configure died"
-
-	# v0.7.9 is missing "#include <errno.h>" in some files
-	MAKEOPTS="-j1"
-	emake CXX="${CXX} -include /usr/include/errno.h -include /usr/include/unistd.h" || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dohtml doc/mkvmerge-gui.html
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.8.9.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.8.9.ebuild
deleted file mode 100644
index fea8410690cd..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-0.8.9.ebuild
+++ /dev/null
@@ -1,39 +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.8.9.ebuild,v 1.4 2005/01/29 13:44:05 luckyduck Exp $
-
-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="X oggvorbis"
-
-DEPEND=">=dev-libs/libebml-0.7.0
-	>=media-libs/libmatroska-0.7.0
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
-	X? ( >=x11-libs/wxGTK-2.4.1 )
-	dev-libs/expat
-	app-arch/bzip2
-	sys-libs/zlib
-	dev-libs/lzo"
-
-src_compile() {
-	local myconf=""
-
-	use oggvorbis || myconf="${myconf} --disable-oggtest \
-		--disable-vorbistest --without-ogg --without-vorbis"
-	./configure ${myconf} || die "configure died"
-
-	# v0.7.9 is missing "#include <errno.h>" in some files
-	MAKEOPTS="-j1"
-	emake CXX="${CXX} -include /usr/include/errno.h -include /usr/include/unistd.h" || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dohtml doc/mkvmerge-gui.html
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.9.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.9.0.ebuild
deleted file mode 100644
index 66ae5ee31c8d..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-0.9.0.ebuild
+++ /dev/null
@@ -1,39 +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.0.ebuild,v 1.4 2005/01/29 13:44:05 luckyduck Exp $
-
-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="X oggvorbis"
-
-DEPEND=">=dev-libs/libebml-0.7.0
-	>=media-libs/libmatroska-0.7.0
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
-	X? ( >=x11-libs/wxGTK-2.4.1 )
-	dev-libs/expat
-	app-arch/bzip2
-	sys-libs/zlib
-	dev-libs/lzo"
-
-src_compile() {
-	local myconf=""
-
-	use oggvorbis || myconf="${myconf} --disable-oggtest \
-		--disable-vorbistest --without-ogg --without-vorbis"
-	./configure ${myconf} || die "configure died"
-
-	# v0.7.9 is missing "#include <errno.h>" in some files
-	MAKEOPTS="-j1"
-	emake CXX="${CXX} -include /usr/include/errno.h -include /usr/include/unistd.h" || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dohtml doc/mkvmerge-gui.html
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.9.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.9.1.ebuild
deleted file mode 100644
index 8215051c0b24..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-0.9.1.ebuild
+++ /dev/null
@@ -1,39 +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.1.ebuild,v 1.4 2005/01/29 13:44:05 luckyduck Exp $
-
-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="X oggvorbis"
-
-DEPEND=">=dev-libs/libebml-0.7.0
-	>=media-libs/libmatroska-0.7.0
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
-	X? ( >=x11-libs/wxGTK-2.4.1 )
-	dev-libs/expat
-	app-arch/bzip2
-	sys-libs/zlib
-	dev-libs/lzo"
-
-src_compile() {
-	local myconf=""
-
-	use oggvorbis || myconf="${myconf} --disable-oggtest \
-		--disable-vorbistest --without-ogg --without-vorbis"
-	./configure ${myconf} || die "configure died"
-
-	# v0.7.9 is missing "#include <errno.h>" in some files
-	MAKEOPTS="-j1"
-	emake CXX="${CXX} -include /usr/include/errno.h -include /usr/include/unistd.h" || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dohtml doc/mkvmerge-gui.html
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.9.2.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.9.2.ebuild
deleted file mode 100644
index 17d512173782..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-0.9.2.ebuild
+++ /dev/null
@@ -1,39 +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.2.ebuild,v 1.2 2005/01/29 13:44:05 luckyduck Exp $
-
-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/old/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="X oggvorbis"
-
-DEPEND=">=dev-libs/libebml-0.7.0
-	>=media-libs/libmatroska-0.7.0
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
-	X? ( >=x11-libs/wxGTK-2.4.1 )
-	dev-libs/expat
-	app-arch/bzip2
-	sys-libs/zlib
-	dev-libs/lzo"
-
-src_compile() {
-	local myconf=""
-
-	use oggvorbis || myconf="${myconf} --disable-oggtest \
-		--disable-vorbistest --without-ogg --without-vorbis"
-	./configure ${myconf} || die "configure died"
-
-	# v0.7.9 is missing "#include <errno.h>" in some files
-	MAKEOPTS="-j1"
-	emake CXX="${CXX} -include /usr/include/errno.h -include /usr/include/unistd.h" || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dohtml doc/mkvmerge-gui.html
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-0.9.3.ebuild b/media-video/mkvtoolnix/mkvtoolnix-0.9.3.ebuild
deleted file mode 100644
index faaa0d116ed2..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-0.9.3.ebuild
+++ /dev/null
@@ -1,39 +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.3.ebuild,v 1.2 2005/01/29 13:44:05 luckyduck Exp $
-
-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/old/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="X oggvorbis"
-
-DEPEND=">=dev-libs/libebml-0.7.0
-	>=media-libs/libmatroska-0.7.0
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis media-libs/flac )
-	X? ( >=x11-libs/wxGTK-2.4.1 )
-	dev-libs/expat
-	app-arch/bzip2
-	sys-libs/zlib
-	dev-libs/lzo"
-
-src_compile() {
-	local myconf=""
-
-	use oggvorbis || myconf="${myconf} --disable-oggtest \
-		--disable-vorbistest --without-ogg --without-vorbis"
-	./configure ${myconf} || die "configure died"
-
-	# v0.7.9 is missing "#include <errno.h>" in some files
-	MAKEOPTS="-j1"
-	emake CXX="${CXX} -include /usr/include/errno.h -include /usr/include/unistd.h" || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dohtml doc/mkvmerge-gui.html
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.0.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.0.1.ebuild
index 9f6fb1503b3d..befd1c66b160 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-1.0.1.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.0.1.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.0.1.ebuild,v 1.1 2005/01/29 13:44:05 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.0.1.ebuild,v 1.2 2005/03/11 18:55:16 luckyduck Exp $
 
 inherit eutils wxwidgets
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE="gtk2 X oggvorbis flac"
 
 DEPEND=">=dev-libs/libebml-0.7.2
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.4.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.4.0.ebuild
new file mode 100644
index 000000000000..eaa25abfcd9e
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.4.0.ebuild
@@ -0,0 +1,42 @@
+# 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 $
+
+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 ~amd64"
+IUSE="gtk2 X oggvorbis flac"
+
+DEPEND=">=dev-libs/libebml-0.7.3
+	>=media-libs/libmatroska-0.7.5
+	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_compile() {
+	if use X ; then
+		if ! use gtk2 ; then
+			need-wxwidgets gtk
+		else
+			need-wxwidgets gtk2
+		fi
+	fi
+	econf || die "./configure died"
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
+	dohtml doc/mkvmerge-gui.html doc/images/*
+}