summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-09-09 23:17:37 +0000
committerTim Harder <radhermit@gentoo.org>2012-09-09 23:17:37 +0000
commite73a3f40e343bed4a8fbddc69bed083215f5b20d (patch)
tree12d1a033b3417e09650416da2d710c4605475a7d /media-video/mkvtoolnix
parentbump to 12.8, see bug #431694 for additional details (diff)
downloadgentoo-2-e73a3f40e343bed4a8fbddc69bed083215f5b20d.tar.gz
gentoo-2-e73a3f40e343bed4a8fbddc69bed083215f5b20d.tar.bz2
gentoo-2-e73a3f40e343bed4a8fbddc69bed083215f5b20d.zip
Fix build with boost-1.50 (bug #434504) and use bundled drake for building (bug #347355).
(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)
Diffstat (limited to 'media-video/mkvtoolnix')
-rw-r--r--media-video/mkvtoolnix/ChangeLog6
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild14
2 files changed, 10 insertions, 10 deletions
diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 6990254706c2..9214b0a1fbcf 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.175 2012/09/02 22:42:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.176 2012/09/09 23:17:37 radhermit Exp $
+
+ 09 Sep 2012; Tim Harder <radhermit@gentoo.org> mkvtoolnix-5.8.0.ebuild:
+ Fix build with boost-1.50 (bug #434504) and use bundled drake for building
+ (bug #347355).
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:
diff --git a/media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild
index 419becbb3be7..75144b3268a9 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild
@@ -1,9 +1,9 @@
# 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.8.0.ebuild,v 1.1 2012/09/02 22:40:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild,v 1.2 2012/09/09 23:17:37 radhermit Exp $
EAPI=4
-inherit eutils toolchain-funcs versionator wxwidgets
+inherit eutils toolchain-funcs versionator wxwidgets multiprocessing
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
@@ -34,7 +34,7 @@ RDEPEND="
wxwidgets? ( x11-libs/wxGTK:2.8[X] )
"
DEPEND="${RDEPEND}
- dev-ruby/rake
+ dev-lang/ruby
virtual/pkgconfig
"
@@ -72,19 +72,15 @@ src_configure() {
${myconf} \
--disable-optimization \
--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 V=1 || die
+ ./drake V=1 -j$(makeopts_jobs) || die
}
src_install() {
- # Don't run strip while installing stuff, leave to portage the job.
- DESTDIR="${D}" rake install || die
+ DESTDIR="${D}" ./drake -j$(makeopts_jobs) install || die
dodoc AUTHORS ChangeLog README TODO
doman doc/man/*.1