version bump

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

3 files changed, 86 insertions, 6 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 8dbc724ffc4b..b0ad34b1fd54 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.121 2010/01/20 20:22:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.122 2010/01/25 10:51:46 aballier Exp $
+
+*mkvtoolnix-3.1.0 (25 Jan 2010)
+
+  25 Jan 2010; Alexis Ballier <aballier@gentoo.org>
+  +mkvtoolnix-3.1.0.ebuild:
+  version bump
 
   20 Jan 2010; Markus Meier <maekke@gentoo.org> mkvtoolnix-2.9.9.ebuild:
   amd64/x86 stable, bug #299993
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 75ca74577095..560c301d6e5d 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -5,16 +5,18 @@ DIST mkvtoolnix-2.9.7.tar.bz2 1051426 RMD160 7de975e8439fcd0b53ddb8f82e92ededec7
 DIST mkvtoolnix-2.9.8.tar.bz2 1093036 RMD160 d0cb8629ad35b29708a0c7777dfe9a4d623a8e10 SHA1 be2b4b427befaad3d842b3ad3d55fb97b93b0468 SHA256 a0d18636635fad7e750b228095b312cad1a8adaf52e30df7405ecf489cfd2bbe
 DIST mkvtoolnix-2.9.9.tar.bz2 1116610 RMD160 5bc4599d66c55298ca901b21fdcd0ef0bae88906 SHA1 3e41855c95dd30a22f353cebb0d8ae1d9ee2c138 SHA256 0df4ee19c7b4961af0ec027b54b31a84bffd8f7bae2f98145df48c4a520dbb7a
 DIST mkvtoolnix-3.0.0.tar.bz2 1117727 RMD160 9052bccb35fb46e5757f14a954cd9253cff0413f SHA1 69b4951640e2b0e5fcb27394444ffac24c001b54 SHA256 6450de85d63c657230363ab82ce1f5423427a6a0073e7fd18bff4f48f3b8b5a8
+DIST mkvtoolnix-3.1.0.tar.bz2 1364401 RMD160 938613f0d2e1daf0cde4f90a55e46ce4e8fde828 SHA1 e6aa12d18531f7857caef4be1be074b84a63376d SHA256 872fa40b8cb084fcbfd16b0a0e24a58488a0d42f80988cd512daa659d94eb4a9
 EBUILD mkvtoolnix-2.9.7.ebuild 1753 RMD160 1d7566e772b821fd5471d35e0ca30088ba373d2b SHA1 b6e1fdf53ff859bf82976985af93d7c82aa599fb SHA256 21e9f6dc56d084ca3139ec48303629544497a0fe68c24a9cd18d00d7d4fbfdd2
 EBUILD mkvtoolnix-2.9.8.ebuild 1770 RMD160 362a38ec5c51096b407eca170ffb6192b0ec5720 SHA1 7be001806d9ad504c950a9e9758bf1c62b7aaf25 SHA256 b067da3da186376a1d0240bf24ab0b88de8fde2aa7663a3d7af2149c9b738791
 EBUILD mkvtoolnix-2.9.9.ebuild 1765 RMD160 48cc285b70f3333796b300a8f8e0420c9b86a0a6 SHA1 edcd77f15e0a3f42c0cabceb9abc2765d9adc241 SHA256 fdf711022b2028dcf72392f94afe83e6976c2f9edb6368240916e2c85929ac63
 EBUILD mkvtoolnix-3.0.0.ebuild 1769 RMD160 8eeedbcc6fc38a5c6d863b4ae4929fb7753af52e SHA1 a0b10a73f084dabac3b46b319ca4c58a822bccce SHA256 3e81ec18bfb6ca1dd26172598c9f007edd1ec034ac28ca18644221e716781e33
-MISC ChangeLog 17769 RMD160 3b9cdf83fdecbd5e40a8b24eaa4319850ce26245 SHA1 81b1059f5e028ee4be526cbf958a09b18ccbe83a SHA256 2aeb8ba72efa8c9c419637073ec3b374f34efa2b6e5ca5d5d64ee2464727fe21
+EBUILD mkvtoolnix-3.1.0.ebuild 1852 RMD160 5728a6bfaa0b444635f0624532947b52284af90c SHA1 d92a9aaf3c6e91b5d558fb86d392985abd6dd24c SHA256 4f065a4434ad174f40e058ecf19628bb36a7e1198e914693a797f57669e7f5e9
+MISC ChangeLog 17900 RMD160 f8f5d82825c6275fabdd5908e0aa2716ef605f16 SHA1 b5e465a4c24de4ee89723b6359a9d8a23a10b92a SHA256 4e6f6652d75ebe0c5a902f4c047cf23384582cec68d79caf6c6126e0acb14f22
 MISC metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 SHA1 f8d7127515244fba82de7daad73ef24ed65f36ef SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktXZeEACgkQkKaRLQcq0GJ5wwCcC/P4u08HH5dhi8XYiVjwc992
-ip4Anj+MPC45yAIgcYQTmnuPqmONnw5a
-=t8co
+iEUEARECAAYFAktdd8cACgkQvFcC4BYPU0qfJQCfd3YX9JwHHT6wxeLlOHKG5EMN
+7FMAmJrvFVkLHQEFFLMLGdgzX8r6ixU=
+=H2Y1
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/mkvtoolnix-3.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-3.1.0.ebuild
new file mode 100644
index 000000000000..244a38861eaf
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-3.1.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-3.1.0.ebuild,v 1.1 2010/01/25 10:51:46 aballier 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} \
+		--with-boost-regex=boost_regex \
+		--with-boost-filesystem=boost_filesystem \
+		--with-boost-system=boost_system
+
+	# 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/man/mkv{merge,extract,info}.1 doc/man/mmg.1 || die "doman failed"
+	dohtml doc/mkvmerge-gui.html
+	docinto images
+	dohtml doc/images/*
+	docinto examples
+	dohtml examples/*
+}