Bump to 1.6.0 version as per bug #105190.

(Portage version: 2.0.53_rc6)

4 files changed, 77 insertions, 23 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 71607ecbb115..6b6a49a11cbb 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2005/09/03 10:24:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.39 2005/10/30 23:37:24 flameeyes Exp $
+
+*mkvtoolnix-1.6.0 (30 Oct 2005)
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +mkvtoolnix-1.6.0.ebuild:
+  Bump to 1.6.0 version as per bug #105190.
 
 *mkvtoolnix-1.5.5 (03 Sep 2005)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 70a33148da5a..debf2fca40b7 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,28 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8c2285bea42cc96bb3176c550504fb04 ChangeLog 6311
-MD5 cd9c267112d63ce7fe68d16e8342464f mkvtoolnix-1.4.2-r1.ebuild 1733
-MD5 240c69ba609af9182deed35a0ba20453 mkvtoolnix-0.9.5-r1.ebuild 1274
-MD5 781db6142cda972ade21b1f81f406e61 mkvtoolnix-0.9.7-r1.ebuild 1187
-MD5 e5331199a530acaf9e6b060be9ece0cc mkvtoolnix-1.0.1.ebuild 1078
-MD5 a36ff9cb50b4631ffe840060d80d168c mkvtoolnix-1.4.2.ebuild 1609
-MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
-MD5 0a5fc5681b67e01a3facaa9e2fd4877a mkvtoolnix-1.5.5.ebuild 1481
-MD5 4e4b8d4f8bfbd8fa31ab439c5b7ca6e8 mkvtoolnix-1.5.0.ebuild 1481
-MD5 59e0afdc0467751917489792dcc4fab8 files/digest-mkvtoolnix-1.4.2-r1 147
 MD5 c5f6f35c4f302986ebe5e4e8741554c9 files/configure-wx_config.patch 1285
 MD5 2884e660a170f43abfa8d7634cebec36 files/digest-mkvtoolnix-0.9.5-r1 69
+MD5 098605d9da74ba7e766f45d74b6705ff files/digest-mkvtoolnix-0.9.7-r1 69
+MD5 ad428bfa241077dcaf0763b2e5a1462a files/digest-mkvtoolnix-1.0.1 69
+MD5 f54516810bdfda76c7859d328889f01f files/digest-mkvtoolnix-1.4.2 69
+MD5 59e0afdc0467751917489792dcc4fab8 files/digest-mkvtoolnix-1.4.2-r1 147
 MD5 476efe37d5da5fcfa589354b4d5b8ee7 files/digest-mkvtoolnix-1.5.0 69
 MD5 dc82e2c687345769c53a013331f2abb3 files/digest-mkvtoolnix-1.5.5 69
-MD5 ad428bfa241077dcaf0763b2e5a1462a files/digest-mkvtoolnix-1.0.1 69
+MD5 91ac5c9285fd2276b87d33e01746488a files/digest-mkvtoolnix-1.6.0 69
 MD5 e7fad70f0521de5b83e98ff6955408a7 files/mkvtoolnix-configure-checks.patch 1092
-MD5 f54516810bdfda76c7859d328889f01f files/digest-mkvtoolnix-1.4.2 69
-MD5 098605d9da74ba7e766f45d74b6705ff files/digest-mkvtoolnix-0.9.7-r1 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDGXnkj5H05b2HAEkRAqqBAJ4h7Xlz0txNm9BDQ+uAE6sj54PfOQCeLZ4x
-8S2Zk5to1neMClwruZ+0ZxE=
-=2R3N
------END PGP SIGNATURE-----
+MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
+MD5 240c69ba609af9182deed35a0ba20453 mkvtoolnix-0.9.5-r1.ebuild 1274
+MD5 781db6142cda972ade21b1f81f406e61 mkvtoolnix-0.9.7-r1.ebuild 1187
+MD5 e5331199a530acaf9e6b060be9ece0cc mkvtoolnix-1.0.1.ebuild 1078
+MD5 cd9c267112d63ce7fe68d16e8342464f mkvtoolnix-1.4.2-r1.ebuild 1733
+MD5 a36ff9cb50b4631ffe840060d80d168c mkvtoolnix-1.4.2.ebuild 1609
+MD5 4e4b8d4f8bfbd8fa31ab439c5b7ca6e8 mkvtoolnix-1.5.0.ebuild 1481
+MD5 0a5fc5681b67e01a3facaa9e2fd4877a mkvtoolnix-1.5.5.ebuild 1481
+MD5 0a5fc5681b67e01a3facaa9e2fd4877a mkvtoolnix-1.6.0.ebuild 1481
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.6.0 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.6.0
new file mode 100644
index 000000000000..93502fd953e2
--- /dev/null
+++ b/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.6.0
@@ -0,0 +1 @@
+MD5 e71480ccf5b8d9155ac7c6e52c4789d3 mkvtoolnix-1.6.0.tar.bz2 652756
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild
new file mode 100644
index 000000000000..65eb7d55c597
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild
@@ -0,0 +1,55 @@
+# 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.6.0.ebuild,v 1.1 2005/10/30 23:37:24 flameeyes 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="~amd64 ~ppc ~x86"
+IUSE="gtk2 wxwindows flac bzip2 lzo"
+
+DEPEND=">=dev-libs/libebml-0.7.3
+	>=media-libs/libmatroska-0.7.5
+	media-libs/libogg
+	media-libs/libvorbis
+	dev-libs/expat
+	sys-libs/zlib
+	wxwindows? ( =x11-libs/wxGTK-2.6* )
+	flac? ( >=media-libs/flac-1.1.0 )
+	bzip2? ( app-arch/bzip2 )
+	lzo? ( dev-libs/lzo )"
+
+pkg_setup() {
+	WX_GTK_VER="2.6"
+	if use wxwindows; then
+		if ! use gtk2 ; then
+			need-wxwidgets gtk || die "You must compile wxGTK without wx_nogtk useflag."
+		else
+			need-wxwidgets gtk2 || die "You must compile wxGTK with gtk2 useflag."
+		fi
+	elif use gtk2; then
+		einfo "You won't have gtk2 support as you requested not to use wxwindows."
+	fi
+}
+
+src_compile() {
+	econf \
+		$(use_enable lzo) \
+		$(use_enable bzip2 bz2) \
+		$(use_enable wxwindows gui) \
+		$(use_with flac) \
+		|| die "./configure died"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+	dodoc AUTHORS ChangeLog README TODO
+	dohtml doc/mkvmerge-gui.html doc/images/*
+}