Remove old.

Package-Manager: portage-2.2.0_alpha123-r1/cvs/Linux x86_64

5 files changed, 13 insertions, 231 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index ef34556ccd4e..6990254706c2 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.174 2012/09/02 22:40:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.175 2012/09/02 22:42:18 radhermit Exp $
+
+  02 Sep 2012; Tim Harder <radhermit@gentoo.org> -mkvtoolnix-4.9.1.ebuild,
+  -files/mkvtoolnix-5.5.0-system-pugixml.patch, -mkvtoolnix-5.6.0.ebuild:
+  Remove old.
 
 *mkvtoolnix-5.8.0 (02 Sep 2012)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 1f58a9f17886..5cb2d02120f5 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,29 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mkvtoolnix-5.5.0-system-pugixml.patch 3153 SHA256 e32495ae02cea7016d02c69c4b2473991a9e7899c43cc9a32f6e1b7e99d8c6c8 SHA512 88167be9519c3fbec107d26e1f772d9ca74f5029dce9928eab19d20a1f17107bb5ffcfc2cb2bbdf59ee040c44b5ee927d962be21fce3485a9146abe5754a215a WHIRLPOOL 52610ee21e124f30f615c1c58cf20befd8315521bd5b8dee00097a5b8189a390ca2597f061d241bdef0eec9905b2af58c5adf8a8c2201e99ee2258c32fb59972
 AUX mkvtoolnix-5.6.0-system-pugixml.patch 2504 SHA256 5bfca6cabe0974958a29ebfc46e95b7abc45543a5104eeaf120c7c0167aa2082 SHA512 d2ca71ea3b8f43bcba335cdf197e217718f36d51046b2466a205f3b71569fba47c155ae836b2a3123fe2c600a5af4d1dcff869205ab989083482567cd6def34c WHIRLPOOL fdce40b9e0f56dc67ea00409bb58fb37aaf21fb1ae9c9579ee0a4dbd638203c4267c8db1c81b6a70b81b788e91f6353c9bea6805a0767b5ecac18b37da12984e
 AUX mkvtoolnix-5.8.0-system-pugixml.patch 2435 SHA256 1e0111dc929dec691808db015c0eddd1bfcd312e5d3bd548957fb0b37ccd3c6e SHA512 a1d4c838527f581dda01d7702a8d42dd1e53bf00103408c4d62d09dc1e1a12bca6fd63d3f740e7d67c858d79d520c5948673f849cf3d8a9698a95666692c64cb WHIRLPOOL 0c12ed938f5ca61de04175982cf756f8da7462182b597eb5c4a2d0f6010d09755ccc4f419ebedb9b1743c4aeb7da0885fd87481791c57e54ed693bd4bb034cbc
-DIST mkvtoolnix-4.9.1.tar.bz2 2093128 SHA256 bb24dd7b2f2fc3b343abcfeb098ddf42659b6d867e5d75eb81524121fef88b88
 DIST mkvtoolnix-5.0.1.tar.bz2 2155095 SHA256 eecc48d17c0583b6b071e710bfe88ae09439bd99bb90c694a2fed0651bb08f19 SHA512 5ac0077bdef7426fc4f978bae5965f868dcc5b5a78982580a441b55390f900babd8863a215e5bfddbf0c93087c36d93e5a6cb473e1d9b156622b85f8baec8e91 WHIRLPOOL dc8e98d823f56e75f93a3603aab2b4374a91d273ffd7d4acad0ec248da99885802cb876b10707799a09a5be14acf5651d66a9190d78db9f241067cad20cf1434
-DIST mkvtoolnix-5.6.0.tar.bz2 3767416 SHA256 09c502de690af0ad405cf66fe9863e86260f89871e9a563f1ede56a53e71fcc3 SHA512 510a9abe34aec75f3ac42835f92d69b8fd41a20b3052c339c600248f5b983a47d3483cf343adb5572258d00ea3197031de9b1bae840d83bfd3493f278e05fcce WHIRLPOOL 0860782473ea32a94a8f32d7bec04b5a452a6765f5bfa7581d750b405a451242833d23000f282b25b594805a6c90e6cdfeff71f0bbc1e54bbd363cc463a59627
 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
-EBUILD mkvtoolnix-4.9.1.ebuild 1762 SHA256 0f36aaf9d0ce7562610bf7b7dde61a4369dc18da240ccfc37ca6105924b757d1 SHA512 d1ab9bca1a6b5a6a1a1168a6515b037e32dfbab3da7bc821c12be9396b0924a61e4963b76f5d10acb296f23bc23c2775149a4f8966fc0813db9c633f0ca3f5b7 WHIRLPOOL ed0f79509cbf51441e5e457c30a7580884bcb0f3188ac841da0a7f8679e861823ba3da5dbf48d5cb7fd0124a5553e917883cdbef83f388210e025b1e7e638c92
 EBUILD mkvtoolnix-5.0.1-r1.ebuild 1826 SHA256 82d52db276aa01eb04ba51dcf62bfb35b92d35e565568488601be74ceb63da9d SHA512 f173ff8c50635bf8731723e953ede5bfdd488775adb22012a8bb32a02b51d83692438afa82a383a42872d49623682468f4e1a4e3b0a6e9c2ee1dabbec7070b2a WHIRLPOOL 78fa80620ef232bb3829bdd7de7666edd37b80dececb032fd07eb4033e81344c0957c6c42f4c13b4f43662e3e17efec6d9b4a45db255e3e5c5774e08d7922aaf
-EBUILD mkvtoolnix-5.6.0.ebuild 2103 SHA256 8bca4973a1681829943b56b6f94d11026fb3784fda07263571abfd3c7eed41c8 SHA512 7241481b9df61409a2147a28f3809258e9e315efe9e0064d2f867cd915d5f4ba3dd73daa251315c87327d5eb7f9eb1f5172b3ef086ac2d61f24867b1be276b52 WHIRLPOOL b69204b65c2d104305364db72299298231090aed36c67ade6d76d5e6a0c36855a37a87db43ba2ea5a9244262b2b19fed3bf2e5953d563b377193078f3e864d35
 EBUILD mkvtoolnix-5.7.0.ebuild 2127 SHA256 ee87abf24a9408e06a21fe61897c4ea0283565573dc3cadb65e76b20224a97db SHA512 14c6864521117fa006356da4231bb720a8a64853999edfa8af2a51da1a51c0b65263037b68933595f680dc4462dfe5e7d898567b41ae87c7825d31f0acf318ac WHIRLPOOL 1867ce2c160bc007144ab5b630a62fa89f95a6246ebb2327022ba3717ce9a510fcbfca2854fcfeafc1357f7f239de4612b3377afaa1664548baf8b0c623cd459
 EBUILD mkvtoolnix-5.8.0.ebuild 2137 SHA256 446ff629e90da2735fdec13cbf1654d50865f0fdc38a5f3589a8b65f4fe92277 SHA512 6671365ab66c37a40d955463296c0ffa70ae81398aa2ba669d12935be4b5006a9dc37bb3a27d7b2f78705aa037d2fb6d9e2886fd581d53dc2ce3e04d90e794aa WHIRLPOOL 737f04920fdbebe059a1480f619be85294770f597f3a27f877e5bda8439902ffd0edb152303f1d7924106201e85714e7d767ca84e190716e2e7934b457554026
-MISC ChangeLog 25690 SHA256 754422b27446e4bdb4755031dd7687be4be10d44f29c6b970aec2c8bc3ad09cc SHA512 e43b6f41f77721b4ff61ecc9242e84372fa1f78cc9f99ac370772dc87dff9f605e592810e409edd352e6af3ce0bc72e91b4f7826306404da438b37e4ec021da5 WHIRLPOOL 947a80c4c6db5008cb27e3b38bdfc8dcc39a4945cb013b6e05d1bda74e6b4bed546557f8fe73ce39178eec90cc0a14e535db833257bb761bb7e39466bdcddd8d
+MISC ChangeLog 25854 SHA256 9423bc6dbfb44f931bc0dabf7400fb8c3721feb21d33aee4e219b4e22f5345f5 SHA512 ec7471fed2f9c994890d297f1ce292b935b657e299c862a918a21b40a7ad93d2523b5b0de6e7bba019a3c093e059e1d2c5b16dd29bbd294740d9294de838cf14 WHIRLPOOL 39e0d40d58bbe80ec5c7222f4f8961767620b99c147c059fbff48841e492785ad26fc137707cfae64fd175d095d02a641b50c46e7caace6738643c329f3744dd
 MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQQ+BxAAoJEEqz6FtPBkyjE/gH/05wyzIFheZUjib82lNly6cP
-ymQLIwtohKr3Vw+HrBRU6ISxahNEDfQAtT2otknAp+NZScsPkGGtCiIck5kpenau
-J1BiVuAjioZCeoiQSwmJCOx3im0mDM5V7hJxlJEkdXlOx/pNleDHx1ZI+ekzx1Ol
-kGWERrqmPDfTpo5jNVtExV+t3BK7KUi9u5M8karmmdm+QRDH2hvRQHMhLCesOnaA
-M/WhxPX7pa83i5efWeLi5SdTSKmgoTjcbtoFUDApkIrzaGlWEmjE0xrACJCq9BYz
-BbwbN8RPqegWCBD+tSfCCvkXZD5XYVeOTH4CTnd7Koz1JHPmc1bEmeatDDWqqr4=
-=MSmZ
+iQEcBAEBCAAGBQJQQ+DQAAoJEEqz6FtPBkyjkFcH/2i/NGXub+8tAUwz4zGnMdsI
+JvRUZQqr+BhNInMRPBkg/HUlDc+4x61Kjgzm+6VkCQfGbAyqM5DGSZm169uRGTdr
+4cO9VSEVhjpblRGOSLdGzz0EJ1k5lyhpJkE0xF5UOpgREBPbNyXlY+lKlqBgB4xG
+bmrp1nS1IkbZ9J+InWUUSSv3H71mb5mcBPjvwAL6RUUdEy/9cn1TMRgPWVr8iLZu
+seMONR9CEauE4CZ7kTPkSqJ/jXtSpJcju7u7HiklSQJHIWKSumG1vEsp53fLEEzA
+Z0upLgEMb/Z0CheQOA60voG3WN6jQBBVKyS61BO9hPrDlQ4Qo8hK6ofJDpf72to=
+=D5su
 -----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
deleted file mode 100644
index ab0c3654f4af..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-5.5.0-system-pugixml.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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-4.9.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-4.9.1.ebuild
deleted file mode 100644
index adb3758c80a0..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-4.9.1.ebuild
+++ /dev/null
@@ -1,77 +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-4.9.1.ebuild,v 1.4 2012/04/16 21:20:03 ranger Exp $
-
-EAPI=4
-
-inherit wxwidgets 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="bzip2 debug lzo pch wxwidgets"
-
-RDEPEND="
-	>=dev-libs/libebml-1.2.0
-	>=media-libs/libmatroska-1.1.0
-	>=dev-libs/boost-1.36.0
-	dev-libs/expat
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	lzo? ( dev-libs/lzo )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] )
-"
-DEPEND="${RDEPEND}
-	dev-ruby/rake
-"
-
-src_prepare() {
-	# Disable automagic curl dep used for online update checking
-	sed -i -e '/curl/d' configure.in
-	export CURL_CFLAGS="" CURL_LIBS=""
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	use pch || myconf="${myconf} --disable-precompiled-headers"
-
-	if use wxwidgets ; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-		myconf="${myconf} --with-wx-config=${WX_CONFIG}"
-	fi
-
-	econf \
-		$(use_enable lzo) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable wxwidgets) \
-		$(use_enable debug) \
-		--disable-qt \
-		${myconf} \
-		--with-boost-regex=boost_regex \
-		--with-boost-filesystem=boost_filesystem \
-		--with-boost-system=boost_system
-}
-
-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
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild
deleted file mode 100644
index 17b3e1c23065..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-5.6.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.6.0.ebuild,v 1.4 2012/06/04 00:21:14 ssuominen 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}"/${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
-}