Remove USE=libav default. See news item 2015-04-16 ffmpeg default.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 2fe065481cc9a5143f710322208244f5152b63fe..6b6db3b3de0d05bf6c374d3f78ce8d3b21febdaa 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9932 2015/04/15 12:17:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9933 2015/04/16 11:48:16 yngwin 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!
 
+  16 Apr 2015; Ben de Groot <yngwin@gentoo.org> base/make.defaults:
+  Remove USE=libav default. See news item 2015-04-16 ffmpeg default.
+
   15 Apr 2015; Ulrich Müller <ulm@gentoo.org> profiles.desc:
   [QA] Revert default/linux/arm/13.0 profile back to stable. This has been
   acknowledged by the QA team lead and three other QA members.

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 31614900e3e34b73518aac373a929e259f410e0f..259d3a44d233fc05d36263d9bea51adca9253903 100644 (file)
--- 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.123 2015/02/20 01:33:38 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.124 2015/04/16 11:48:17 yngwin Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -139,8 +139,3 @@ UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock"
 # 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"