Version bump

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

3 files changed, 76 insertions, 12 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 2c03429953e1..5bccd29db117 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.101 2009/03/10 02:06:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.102 2009/04/15 05:48:12 yngwin Exp $
+
+*mkvtoolnix-2.6.0 (13 Apr 2009)
+
+  13 Apr 2009; Ben de Groot <yngwin@gentoo.org> +mkvtoolnix-2.6.0.ebuild:
+  Version bump
 
 *mkvtoolnix-2.5.3 (10 Mar 2009)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index f187e67640be..c07714d976ec 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST mkvtoolnix-2.4.0.tar.bz2 801465 RMD160 3101e05f763a00807da593ac6ea6441f010ad97c SHA1 1220475a7e9753aee8f17fb0dcc121fed6b98284 SHA256 80434538df5d46d71c873974707172c7d19e06ef4ceff9ff1cb70117ccd19185
 DIST mkvtoolnix-2.4.1.tar.bz2 828533 RMD160 52b17e5963158e05e356e3ed64605d614b57f155 SHA1 7c41131f07071a02a0f2fe4660e63b5ecb7d417b SHA256 30781153e065a7fa92675c1d4d942b7878e0032bd328d0420fa24ba965c53017
 DIST mkvtoolnix-2.4.2.tar.bz2 850307 RMD160 569db0ed2ddafc4def19fce6eab5dd7c3efc8043 SHA1 56b109ba7acbea940d9db57a0da7482faf03bd3f SHA256 7d129b7cad4bf5487e77a74c16fb62865b46f742fd3f408f178f0c0c6758c564
 DIST mkvtoolnix-2.5.1.tar.bz2 855959 RMD160 d8f340962fcc2279d3aeb273dbf5751b60e671dc SHA1 895363ffc2dd7c0c50073042c45190d265c846d1 SHA256 0d52a785015c2c4bc36d440028d9b8aa31ffe9304442a605a35a18dc8a67b62b
 DIST mkvtoolnix-2.5.3.tar.bz2 858590 RMD160 24460d22deb882bfc8a2a761b50cc9f9906d1e93 SHA1 425c8a931b4554b3e659d2b36b436eb89c2703c7 SHA256 96ef5fa57f89a1d21dfe25a14255e22ac9f2b3234a8afdab947172db0737f666
+DIST mkvtoolnix-2.6.0.tar.bz2 946895 RMD160 f99705973457e242ddfb743a9071ccddb8c5b19c SHA1 abed681ea0b7fa48a9e1e89d43e4ca4f91d1ef7a SHA256 e4f456f13c48a530c0680c2e9a29d95981bddaa566d3fb60b309549eba9d0b03
 EBUILD mkvtoolnix-2.4.0.ebuild 1664 RMD160 f0639e1bb1ca5ec57fffa7eafaef05265dc26a7a SHA1 48d8a2a3bb498590f802eff933aee63eddef28a8 SHA256 c71fb2436a566485e72685f7b80e6d40d5ce1c4859a46143a6b8eae0d2c66a8f
 EBUILD mkvtoolnix-2.4.1.ebuild 1668 RMD160 c27da1a707a32f0dfce27cd1d56d6fc517c6a3fd SHA1 f02f15df7122d29dad9346f2aba5ebd182ef1867 SHA256 751d750b2a9d4e57c3357a0fdb92bf0f1b8e804a1981063579afbbdbe721bb3a
 EBUILD mkvtoolnix-2.4.2.ebuild 1669 RMD160 7c9831e7e0f3d0ae19476d9fa2f2a554b76252a2 SHA1 8cc129deac112dcec797ff15cb4239cbb1565040 SHA256 f30ad24cc64661dc1338fba600de3d1828e244c3fa381ba34c5d5140ff22e89b
 EBUILD mkvtoolnix-2.5.1.ebuild 1669 RMD160 65443f49349e676e60013524c1377346dafbe8b7 SHA1 07f07df5c1e2b7008f26a85762ee1eaeb93c0cb5 SHA256 31ac61a9871355cb75e5c46cd7a4e6674984a0633138aa03cf10518bc8096608
 EBUILD mkvtoolnix-2.5.3.ebuild 1729 RMD160 0b30b3ee1b5263a537c12805648c817a78411fac SHA1 36ea0cb20dcbedc0179af43fc4f798f42c258d49 SHA256 bc59713dd8384583ea84e164fc666ab166f75e693257c0718c24824fb9e21818
-MISC ChangeLog 15122 RMD160 786e4588fb0263e2932b84cb552f15ed183d610b SHA1 cd055f285fe8b4e8bc4122f2a5487da68acbcfa7 SHA256 0b498e8e4ea868534c4be507a679b9f5c07b388f094a1ea63fa1dbb87d87f873
+EBUILD mkvtoolnix-2.6.0.ebuild 1719 RMD160 4d93113e9524adee2dee2f26e6d6f50539958a01 SHA1 c771be26db28a95518a9bf4eff6137adaeec690b SHA256 5d965e9a3cd49cab39140a261623d5cbdb8e11f194dd1b6703c16672122c86a3
+MISC ChangeLog 15242 RMD160 81388662c496baa917cf8c1a8cb17d95508e08d6 SHA1 593960279be86a3367c16f9b6123f007132d5fb3 SHA256 38ad304e16445ee028844205bd54c94388661e23720cb78bac5c7f9fc020558e
 MISC metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 SHA1 f8d7127515244fba82de7daad73ef24ed65f36ef SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm1yzgACgkQAiZjviIA2Xi2YACeP//mO/jVUY863y5kO+GsrdQ9
-xngAn1Mzuy29BSxz7/pU11frz4Yfffq4
-=FV8n
------END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/mkvtoolnix-2.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-2.6.0.ebuild
new file mode 100644
index 000000000000..9c6dcf405a70
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-2.6.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-2.6.0.ebuild,v 1.1 2009/04/15 05:48:12 yngwin Exp $
+
+EAPI="1"
+inherit eutils wxwidgets flag-o-matic qt4 autotools
+
+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 ~ppc64 ~x86 ~x86-fbsd"
+IUSE="wxwindows flac bzip2 lzo qt4 debug"
+
+DEPEND=">=dev-libs/libebml-0.7.7
+	>=media-libs/libmatroska-0.8.1
+	media-libs/libogg
+	media-libs/libvorbis
+	dev-libs/expat
+	sys-libs/zlib
+	dev-libs/boost
+	wxwindows? ( x11-libs/wxGTK:2.8 )
+	flac? ( media-libs/flac )
+	bzip2? ( app-arch/bzip2 )
+	lzo? ( dev-libs/lzo )
+	qt4? ( x11-libs/qt-gui:4 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	WX_GTK_VER="2.8"
+	if use wxwindows; then
+		need-wxwidgets unicode
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	eautoreconf
+}
+
+src_compile() {
+	use wxwindows && myconf="--with-wx-config=${WX_CONFIG}"
+	econf \
+		$(use_enable lzo) \
+		$(use_enable bzip2 bz2) \
+		$(use_enable wxwindows wxwidgets) \
+		$(use_enable debug) \
+		$(use_with flac) \
+		$(use_enable qt4 qt) \
+		${myconf} \
+		|| die "./configure died"
+
+	# Don't run strip while installing stuff, leave to portage the job.
+	emake STRIP="true" || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="true" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README TODO
+	doman doc/mkv{merge,extract,info}.1 || die "doman failed"
+	dohtml doc/mkvmerge-gui.html doc/images/*
+	docinto examples
+	dodoc examples/*
+}