diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2014-05-19 20:04:37 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2014-05-19 20:04:37 +0000 |
| commit | 80e4b253364ed5c84f1210c533e0f662fcc97c34 (patch) | |
| tree | 0850436a172317aae35068102b16bef2ea6027ff /profiles | |
| parent | Version bump. (diff) | |
| download | gentoo-2-80e4b253364ed5c84f1210c533e0f662fcc97c34.tar.gz gentoo-2-80e4b253364ed5c84f1210c533e0f662fcc97c34.tar.bz2 gentoo-2-80e4b253364ed5c84f1210c533e0f662fcc97c34.zip | |
unmask openssl on multilib ffmpeg
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index b58d3349af4d..d401e8cbe533 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8982 2014/05/19 15:13:00 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8983 2014/05/19 20:04:37 aballier Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! + 19 May 2014; Alexis Ballier <aballier@gentoo.org> base/package.use.mask: + unmask openssl on multilib ffmpeg + 19 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask: Temporarily mask timezone-data-2014c because dev-libs/glib can't parse the new timezone format, leading to wrong timestamps everywhere. diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index f1b2ba1ac684..fa94853b9df1 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.570 2014/05/15 06:15:36 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.571 2014/05/19 20:04:37 aballier Exp $ # This file requires >=portage-2.1.1 # New entries go on top. @@ -193,7 +193,7 @@ app-editors/gvim luajit racket # Alexis Ballier <aballier@gentoo.org> (11 Aug 2013) # Multilib migrated version for binary compatibility. # Those useflags have deps that are not migrated yet. -=media-video/ffmpeg-0.10* frei0r gnutls rtmp openssl +=media-video/ffmpeg-0.10* frei0r gnutls rtmp # Kacper Kowalik <xarthisius@gentoo.org> (09 Aug 2013) # Doesn't work on most profiles. Easier to mask here and |