Version bump.

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

4 files changed, 147 insertions, 10 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 322192274786..9d590fc81d97 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.160 2012/03/25 08:17:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.161 2012/04/08 07:40:03 radhermit Exp $
+
+*mkvtoolnix-5.5.0 (08 Apr 2012)
+
+  08 Apr 2012; Tim Harder <radhermit@gentoo.org> +mkvtoolnix-5.5.0.ebuild,
+  +files/mkvtoolnix-5.5.0-system-pugixml.patch:
+  Version bump.
 
   25 Mar 2012; Tim Harder <radhermit@gentoo.org> -mkvtoolnix-5.2.1.ebuild,
   -mkvtoolnix-5.3.0.ebuild:
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 91ef8a53ff8a..2efbe9226273 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX mkvtoolnix-5.5.0-system-pugixml.patch 3153 RMD160 302b2bfe94a5f5c0c474c3b54b14310739da951d SHA1 d2b485428ee4279e378d97a0702c1b199ddde8a1 SHA256 e32495ae02cea7016d02c69c4b2473991a9e7899c43cc9a32f6e1b7e99d8c6c8
 DIST mkvtoolnix-4.4.0.tar.bz2 1773026 RMD160 85370a9ebd75b66b857c30edef1b22d8c0dce880 SHA1 c5e6cbc2fb522ba6653124a2eef6b416bafc488a SHA256 d458448f099abd3609fccddf54bd0d1cf8cadf2e966478432fb09116a0aaef2a
 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.4.0.tar.bz2 2310452 RMD160 e727c4d67e93ec306c93826cd1489188fb03acd1 SHA1 3f8356f6eeb8976d15aef35c63a2f9b42819c815 SHA256 4cd5cd69eae110b97cfb0ffb6a88b137cebf4f8cb6f88c892880b69030cedda7
+DIST mkvtoolnix-5.5.0.tar.bz2 2702032 RMD160 012534694c0852ba9359125aa43cd4dcaa646668 SHA1 0027d06f1061a94c8923ef6a1a788050bc4f7c84 SHA256 426fdeef3b6411b743776ab126c7f7676dc9a7076bee1c380ac8b518f520397b
 EBUILD mkvtoolnix-4.4.0.ebuild 1650 RMD160 8b19af11da03aa1853d6d563959900aba16c7f3d SHA1 9468020f03cf9490260fc3ab96dc5b4692afc1ed SHA256 47166d8972a8cf819a515e26db58898931749bdb5afd4d002aac3161c5efae31
 EBUILD mkvtoolnix-4.9.1.ebuild 1763 RMD160 295e773c31418007afbf7cd214c2e6cf5149a667 SHA1 ee39c699cf71970df8412c1f36be5ae4e4f978c7 SHA256 6511df9e616f18fab8824e5854af499f12b7a357d61ee899fc32f34d6c183447
 EBUILD mkvtoolnix-5.0.1.ebuild 1768 RMD160 d6f766e3b8c07bb9d849cd5a399c1e4ac376c25a SHA1 f961ba3d70a357373598ea20729bcc79f543bb32 SHA256 ac626c49e7ab8dc37f0e4d1434b7a0eaadb870966ea19e4a82ac5873d6bf4c88
 EBUILD mkvtoolnix-5.4.0.ebuild 1701 RMD160 803c7140572e4072eac7ff356918c05f849a7836 SHA1 3cbc9adcb4b1b886e41c8c1c067f1c781d02d6bd SHA256 2cfd8e2e2a1066715dfa9e2e766ffc1635cee72bcb98892e494c3faf24d4f28c
-MISC ChangeLog 23690 RMD160 4cbbf84739af8e2c226fba3fd33f138967de71c7 SHA1 58790385e100751cd7b5548313e51dfb5d71b3c8 SHA256 3c209f4413aaf5987ad39e37dbd42988e05585ddd4139f81fb2e1216436deb15
+EBUILD mkvtoolnix-5.5.0.ebuild 1777 RMD160 6c5991cae57d35c6478e039d136d34371a1bc2f5 SHA1 0caee998b768caf659c3dab32f9be813c37cb4bf SHA256 1724d8d823aa6ba4c745eea97ad1db7412e815cbe8ad44fc753c389e88dc2042
+MISC ChangeLog 23863 RMD160 2fa7e99fbef90fc8229d7b45f64dae39cad829b3 SHA1 9c7a0d81f954c58644b6fa8f9310190f7f72b1bd SHA256 c6d72d679afcb883bfaeaa9c017ee6d2c4c0e99b6b23facea6db478f7478dad7
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPbtSSAAoJEEqz6FtPBkyjQ9IIALYCMSvcfkB53ACjHEeG1arD
-jtja/kh9o1VJoUspUAsGjV8pWFBwU7aBIs1+yljaKRJ6O1L16j00icrOUfqc34c+
-kinImNMdlQAfTMoLDWQE2W0wm2OFjjf7V7mWEw9NXIQsxOw4BrrVRqOVQzT4fTIa
-JQxwQIhm36gsiJ1J/bfxKczW7EoMlw4YLqiKatA7V/75HnGyo0aYZF3az58IEURM
-556+GCqBAsbQEvE1NorWTKcvxPGqjT0kGVD4ibPVtuJTtHUO+6JyiW9F0CHd30eh
-/7+XoJpetEOdwj9S3xgk2ujolbdFU3gauu2W/n83tjNjhOY/FFQjlwdZVuUZ4Ts=
-=SrCT
+iQEcBAEBCgAGBQJPgUDYAAoJEEqz6FtPBkyjDmAIAJgyI5TwJeC42yovnnQhue8l
+1gY/0qZGVgFTxmbKb21UtxA1N3QF2UhwC/rUzNsfBATOiL+hUvKOHWb18da/+HQ1
+TB47PY3qsQWIsBVKJtyqn5nl+JgLXm4eW9LZ/5pfGQMqQC9099cqyI++E56Tapo+
+mgJyiCG/t5jjqH3FAxqenjcIwZv+2KRdY+l5wIl5Ym9qqVQCjNAixXJPNXpVrdZS
+aDBWHT7AY+ovvO4lS73wYatGAxbb1J0EgB3nywxqofXLu3VaGy+FzXsk6nXRtCby
+CHlF4HgS14rTH51nyzMHYnx4vTXd+tWPb4DI3rE8aCqzwe04559JGwTYlwBN+nY=
+=m50J
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.5.0-system-pugixml.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.5.0-system-pugixml.patch
new file mode 100644
index 000000000000..ab0c3654f4af
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-5.5.0-system-pugixml.patch
@@ -0,0 +1,48 @@
+--- mkvtoolnix-5.5.0/rake.d/target.rb
++++ mkvtoolnix-5.5.0/rake.d/target.rb
+@@ -98,7 +98,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.5.0/Rakefile
++++ mkvtoolnix-5.5.0/Rakefile
+@@ -46,8 +46,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}
+@@ -475,7 +475,6 @@
+       src/mmg/*/*.o #{$applications.join(" ")} #{tools}
+       lib/libebml/src/*.o lib/libmatroska/src/*.o
+       lib/libebml/src/lib*.a lib/libmatroska/src/lib*.a
+-      lib/pugixml/src/*.o lib/pugixml/src/lib*.a
+   SHELL
+   run "rm -rf #{$dependency_dir}", :allow_failure => true
+ end
+@@ -521,7 +520,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'                                                                                     },
+@@ -533,7 +531,7 @@
+     new("#{[ lib[:dir] ].flatten.first}/lib#{lib[:name]}").
+     sources([ lib[:dir] ].flatten, :type => :dir).
+     build_dll(lib[:name] == 'mtxcommon').
+-    libraries(:iconv, :z, :compression, :matroska, :ebml, :rpcrt4).
++    libraries(:iconv, :z, :compression, :matroska, :ebml, :pugixml, :rpcrt4).
+     create
+ end
+ 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-5.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-5.5.0.ebuild
new file mode 100644
index 000000000000..c8e8719ae7fb
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-5.5.0.ebuild
@@ -0,0 +1,80 @@
+# 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.5.0.ebuild,v 1.1 2012/04/08 07:40:03 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
+	dev-util/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} \
+		--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
+}