Added new revision which uses wxGTK 2.6 instead of 2.4. Added an huge patch to fix format string mismatch for 64-bit arches.

(Portage version: 2.0.51.22-r1)

4 files changed, 77 insertions, 11 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index a1ee0c5e2391..c43b28bf4fd7 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,13 @@
 # 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.35 2005/05/30 10:02:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.36 2005/06/03 10:55:45 flameeyes Exp $
+
+*mkvtoolnix-1.4.2-r1 (03 Jun 2005)
+
+  03 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +mkvtoolnix-1.4.2-r1.ebuild:
+  Added new revision which uses wxGTK 2.6 instead of 2.4. Added an huge patch
+  to fix format string mismatch for 64-bit arches.
 
   30 May 2005; Diego Pettenò <flameeyes@gentoo.org>
   mkvtoolnix-0.9.7-r1.ebuild, mkvtoolnix-1.0.1.ebuild,
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 638d07a8c45f..c93de1cdf0c3 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 58fd4cfc8d6fe4a3988848f0f9e41fd3 ChangeLog 5646
 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 a36ff9cb50b4631ffe840060d80d168c mkvtoolnix-1.4.2.ebuild 1609
+MD5 11592803e5d4e00f3984979cab3fd014 mkvtoolnix-1.4.2-r1.ebuild 1730
 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 e7fad70f0521de5b83e98ff6955408a7 files/mkvtoolnix-configure-checks.patch 1092
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCmuPBj5H05b2HAEkRAllPAJ0YUTRtQKHnkumnVmbZSgHo2A6PiACffZ6c
-d4adB+tsR6YJ6iB37TtAWPg=
-=oVQu
------END PGP SIGNATURE-----
+MD5 59e0afdc0467751917489792dcc4fab8 files/digest-mkvtoolnix-1.4.2-r1 147
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.2-r1 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.2-r1
new file mode 100644
index 000000000000..6cc171deb1c4
--- /dev/null
+++ b/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.4.2-r1
@@ -0,0 +1,2 @@
+MD5 17d66aae6a1c6ac8dcd36f619a385fe1 mkvtoolnix-1.4.2.tar.bz2 638250
+MD5 b14215c3c40431fea5b585d010ae6194 mkvtoolnix-1.4.2-nowarns.patch.bz2 22002
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.4.2-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..623a2eec9475
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.4.2-r1.ebuild
@@ -0,0 +1,65 @@
+# 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.2-r1.ebuild,v 1.1 2005/06/03 10:55:45 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
+	http://digilander.libero.it/dgp85/gentoo/${P}-nowarns.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+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_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd failed"
+
+	epatch ${FILESDIR}/${PN}-configure-checks.patch
+	epatch ${WORKDIR}/${P}-nowarns.patch
+	./autogen.sh
+}
+
+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/*
+}