From 213650bfb8614d56f2145d51a85da897647d438f Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 9 Aug 2016 16:45:22 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- portage/make.conf | 6 +++--- portage/package.keywords | 6 ++++++ portage/package.mask | 6 +++--- portage/package.unmask | 2 +- portage/package.use | 2 ++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/portage/make.conf b/portage/make.conf index d4207383..e2b6375d 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -71,16 +71,16 @@ L10N="de en en-GB en-US ru vi" # These are the USE flags that were used in addition to what is provided by the # profile used for building. USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards - amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding bzip2 cairo caja + amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding bzip2 cacert cairo caja calendar caps cdda cddb cdparanoia cdr cgi consolekit cpudetection cscope css ctype cups curl curlwrappers cvs dane dbase dbi dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples - encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile flickr fltk fluidsynth fontconfig + encode epub exif expat fam fastcgi ffmpeg fftw fits flac flatfile flickr fltk fluidsynth fontconfig foomaticdb ftp gconf gd gd-external geoip ggi gif gimp git glade glib gmp gnome gnome-keyring gnustep gost gphoto2 gpm graphviz gsl gsm gstreamer gtk gtk3 gtkhtml hal hscolour html iconv icu id3 id3tag idea idn ieee1394 imagemagick imap imlib inifile ithreads java javascript jabber jack java6 jbig jikes jingle jpeg jpeg2k json json-syck json-xs kerberos keyring kig-scripting kpathsea lame latex lcms ldap libcaca - libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lxc lz4 lzma lzo mad meanwhile mercurial + libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lxc lz4 lzma lzo mad magic meanwhile mercurial midi mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis nptl nsplugin nss numpy odbc ogg openal openexr opengl openssl opus pango par pch pcntl pcre pdf perl diff --git a/portage/package.keywords b/portage/package.keywords index f52dfeac..d4d5dcc4 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -152,9 +152,15 @@ dev-python/pb-logging ~dev-qt/designer-4.8.7 ~dev-qt/qt3support-4.8.7 ~dev-qt/qtcore-4.8.7 +~dev-qt/qtdbus-4.8.7 +~dev-qt/qtdeclarative-4.8.7 ~dev-qt/qtgui-4.8.7 +~dev-qt/qtmultimedia-4.8.7 +~dev-qt/qtopengl-4.8.7 ~dev-qt/qtscript-4.8.7 ~dev-qt/qtsql-4.8.7 +~dev-qt/qtsvg-4.8.7 +~dev-qt/qttest-4.8.7 ~dev-qt/qttranslations-4.8.7 ~dev-qt/qtwebkit-4.8.7 ~dev-qt/qtwebkit-4.10.4 diff --git a/portage/package.mask b/portage/package.mask index 72b72357..a5c43a81 100644 --- a/portage/package.mask +++ b/portage/package.mask @@ -11,9 +11,9 @@ =media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r3 -#=media-libs/phonon-4.9.0 -#=media-libs/phonon-gstreamer-4.9.0 -#=media-libs/phonon-vlc-0.9.0 +=media-libs/phonon-4.9.0 +=media-libs/phonon-gstreamer-4.9.0 +=media-libs/phonon-vlc-0.9.0 =media-video/mplayer-1.2_pre20150214 diff --git a/portage/package.unmask b/portage/package.unmask index 237abaab..5d8a592e 100644 --- a/portage/package.unmask +++ b/portage/package.unmask @@ -16,7 +16,7 @@