summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-12-10 03:20:50 +0000
committerTim Harder <radhermit@gentoo.org>2012-12-10 03:20:50 +0000
commitef6156e926d5fa5778fd5a243683ca07f9d5411d (patch)
treeeb86a815d2c5e77478294689a9d19f864f7a56af /media-video/mkvtoolnix
parentVersion bump. (diff)
downloadgentoo-2-ef6156e926d5fa5778fd5a243683ca07f9d5411d.tar.gz
gentoo-2-ef6156e926d5fa5778fd5a243683ca07f9d5411d.tar.bz2
gentoo-2-ef6156e926d5fa5778fd5a243683ca07f9d5411d.zip
Remove old.
(Portage version: 2.2.0_alpha145/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'media-video/mkvtoolnix')
-rw-r--r--media-video/mkvtoolnix/ChangeLog6
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-5.6.0-system-pugixml.patch31
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-5.7.0.ebuild92
3 files changed, 5 insertions, 124 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/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
-}