1.0.1 stable on amd64, backported some changes from the 1.4.2 ebuild to the 1.0.1 ebuild

(Portage version: 2.0.51.19)

3 files changed, 20 insertions, 15 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 151c00cc2f44..ec8b7c97546e 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,10 @@
 # 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.31 2005/04/18 17:46:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.32 2005/04/22 15:18:46 luckyduck Exp $
+
+  22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> mkvtoolnix-1.0.1.ebuild:
+  1.0.1 stable on amd64, backported some changes from the 1.4.2 ebuild to the
+  1.0.1 ebuild
 
   18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
   +files/mkvtoolnix-configure-checks.patch, mkvtoolnix-1.4.2.ebuild:
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index b3bbf7364d64..939487f84705 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,12 +1,12 @@
-MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
-MD5 240c69ba609af9182deed35a0ba20453 mkvtoolnix-0.9.5-r1.ebuild 1274
+MD5 7aaeae8a12a965d8ef652c96ba26a69f mkvtoolnix-1.0.1.ebuild 1084
 MD5 9d34018fdafbef883f178c4e97389721 mkvtoolnix-0.9.7-r1.ebuild 1192
-MD5 66624191f93095d7549ad7eaf9588106 mkvtoolnix-1.0.1.ebuild 1133
 MD5 2111e7877c397a87b8e5466ed1c928eb mkvtoolnix-1.4.2.ebuild 1609
-MD5 f4699d0f11042d3ebd877af445c5379d ChangeLog 4993
-MD5 c5f6f35c4f302986ebe5e4e8741554c9 files/configure-wx_config.patch 1285
+MD5 240c69ba609af9182deed35a0ba20453 mkvtoolnix-0.9.5-r1.ebuild 1274
+MD5 1a0810ba2cac073c82ab638423b4d132 ChangeLog 5164
+MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
 MD5 2884e660a170f43abfa8d7634cebec36 files/digest-mkvtoolnix-0.9.5-r1 69
 MD5 098605d9da74ba7e766f45d74b6705ff files/digest-mkvtoolnix-0.9.7-r1 69
+MD5 e7fad70f0521de5b83e98ff6955408a7 files/mkvtoolnix-configure-checks.patch 1092
+MD5 c5f6f35c4f302986ebe5e4e8741554c9 files/configure-wx_config.patch 1285
 MD5 ad428bfa241077dcaf0763b2e5a1462a files/digest-mkvtoolnix-1.0.1 69
 MD5 f54516810bdfda76c7859d328889f01f files/digest-mkvtoolnix-1.4.2 69
-MD5 e7fad70f0521de5b83e98ff6955408a7 files/mkvtoolnix-configure-checks.patch 1092
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.0.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.0.1.ebuild
index befd1c66b160..494646d7b2dc 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.2 2005/03/11 18:55:16 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.0.1.ebuild,v 1.3 2005/04/22 15:18:46 luckyduck Exp $
 
 inherit eutils wxwidgets
 
@@ -10,18 +10,19 @@ 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"
+KEYWORDS="x86 amd64"
+IUSE="gtk2 X 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 )
+	media-libs/libogg
+	media-libs/libvorbis
 	dev-libs/expat
 	app-arch/bzip2
 	sys-libs/zlib
-	dev-libs/lzo"
+	dev-libs/lzo
+	X? ( >=x11-libs/wxGTK-2.4.2-r2 )
+	flac? ( >=media-libs/flac-1.1.0 )"
 
 src_compile() {
 	if use X ; then
@@ -37,6 +38,6 @@ src_compile() {
 
 src_install() {
 	einstall || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
+	dodoc AUTHORS ChangeLog INSTALL README TODO
 	dohtml doc/mkvmerge-gui.html doc/images/*
 }