Version bump.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 132 insertions, 9 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 974e277f5b8d..52aa007d600e 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.164 2012/05/10 07:08:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.165 2012/05/29 05:20:36 radhermit Exp $
+
+*mkvtoolnix-5.6.0 (29 May 2012)
+
+  29 May 2012; Tim Harder <radhermit@gentoo.org> +mkvtoolnix-5.6.0.ebuild,
+  +files/mkvtoolnix-5.6.0-system-pugixml.patch:
+  Version bump.
 
   10 May 2012; Tim Harder <radhermit@gentoo.org> -mkvtoolnix-4.4.0.ebuild,
   -mkvtoolnix-5.4.0.ebuild:
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 0bea0bf5329f..af85bead50a2 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,22 +2,25 @@
 Hash: SHA512
 
 AUX mkvtoolnix-5.5.0-system-pugixml.patch 3153 RMD160 302b2bfe94a5f5c0c474c3b54b14310739da951d SHA1 d2b485428ee4279e378d97a0702c1b199ddde8a1 SHA256 e32495ae02cea7016d02c69c4b2473991a9e7899c43cc9a32f6e1b7e99d8c6c8
+AUX mkvtoolnix-5.6.0-system-pugixml.patch 2504 RMD160 4ce21695eab6e4ad3187cb3d2818e0b53ae50f04 SHA1 57f077a499e4a4e5517ecd24c7b8bdaa16ea2a57 SHA256 5bfca6cabe0974958a29ebfc46e95b7abc45543a5104eeaf120c7c0167aa2082
 DIST mkvtoolnix-4.9.1.tar.bz2 2093128 RMD160 69203457701e36c7606d1ef3b9fbcd7d41ffa73f SHA1 d457e6ba682816e974da4e13e2dee42d81e1adbd SHA256 bb24dd7b2f2fc3b343abcfeb098ddf42659b6d867e5d75eb81524121fef88b88
 DIST mkvtoolnix-5.0.1.tar.bz2 2155095 RMD160 3c6220a1ff304a18e4d7125d6981966c3e9d368e SHA1 900211d47ba6cbeb4188bb45a492a2b9edf08ed2 SHA256 eecc48d17c0583b6b071e710bfe88ae09439bd99bb90c694a2fed0651bb08f19
 DIST mkvtoolnix-5.5.0.tar.bz2 2702032 RMD160 012534694c0852ba9359125aa43cd4dcaa646668 SHA1 0027d06f1061a94c8923ef6a1a788050bc4f7c84 SHA256 426fdeef3b6411b743776ab126c7f7676dc9a7076bee1c380ac8b518f520397b
+DIST mkvtoolnix-5.6.0.tar.bz2 3767416 RMD160 6880fca76b162e7a83d6d6dac0617a6dae7be62f SHA1 a114ea0cee7e5a023dc17f54b533743b9b00c5ee SHA256 09c502de690af0ad405cf66fe9863e86260f89871e9a563f1ede56a53e71fcc3
 EBUILD mkvtoolnix-4.9.1.ebuild 1762 RMD160 ce3560c213753bacd638491a6c933e0d4f3707e2 SHA1 63c8f7f8f491af2c47a5fb14513f218d0916e213 SHA256 0f36aaf9d0ce7562610bf7b7dde61a4369dc18da240ccfc37ca6105924b757d1
 EBUILD mkvtoolnix-5.0.1.ebuild 1768 RMD160 d6f766e3b8c07bb9d849cd5a399c1e4ac376c25a SHA1 f961ba3d70a357373598ea20729bcc79f543bb32 SHA256 ac626c49e7ab8dc37f0e4d1434b7a0eaadb870966ea19e4a82ac5873d6bf4c88
 EBUILD mkvtoolnix-5.5.0.ebuild 1773 RMD160 e00d96aa48ee7cd79511b9526e115490168b4417 SHA1 4dc06fbffb28a11d734cce31015762259c184d87 SHA256 9aab4139fe20445adde55519776c87b03c0b836b9ffe0b94f7c5c74a3e48568b
-MISC ChangeLog 24244 RMD160 1a971f1669f79f1774c170395098cdfb265a05e7 SHA1 825aa1dad5b75532fa2cc46f69c9d485d94679ab SHA256 947b09fc695e005951c7249f6a6aa679e235218d99c5f8394ef91ee1286ea92d
+EBUILD mkvtoolnix-5.6.0.ebuild 1853 RMD160 addf3fbc3fcbe53dd12c9666990a6f3f5f119be6 SHA1 5669597a759a4fe70d9a734d273bd42a87c34b39 SHA256 8ef7ff5ee9cea6a16e7b693d1448abf0f14a3394f4c8d9eef803364e0b734c99
+MISC ChangeLog 24417 RMD160 801aa0c76549439de7dab0b9af9b73490aae8d3d SHA1 c18eaf9f3ec6355899d02ff81a2f11a62d3a71b1 SHA256 6517f94fa0917649e175d8df1e680985a92108d5eaf86fb72d17b7bd6b19c2b5
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPq2mHAAoJEEqz6FtPBkyj+J4H/1lJDihbZuJUSCMQI5Ceg/sl
-Y4Nm2j/cVVewfHt89NwCNMdiYRa6O+UNRpSh6GHH9IjFeocJoiFKWgO9eAFcBU/s
-qE/WeaQrgcYZ5HlDHycSzMzZrtFf1ORYUuaq4y9GKraBx6K8RTGjg4wK5sWzT82z
-Mz9Bt97Lsqn/wzDHZ8jT9ubkvrO3sHplU2hm1xBZH5dlwoECkdD3gapxhKPh66/z
-krS84zbXcZ/7rXD8X6GKV4B8d89UJj46BNM3xxs9FBBmymn6+VQXeKmdF016phWf
-3dLqgto4Z0aOWq9+Oa15m9tDDIjDBK1qPiVC5u2atClGVwddO4l0yzR9mK3KdCw=
-=LnD6
+iQEcBAEBCgAGBQJPxFyxAAoJEEqz6FtPBkyjnz0H/j0DdkyZSptq+Ss0LxPbmvcs
+GHhhA1ftHupmFm5W4Bh23jXXL8yR+doeT30p3U9izP7jBGZhOw3MenVWL0lcAs+N
+25tbUCN37xN6Hs1uI9iRGe5GFRWCIdxr4JoYIl6NDMUjWxH0aQV22uKE47iDewOw
+vGCVK0t5up5ft6Oi4YJ8QjTOLWsh9XuBz+rAxMxZf/YRLn5TAWsrtOCn6igSN7gF
+hRNvTpFBv0Zj4dXIB1HK7uHz9kmOX5E6a8jd5sFFsbXZThdjolRsbHP4i+VynQu2
+gUYXO28ign1/L0dSO4qv6O7JCNFHIwbrfxsaCYUbT//8bt1vssdJfQ3zTzLdiAI=
+=0CcD
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.6.0-system-pugixml.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.6.0-system-pugixml.patch
new file mode 100644
index 000000000000..9a455b7c8ff2
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-5.6.0-system-pugixml.patch
@@ -0,0 +1,31 @@
+--- mkvtoolnix-5.6.0/rake.d/target.rb
++++ mkvtoolnix-5.6.0/rake.d/target.rb
+@@ -101,7 +101,6 @@
+       when :mtxoutput  then "src/output/libmtxoutput.a"
+       when :avi        then "lib/avilib-0.6.10/libavi.a"
+       when :rmff       then "lib/librmff/librmff.a"
+-      when :pugixml    then "lib/pugixml/src/libpugixml.a"
+       when :mpegparser then "src/mpegparser/libmpegparser.a"
+       when :ebml       then c?("EBML_MATROSKA_INTERNAL") ? "lib/libebml/src/libebml.a"         : nil
+       when :matroska   then c?("EBML_MATROSKA_INTERNAL") ? "lib/libmatroska/src/libmatroska.a" : nil
+--- mkvtoolnix-5.6.0/Rakefile
++++ mkvtoolnix-5.6.0/Rakefile
+@@ -48,8 +48,8 @@
+   $applications            =  $programs.collect { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) }
+   $manpages                =  $programs.collect { |name| "doc/man/#{name}.1" }
+ 
+-  $system_includes         = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Ilib/pugixml/src -Isrc"
+-  $system_libdirs          = "-Llib/avilib-0.6.10 -Llib/librmff -Llib/pugixml/src -Lsrc/common -Lsrc/input -Lsrc/output -Lsrc/mpegparser"
++  $system_includes         = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc"
++  $system_libdirs          = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common -Lsrc/input -Lsrc/output -Lsrc/mpegparser"
+ 
+   $source_directories      =  %w{lib/avilib-0.6.10 lib/librmff src src/input src/output src/common src/common/chapters src/common/compression src/common/strings src/common/tags src/common/xml
+                                  src/mmg src/mmg/header_editor src/mmg/options src/mmg/tabs src/extract src/propedit src/merge src/info src/mpegparser}
+@@ -579,7 +579,6 @@
+ 
+ [ { :name => 'avi',        :dir => 'lib/avilib-0.6.10'                                                                             },
+   { :name => 'rmff',       :dir => 'lib/librmff'                                                                                   },
+-  { :name => 'pugixml',    :dir => 'lib/pugixml/src'                                                                               },
+   { :name => 'mpegparser', :dir => 'src/mpegparser'                                                                                },
+   { :name => 'mtxcommon',  :dir => [ 'src/common' ] + %w{chapters compression strings tags xml }.collect { |e| "src/common/#{e}" } },
+   { :name => 'mtxinput',   :dir => 'src/input'                                                                                     },
diff --git a/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild
new file mode 100644
index 000000000000..446ad5d24c72
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild,v 1.1 2012/05/29 05:20:36 radhermit Exp $
+
+EAPI=4
+
+inherit wxwidgets eutils
+
+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="bzip2 debug lzo pch qt4 wxwidgets"
+
+RDEPEND="
+	>=dev-libs/libebml-1.2.2
+	>=media-libs/libmatroska-1.3.0
+	>=dev-libs/boost-1.46.0
+	dev-libs/pugixml
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	>=sys-devel/gcc-4.6
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	lzo? ( dev-libs/lzo )
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+	)
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] )
+"
+DEPEND="${RDEPEND}
+	dev-ruby/rake
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-system-pugixml.patch
+}
+
+src_configure() {
+	local myconf
+
+	use pch || myconf+=" --disable-precompiled-headers"
+
+	if use wxwidgets ; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+		myconf+=" --with-wx-config=${WX_CONFIG}"
+	fi
+
+	econf \
+		$(use_enable bzip2 bz2) \
+		$(use_enable debug) \
+		$(use_enable lzo) \
+		$(use_enable qt4 qt) \
+		$(use_enable wxwidgets) \
+		${myconf} \
+		--docdir=/usr/share/doc/${PF} \
+		--with-boost-regex=boost_regex \
+		--with-boost-filesystem=boost_filesystem \
+		--with-boost-system=boost_system \
+		--without-curl
+}
+
+src_compile() {
+	rake || die "rake failed"
+}
+
+src_install() {
+	# Don't run strip while installing stuff, leave to portage the job.
+	DESTDIR="${D}" rake install || die
+
+	dodoc AUTHORS ChangeLog README TODO
+	doman doc/man/*.1
+
+	docompress -x /usr/share/doc/${PF}/guide
+}