Remove old.

(Portage version: 2.2.0_alpha123-r1/cvs/Linux x86_64)

4 files changed, 5 insertions, 218 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/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
-}