diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-06-04 00:18:43 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-06-04 00:18:43 +0000 |
| commit | 19490c0bc030fce4f6e398961e3fca23357500d4 (patch) | |
| tree | abe8409e5b7dca0dde55e688834dff5e8daccdf4 /media-video | |
| parent | inherit flag-o-matic for append-flags (diff) | |
| download | gentoo-2-19490c0bc030fce4f6e398961e3fca23357500d4.tar.gz gentoo-2-19490c0bc030fce4f6e398961e3fca23357500d4.tar.bz2 gentoo-2-19490c0bc030fce4f6e398961e3fca23357500d4.zip | |
Ensure GCC is at least 4.6.0 for C++11 range-based 'for' and nullptr support wrt #419257 by "RazrFalcon"
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mkvtoolnix/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild | 15 |
2 files changed, 17 insertions, 4 deletions
diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog index 49e0c5ec9163..ee85c233bb16 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.168 2012/05/31 11:28:17 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.169 2012/06/04 00:18:43 ssuominen Exp $ + + 04 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> mkvtoolnix-5.6.0.ebuild: + Ensure GCC is at least 4.6.0 for C++11 range-based 'for' and nullptr support + wrt #419257 by "RazrFalcon" 31 May 2012; Tim Harder <radhermit@gentoo.org> mkvtoolnix-5.6.0.ebuild: Drop arches that need to keyword dev-libs/pugixml. diff --git a/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild index 4c0fb2920d96..eedeee7038a4 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild @@ -1,10 +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.6.0.ebuild,v 1.2 2012/05/31 11:28:17 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild,v 1.3 2012/06/04 00:18:43 ssuominen Exp $ EAPI=4 - -inherit wxwidgets eutils +inherit eutils toolchain-funcs versionator wxwidgets DESCRIPTION="Tools to create, alter, and inspect Matroska files" HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix" @@ -39,6 +38,16 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +pkg_setup() { + # http://bugs.gentoo.org/419257 + local ver=4.6.0 + local msg="You need at least GCC ${ver} 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}"/${P}-system-pugixml.patch } |