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
commit6dc93630aabde8bd34093688db41eef1cbcfb18a (patch)
tree1f2fa6d18f94aa13932ba4e7d1dbff8ae92c6349 /media-video
parentbump to 12.8, see bug #431694 for additional details (diff)
downloadhistorical-6dc93630aabde8bd34093688db41eef1cbcfb18a.tar.gz
historical-6dc93630aabde8bd34093688db41eef1cbcfb18a.tar.bz2
historical-6dc93630aabde8bd34093688db41eef1cbcfb18a.zip
Fix build with boost-1.50 (bug #434504) and use bundled drake for building (bug #347355).
Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mkvtoolnix/ChangeLog6
-rw-r--r--media-video/mkvtoolnix/Manifest18
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild14
3 files changed, 19 insertions, 19 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/Manifest b/media-video/mkvtoolnix/Manifest
index 5cb2d02120f5..2694cea063b9 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -8,17 +8,17 @@ DIST mkvtoolnix-5.7.0.tar.bz2 3930983 SHA256 bfc947722c71130cb1896fa1d4ec39199dc
DIST mkvtoolnix-5.8.0.tar.bz2 4454971 SHA256 3c9ec7e4c035b82a35850c5ada98a29904edc44a0d1c9b900ed05d56e6274960 SHA512 c24850a8e5c68b06eec006028e7e53c92cff91e748c71bd3799f14e2299e23730043005ce3bd45271848c899df6a44c0f9bc84928c72ba886e8dd894c4b704f3 WHIRLPOOL 6e98c340bb80be55756f3d24272d712e2301f1eb8e314eababa59cf602cab7d27ea6f8ee3aa048db369abec1cfba8c5bdd2b679a0662741cea0c6cfdb5db7886
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 2137 SHA256 446ff629e90da2735fdec13cbf1654d50865f0fdc38a5f3589a8b65f4fe92277 SHA512 6671365ab66c37a40d955463296c0ffa70ae81398aa2ba669d12935be4b5006a9dc37bb3a27d7b2f78705aa037d2fb6d9e2886fd581d53dc2ce3e04d90e794aa WHIRLPOOL 737f04920fdbebe059a1480f619be85294770f597f3a27f877e5bda8439902ffd0edb152303f1d7924106201e85714e7d767ca84e190716e2e7934b457554026
-MISC ChangeLog 25854 SHA256 9423bc6dbfb44f931bc0dabf7400fb8c3721feb21d33aee4e219b4e22f5345f5 SHA512 ec7471fed2f9c994890d297f1ce292b935b657e299c862a918a21b40a7ad93d2523b5b0de6e7bba019a3c093e059e1d2c5b16dd29bbd294740d9294de838cf14 WHIRLPOOL 39e0d40d58bbe80ec5c7222f4f8961767620b99c147c059fbff48841e492785ad26fc137707cfae64fd175d095d02a641b50c46e7caace6738643c329f3744dd
+EBUILD mkvtoolnix-5.8.0.ebuild 2011 SHA256 489e602905ebe35867810d2ef2b6a387c8d09df0de46bf9f5f2e37f1da697e16 SHA512 3ccb8ea21724288319509aec387bf7fa9d2bca45e832da482247ac9a6070183c6eb13341a6206364b0067124d8a4068f868b135fdaa9bfb48b415f4b4f44bed8 WHIRLPOOL 3e0938bf7fb5dcbc444b163f787a1dfc387986b97419364b46bf1ddd47fad937e2d50901938c610acecf8e3a580e1989ed86791df947e613ee00be43128194ae
+MISC ChangeLog 26023 SHA256 1dd028003dd5577b99687c4154ea13cb4947309e4c47d90ae390dbcd4026377e SHA512 54b59a3db9b673189b53f64a927b4c8d326ed5572af7b332a8f298972ad5d8498c89ad7d3a3534ec2bd2022cd6187f1ae6ddf8cb63aa2f069e8c1496a21c3968 WHIRLPOOL 827fc35414377f1c34ce3eaa98eb58c3d5cf08849d965c0449f02b9c5eebf0d6f02be9a1501426c85ccad88be50d7be9c76ae8040951f61dae35af198b73e6ce
MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQQ+DQAAoJEEqz6FtPBkyjkFcH/2i/NGXub+8tAUwz4zGnMdsI
-JvRUZQqr+BhNInMRPBkg/HUlDc+4x61Kjgzm+6VkCQfGbAyqM5DGSZm169uRGTdr
-4cO9VSEVhjpblRGOSLdGzz0EJ1k5lyhpJkE0xF5UOpgREBPbNyXlY+lKlqBgB4xG
-bmrp1nS1IkbZ9J+InWUUSSv3H71mb5mcBPjvwAL6RUUdEy/9cn1TMRgPWVr8iLZu
-seMONR9CEauE4CZ7kTPkSqJ/jXtSpJcju7u7HiklSQJHIWKSumG1vEsp53fLEEzA
-Z0upLgEMb/Z0CheQOA60voG3WN6jQBBVKyS61BO9hPrDlQ4Qo8hK6ofJDpf72to=
-=D5su
+iQEcBAEBCAAGBQJQTSOaAAoJEEqz6FtPBkyj3fcH/1u1HFzVsTLRgsIB4j/JKwNR
+aStG1SG1+TXZfCAsmoByVcHZeWYRIGj8ZaLFPcy/ObwsXRiaHoES0aPsh2e3V6rI
+No3waFwBJtRI5U14w9M4HnfWtCehiKlHzBpJ7aP7UZiXCdidJjStk4aYKGnNVVHX
+S6Jv1ySfCk4aBmF4hE+It/WWR5hFc79D4E8RmOa5FiGRn1TjHN6Yu0rmf+55Yp4I
+elDgO/78UgJ82QidYQh35pAvVjYIJmTxi9L76GNsKpkvf5QPzie6cn/etmfKtLv6
+xtHpaPZf84DlBirpfn5XCcDbXt9hbM6NhOMdWQsOQZbUGo/i0LosuFBhfbzLuqo=
+=tVG9
-----END PGP SIGNATURE-----
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