summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-02-01 20:02:47 +0000
committerMichał Górny <mgorny@gentoo.org>2015-02-01 20:02:47 +0000
commitf2cdb829bd1553648e962e25f972ad699b90f37a (patch)
tree32ffb147afe87bbd3e52f1d6f89f0400155fb3ca /profiles/base
parentMoving a big file to mirror (diff)
downloadhistorical-f2cdb829bd1553648e962e25f972ad699b90f37a.tar.gz
historical-f2cdb829bd1553648e962e25f972ad699b90f37a.tar.bz2
historical-f2cdb829bd1553648e962e25f972ad699b90f37a.zip
Set USE=libav to default to libav.
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/make.defaults7
2 files changed, 10 insertions, 2 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index db5bdade61f4..73b4ec33e5f4 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.763 2015/01/30 21:48:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.764 2015/02/01 20:02:47 mgorny Exp $
+
+ 01 Feb 2015; Michał Górny <mgorny@gentoo.org> make.defaults:
+ Set USE=libav to default to libav.
30 Jan 2015; Michał Górny <mgorny@gentoo.org> make.defaults:
Hide CPU_FLAGS_X86 everywhere but on amd64 & x86.
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 051cb6d48c3e..62a16a5740af 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.121 2015/01/30 21:48:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.122 2015/02/01 20:02:47 mgorny Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
@@ -138,3 +138,8 @@ UNINSTALL_IGNORE="/lib/modules/*"
# Andreas K. Hüttel <dilfridge@gentoo.org> (23 Aug 2013)
# Make emerge messages default to English as per Council decision
LC_MESSAGES=C
+
+# Michał Górny <mgorny@gentoo.org> (01 Feb 2015)
+# Move the current Gentoo preference (libav over ffmpeg)
+# from virtual/ffmpeg into USE flags.
+USE="${USE} libav"