From: Tim Harder Date: Mon, 15 Dec 2014 00:23:16 +0000 (+0000) Subject: Add explicit bdep on virtual/rubygems to workaround bug #509220. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7568bb85e41f864d07c8a092848020531f7a6fc7;p=gentoo.git Add explicit bdep on virtual/rubygems to workaround bug #509220. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3 --- diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog index a2769ff11f42..f6dfb2830b85 100644 --- a/media-video/mkvtoolnix/ChangeLog +++ b/media-video/mkvtoolnix/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mkvtoolnix # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.208 2014/12/13 05:04:43 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.209 2014/12/15 00:23:11 radhermit Exp $ + +*mkvtoolnix-7.4.0-r1 (15 Dec 2014) + + 15 Dec 2014; Tim Harder +mkvtoolnix-7.4.0-r1.ebuild: + Add explicit bdep on virtual/rubygems to workaround bug #509220. *mkvtoolnix-7.4.0 (13 Dec 2014) diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 4d650a4c9846..f5c0afceac5e 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -18,17 +18,18 @@ EBUILD mkvtoolnix-6.9.1.ebuild 2826 SHA256 addcb3e0258d6c68c902214561f05fa805f46 EBUILD mkvtoolnix-7.0.0.ebuild 2826 SHA256 673a675d6c65390cebf93b67c94f50e571c68eb19aaf1d575255f12259d05974 SHA512 7b20a712717fe718727006d0472fb9f1c9e39bd443afae5ffaa5736d92dc8ce983e90c78502b2b7d8061d5aef8675c234ad783777b49bd80fa1c92b0c2441a55 WHIRLPOOL dda6a8cd45225e348a332b9519675789379da59e301b219356bc36ec80b8307b9d1d0637421ef710882ff75df0fa04e36dfde1e29726e1559ac2cb3e745212b3 EBUILD mkvtoolnix-7.2.0.ebuild 2826 SHA256 04b09d030b89097235876866e898a37b5584507403c87d12e027430bb4cfd6be SHA512 f36253574eeac9c1e4fba1fd8268cead033feb29bba8ee88bf230bd7e6e74345ab725015a4679e5ae1e3550ca1dfb958c48258dd8534d1558d42d961f5856a19 WHIRLPOOL 7d9ba4ec971f562cae12b6c42b932f81474512ad47f17584e897b5ee8df20fed4f14d619f10d742c5075b78d798f57d4ef8580aa152f9ef2280df484f7741e53 EBUILD mkvtoolnix-7.3.0.ebuild 2829 SHA256 2a5d60dbd2ae6e8d6d80a5bbd9fe528111d783e3e85fe8f38f32c3fcc5355aed SHA512 5886347781106926d94ef6fa4106692ecd299f9b491429bbccef6344eae9e364a40d72393420c437f4001242ce91a6246c1bae1813f26d26eb81663c8c3574d5 WHIRLPOOL 7c70d5e5ac4b965e1faadc00858c3fdd7a520fa105d2f9a3bdbd11fefb47eadac3278299a4b109187977821a33e9d06d47e405ec401d3368876d15fe2287f05e +EBUILD mkvtoolnix-7.4.0-r1.ebuild 2811 SHA256 d170012f8e332abf8bee4d1cba9d8e6eebf5c990cb313f7e8d617f996377ff3b SHA512 95d06e451364d7de3d493a440a87b13641a54abaf7ba627924d847766c69c239bb8c99ac0b3920c925f659fcbd482f2bec44b0e21de44552b4e4f6e3c98707a6 WHIRLPOOL 27aff273d7fa19180ea3deeeb37b34b1614f5a7873366a44989862ccbdace8fc256467f21e70e4aad74ae7cef7a4a3c520c4fcca35e1eedfcb12c7ba66e3aeb2 EBUILD mkvtoolnix-7.4.0.ebuild 2778 SHA256 13e135d6330846d2291d157dee38669bf77bb5b3379f10677488908efa61c9be SHA512 18cb15ff50f844518e4f1ee477906fe1c9399f13b8997448f00525beb83b45264c2e82843f39581efeca44960a8baf730cd91f50130d39f5eedb160ed66411af WHIRLPOOL 626165afa5b90bfbe4aca1782d74b6a9cc90e76d7c795ad37bb1e4682a3479af1976c4e0dffb1742c519863db04930e0caadf252d070b934c1d5c0e12c8b4114 -MISC ChangeLog 30465 SHA256 b4ca2999b7b4caa69517ddca05e78ce3876ca41284cb1ec913c07050f48e63bf SHA512 1937cb9579fd0b3cb5d2a58e8d3f350266905c1b2930b8cbbe529121a5a7861727c14f7c7b551ecddcc4a711b4fa51c8f775ca35dad5bb35d6d6f2a713aa0e74 WHIRLPOOL c89522cd826b55ba2396b12bad817457d5225564312cf4d1e94afe21ef8376b9dbcfe39184e6f78b117b4a013a6c402ac76e13fd5644b3f3f5508228595075f2 +MISC ChangeLog 30647 SHA256 5e7e4b8f73017e68e072d0aa8c67c6a95227556c02ca3deddecfec09b0ea413d SHA512 d1ac23b7af8a206380367e67ee04dcef922318329db09c0d05bcb138d9a5a6813e42f3363ff5e98974879fa3bc8fd106adfb98c781e86a6aaed7e4de34644c5c WHIRLPOOL 7b5dd7465794bf1b1a6a8b255f59e53b8773901412a3eedeea53c9abe5315d5c77fa74151bcbe114902c244ac2f4669341fcff91956b63876eaba0cd364eb38e MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUi8j4AAoJEEqz6FtPBkyjkO4H+wfiX2AWOQjEWovrKkOeh2NP -3mmQ8DVDIIBRALCYryb8yYi2BXvDLqEqeYqlEv2wTeE4PGxxa3Ey6lUptocM/ECk -B3Ztrrm9dC0jwKo49uwVzwIl4Xpcpx3hQ+qoksbHb4b0rjuBLxA7nktVx9nsdQr9 -/39Paevo9BHV2Ehe+2m1NDfJy19kjugCxIWcL816iWQUHLlvTnyo2bKT5b2ZpVFl -hJHNEqyHqkFo5H2W1pEFjqHNiej0oKRbzO0FOHxMzyNYDjLYfeTR6haVKYWAk4an -41zbOSqYjE2ijRyAxIdtjyq3LeLgXQ+9yI/LSjZGf5Y3svUpm550D+99WvOzRQY= -=FIne +iQEcBAEBCAAGBQJUjin9AAoJEEqz6FtPBkyj9UUH+wVhEiUfzOSVYtfYj+Lhze9t +abCMfdpuV+7tNobQkzrKRDXut9v3T+xF0Mi0cJqSDTuS0nC+HlT+sEfunyYEwhR1 +8yW90QDrMX5pSXfNVXV3mTGoSBpGkTUi1ZVAN0A46hWnb+68maRVaDsfsLA4gdCZ +5JgKAfZFSy/RXCOvqStFSvtcQaRpmQ7ChhR1+t8rwUjIZ6G1KA8+Aw7IcNEITIU1 +l80xWUsmJEg+5pIjyAl8vYk+cnkal7WKyuKc7Yrl2w3bua+Qk14MYrHENgMg97c6 +TeSl99JC9NA8lV0ZBjIozWWoWdoFIgVxWv+Z2ulFq8Z+Nenp/BS6gWStAnMS8LA= +=9su1 -----END PGP SIGNATURE----- diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.4.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.4.0-r1.ebuild new file mode 100644 index 000000000000..ecb49f1f867f --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-7.4.0-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.4.0-r1.ebuild,v 1.1 2014/12/15 00:23:11 radhermit Exp $ + +EAPI=5 +WX_GTK_VER="3.0" +inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing 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.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="debug pch qt5 wxwidgets" + +ruby_atom() { + local ruby_slot=${1/ruby/} + ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}" + echo "dev-lang/ruby:${ruby_slot}" +} + +# hacks to avoid using the ruby eclasses since this requires something similar +# to the python-any-r1 eclass for ruby which currently doesn't exist +RUBY_IMPLS=( ruby21 ruby20 ) +RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do + echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems:${ruby_impl} )"; done)" + +RDEPEND=" + >=dev-libs/libebml-1.3.0:= + >=media-libs/libmatroska-1.4.1:= + >=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 + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) +" +DEPEND="${RDEPEND} + || ( ${RUBY_BDEPS} ) + sys-devel/gettext + virtual/pkgconfig +" + +pkg_pretend() { + # 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() { + local ruby_impl + for ruby_impl in "${RUBY_IMPLS[@]}"; do + if has_version "$(ruby_atom ${ruby_impl})"; then + export RUBY=${ruby_impl} + break + fi + done + + [[ -z ${RUBY} ]] && die "No available ruby implementations to build with" + + epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch + eautoreconf +} + +src_configure() { + local myconf + + if use wxwidgets ; then + need-wxwidgets unicode + myconf="--with-wx-config=${WX_CONFIG}" + fi + + econf \ + $(use_enable debug) \ + $(use_enable qt5 qt) \ + $(use_enable wxwidgets) \ + $(usex pch "" --disable-precompiled-headers) \ + ${myconf} \ + --disable-optimization \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-boost="${EPREFIX}"/usr \ + --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \ + --without-curl +} + +src_compile() { + "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die +} + +src_install() { + DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die + + dodoc AUTHORS ChangeLog README.md TODO + doman doc/man/*.1 + + use wxwidgets && docompress -x /usr/share/doc/${PF}/guide +}