radhermit 14/04/28 19:48:01 Modified: ChangeLog mkvtoolnix-6.9.1.ebuild Log: Add sys-devel/gettext to DEPEND (bug #508966) and drop ruby-ng eclass usage (fixes bug #508968). (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Revision Changes Path 1.202 media-video/mkvtoolnix/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.202&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.202&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?r1=1.201&r2=1.202 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- ChangeLog 26 Apr 2014 09:46:20 -0000 1.201 +++ ChangeLog 28 Apr 2014 19:48:01 -0000 1.202 @@ -1,6 +1,10 @@ # 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.201 2014/04/26 09:46:20 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.202 2014/04/28 19:48:01 radhermit Exp $ + + 28 Apr 2014; Tim Harder <[email protected]> mkvtoolnix-6.9.1.ebuild: + Add sys-devel/gettext to DEPEND (bug #508966) and drop ruby-ng eclass usage + (fixes bug #508968). *mkvtoolnix-6.9.1 (26 Apr 2014) 1.2 media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild?r1=1.1&r2=1.2 Index: mkvtoolnix-6.9.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mkvtoolnix-6.9.1.ebuild 26 Apr 2014 09:46:21 -0000 1.1 +++ mkvtoolnix-6.9.1.ebuild 28 Apr 2014 19:48:01 -0000 1.2 @@ -1,13 +1,10 @@ # 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-6.9.1.ebuild,v 1.1 2014/04/26 09:46:21 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.9.1.ebuild,v 1.2 2014/04/28 19:48:01 radhermit Exp $ EAPI=5 WX_GTK_VER="3.0" -USE_RUBY="ruby19 ruby20 ruby21" -# don't add ruby to RDEPEND -RUBY_OPTIONAL=yes -inherit eutils ruby-ng multilib toolchain-funcs versionator wxwidgets multiprocessing autotools +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"; @@ -18,6 +15,17 @@ 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=( ruby19 ruby20 ruby21 ) +RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do echo $(ruby_atom ${ruby_impl}); done)" + RDEPEND=" >=dev-libs/libebml-1.3.0:= >=media-libs/libmatroska-1.4.1:= @@ -36,13 +44,11 @@ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) " DEPEND="${RDEPEND} - || ( $(ruby_implementations_depend) ) + || ( ${RUBY_BDEPS} ) + sys-devel/gettext virtual/pkgconfig " -# workaround to override ruby-ng -S=${WORKDIR}/${P} - pkg_pretend() { # http://bugs.gentoo.org/419257 local ver=4.6 @@ -53,15 +59,16 @@ fi } -src_unpack() { - # workaround to override ruby-ng - default -} - src_prepare() { - # hack from ruby-ng eclass to determine ruby version to build with - local ruby_implementations=$(ruby_get_use_implementations) - export RUBY="$(ruby_implementation_command ${ruby_implementations[0]})" + 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-system-pugixml.patch \ "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
