Remove old.

Package-Manager: portage-2.2.0_alpha145/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 13 insertions, 135 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 499f93e5fdf8..c852e3425706 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,10 @@
 # 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.180 2012/12/10 03:19:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.181 2012/12/10 03:20:50 radhermit Exp $
+
+  10 Dec 2012; Tim Harder <radhermit@gentoo.org>
+  -files/mkvtoolnix-5.6.0-system-pugixml.patch, -mkvtoolnix-5.7.0.ebuild:
+  Remove old.
 
 *mkvtoolnix-5.9.0 (10 Dec 2012)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index dadd99cb3d84..940ff518aaad 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,27 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mkvtoolnix-5.6.0-system-pugixml.patch 2504 SHA256 5bfca6cabe0974958a29ebfc46e95b7abc45543a5104eeaf120c7c0167aa2082 SHA512 d2ca71ea3b8f43bcba335cdf197e217718f36d51046b2466a205f3b71569fba47c155ae836b2a3123fe2c600a5af4d1dcff869205ab989083482567cd6def34c WHIRLPOOL fdce40b9e0f56dc67ea00409bb58fb37aaf21fb1ae9c9579ee0a4dbd638203c4267c8db1c81b6a70b81b788e91f6353c9bea6805a0767b5ecac18b37da12984e
 AUX mkvtoolnix-5.8.0-boost-configure.patch 5428 SHA256 060ef650d7cdfe0f6de0c614750a90105665b1321be3a59ef3e1fbec7a46bfa5 SHA512 8965f2e4116fa340753a1414a1bd285ea26a0f38f48cb80b1a57608426d9f24958afff35756135051098edaebfcf0fe07521b59bad4f5193fe6833b0d6e1cd5b WHIRLPOOL 2aab1692234fb364043c07e94f39efd94ae6c57d46b12814626ea3be7afe59d3d5f79de24905fa23aed4b1446ccbc2fdfa86eb69cd2e3c0c2a6298bf5cb841b5
 AUX mkvtoolnix-5.8.0-system-pugixml.patch 2435 SHA256 1e0111dc929dec691808db015c0eddd1bfcd312e5d3bd548957fb0b37ccd3c6e SHA512 a1d4c838527f581dda01d7702a8d42dd1e53bf00103408c4d62d09dc1e1a12bca6fd63d3f740e7d67c858d79d520c5948673f849cf3d8a9698a95666692c64cb WHIRLPOOL 0c12ed938f5ca61de04175982cf756f8da7462182b597eb5c4a2d0f6010d09755ccc4f419ebedb9b1743c4aeb7da0885fd87481791c57e54ed693bd4bb034cbc
 DIST mkvtoolnix-5.0.1.tar.bz2 2155095 SHA256 eecc48d17c0583b6b071e710bfe88ae09439bd99bb90c694a2fed0651bb08f19 SHA512 5ac0077bdef7426fc4f978bae5965f868dcc5b5a78982580a441b55390f900babd8863a215e5bfddbf0c93087c36d93e5a6cb473e1d9b156622b85f8baec8e91 WHIRLPOOL dc8e98d823f56e75f93a3603aab2b4374a91d273ffd7d4acad0ec248da99885802cb876b10707799a09a5be14acf5651d66a9190d78db9f241067cad20cf1434
-DIST mkvtoolnix-5.7.0.tar.bz2 3930983 SHA256 bfc947722c71130cb1896fa1d4ec39199dcb87fcf7e8e00ab36ae6c81d471f80 SHA512 0d2a219c1ad70319dd1305b4a35072420e750ad6ee998317445ad19a803c7f7d1f278afe837d93564f0952b98a65b494ab9702406fdc44ae58f8f25f12e93bb1 WHIRLPOOL 9979806e4af9867c933ea9754eff24c86e22f6ad512ebe5f42f73ab1c7dd8af1b9eca395225afd563a5037ee235c682f932f297cd23e0859d61e143349ded19d
 DIST mkvtoolnix-5.8.0.tar.bz2 4454971 SHA256 3c9ec7e4c035b82a35850c5ada98a29904edc44a0d1c9b900ed05d56e6274960 SHA512 c24850a8e5c68b06eec006028e7e53c92cff91e748c71bd3799f14e2299e23730043005ce3bd45271848c899df6a44c0f9bc84928c72ba886e8dd894c4b704f3 WHIRLPOOL 6e98c340bb80be55756f3d24272d712e2301f1eb8e314eababa59cf602cab7d27ea6f8ee3aa048db369abec1cfba8c5bdd2b679a0662741cea0c6cfdb5db7886
 DIST mkvtoolnix-5.9.0.tar.bz2 4493517 SHA256 d913f531331c3332d2fb334c872ea19bfea7293dfedc4bf33ae7162e4efcbde1 SHA512 d186e799ee6d95699d0ed4c820be3c7255e77e02b9330d4832cd114714a6a3f2c8fc27f7615f5e8da99ee5c7bb1cfca6b838954b58aff2d3739dbe3ecea203fc WHIRLPOOL ac68adfe914496ef60e255259edf0370559310f2100283383a438a4378986c09f69a2de1f51677ba8044f9918fb689f6a2c26d506155addaa9f053830c7043da
 EBUILD mkvtoolnix-5.0.1-r1.ebuild 1826 SHA256 82d52db276aa01eb04ba51dcf62bfb35b92d35e565568488601be74ceb63da9d SHA512 f173ff8c50635bf8731723e953ede5bfdd488775adb22012a8bb32a02b51d83692438afa82a383a42872d49623682468f4e1a4e3b0a6e9c2ee1dabbec7070b2a WHIRLPOOL 78fa80620ef232bb3829bdd7de7666edd37b80dececb032fd07eb4033e81344c0957c6c42f4c13b4f43662e3e17efec6d9b4a45db255e3e5c5774e08d7922aaf
-EBUILD mkvtoolnix-5.7.0.ebuild 2127 SHA256 ee87abf24a9408e06a21fe61897c4ea0283565573dc3cadb65e76b20224a97db SHA512 14c6864521117fa006356da4231bb720a8a64853999edfa8af2a51da1a51c0b65263037b68933595f680dc4462dfe5e7d898567b41ae87c7825d31f0acf318ac WHIRLPOOL 1867ce2c160bc007144ab5b630a62fa89f95a6246ebb2327022ba3717ce9a510fcbfca2854fcfeafc1357f7f239de4612b3377afaa1664548baf8b0c623cd459
 EBUILD mkvtoolnix-5.8.0.ebuild 2234 SHA256 889f0525fab44fdb79e84d8ce76dfd1524f8b136fd09ab63cc2e148ce3237e52 SHA512 a41f2b763accf6b64753d41cfe2f78d46f8dcf3ba9a7a5fdc534d874a705cfc25751668bf3193ff1cdb993dd34835c3c24d361ce3d5a3a68902c6db85315d7f3 WHIRLPOOL 04cc5f2fa2787848665cd2dc1db2ab4791e2c28d0aeb202f04918cbc7c802d471aa0b10e2b21a4f78d4e707a1b6d8a2a6de0a2c9fefd76679eeee5c0ad87ec6c
 EBUILD mkvtoolnix-5.9.0.ebuild 2244 SHA256 5ba84215eb369d35fcf8df6231ff511ffb1fcde63846fbc83ac3ba17000cab22 SHA512 48c86fc97e2f3a061cb358270698126d5cecfa282e776d5e7c8fb4714c460f37df8197cfe771b5af9be792bffa9b1a2b5fbee077cd7fe204c4192f4caae5bf47 WHIRLPOOL 433667c671bc38997c863aac57d7392ff6b75452b050a90ef427976c8e60400bed0264ee63497d9b879ddb0b4a30002d5fcd59ddfeceaf8945eb3eae6aba9503
-MISC ChangeLog 26555 SHA256 feba64ccf1caba6eb8b014ee56b932f6b5497931fa5658aaabe90a3017ae6549 SHA512 2a24bceda362cf00689258939a3d18a11f9e4556af6943232a9f4fcd942c17f6f1ecde150d81366465973722655073a4f9c71cb8d95f8a01dbd64c1809f0766d WHIRLPOOL c74feb87f243b1b3f2ed764f36b52a87eff083a3a25cfbb6a86ab81cbe633d28851df6864ab4258a09f92fc1bceee62bdee4f30250a19d5d2542cae8d876b9ea
+MISC ChangeLog 26693 SHA256 198ddb11ce31b4e35f99a2503b6fc222742aa07751919ea707dd024b7d5c796d SHA512 0ddce17a924cbae41cd5ff687d5f5e7be8e6fd110ac060245c010fc418a682e62d3444fcc40cbe338a99c5c1ec175668814d6fbae9150844a296643cb11500bb WHIRLPOOL 569b66cdfc50e31cc551079cf260a3a789e73e72e56e5dffb50bb95f987e7adf055ed79ce3c6b09afd3e729388178b3b46e4408b7c70b7b9af6c93fd291e6e7f
 MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQxVS/AAoJEEqz6FtPBkyjCOUH/j1Wv4FxEc9Bvh/1p1lH1IXm
-+W80aEsmtZLm04TAKLO+7Y4svCtjHVyGNSQJt7vdc91oUnwFBpxmlZbkV4KJ9nVS
-6cCt8hbNUuk7Zxp8NZRzyK1BhyBZ6niY0FKTbBraIncHL0D34CCbrJEVXGUB5Axg
-HdxUu6uZVU3YhhCQZGT+8yGCdNFwTmPxT54GalCz31sS6Fp+sbbeJ9Xblff3gm9o
-ESczEPsa3Tn1El/iQX7qBgq8ut4bUMrP1za4O956Tz3qQwk1Kof1fEc+Ib5xtAZP
-ZRWemGM/BkZ2YzmTim7F2LOyt6WHQSEruetR+408vvvwIaxcicRTGTLgyWgHtt0=
-=gPzD
+iQEcBAEBCAAGBQJQxVUUAAoJEEqz6FtPBkyj+XYH/30XSQHlyZnFaUwg3fPsvJYW
+Pwhe29Yb6rYHWJIIHbY++XCeAMxo3eIEyx4GXkGws7QdhtLrH9ORMNkAZ51RKtFC
++VNfE+v5HRp2pSnW3CTJDg51Ls/ft26/8n4J25ylxNMgy0JxmusJ+LWdpz6WYyc4
+dip+yZVYx2BauWtiAtd0lrH1N99iMz/LyHVMr7rYRow+Xisza+WJ/Bt04OY9IG8v
+R5+lNugpG+CKos7wWzO8sWisLsLR/ErWVut2qO6r4ePyUfPUt1v4D1M7Jdo29/RL
++J3foOOVWi7097cAtzUu8rNGS//N7tr/87aDzbyEUEVyWXZt1B83Jlm9wwxFCO0=
+=A/bK
 -----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
deleted file mode 100644
index 9a455b7c8ff2..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-5.6.0-system-pugixml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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.7.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-5.7.0.ebuild
deleted file mode 100644
index 556a64b85640..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-5.7.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.7.0.ebuild,v 1.1 2012/07/11 07:41:41 radhermit Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs versionator 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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
-"
-
-pkg_setup() {
-	# http://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.6.0-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
-
-	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}