From: root Date: Tue, 17 Jul 2012 11:41:01 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=63a568520e29e015aafabbcfb1818afb578f477d;p=config%2Fsamara%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/make.conf b/make.conf index dd477ba..012fda0 100644 --- a/make.conf +++ b/make.conf @@ -29,6 +29,7 @@ ACCEPT_LICENSE=" \ AdobeFlash-10.3 \ AdobeFlash-10.1 \ skype-eula \ + skype-4.0.0.7-copyright \ Oracle-BCLA-JavaSE \ " @@ -68,7 +69,7 @@ USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa \ 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 numpy odbc ogg openal openexr opengl pango par pch pcntl pcre pdf \ - perl plasma plotutils png policykit posix postgres ppds projectm pulseaudio python quicktime real \ + perl plasma plotutils png policykit posix postgres postscript ppds projectm pulseaudio python quicktime real \ rdesktop rle sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp \ sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh \ subversion svg sysvipc tetex theora threads thumbnail tidy timidity tiff \ diff --git a/portage/package.use b/portage/package.use index 9736a3f..a73651b 100644 --- a/portage/package.use +++ b/portage/package.use @@ -159,11 +159,11 @@ media-libs/libpng apng media-libs/libquicktime lame media-libs/libvorbis aotuv media-libs/libwmf -expat -media-libs/mesa gles llvm shared-dricore +media-libs/mesa g3dvl gles gles1 gles2 llvm shared-dricore xa xvmc media-libs/netpbm rle media-libs/openjpeg tools media-libs/phonon gstreamer -media-libs/sdl-mixer mikmod +media-libs/sdl-mixer mikmod mod playtools media-libs/urt gs media-libs/x264 interlaced media-libs/xine-lib fusion vdr xvmc @@ -188,7 +188,7 @@ media-video/mjpegtools yv12 media-video/mplayer 3dnowext amrnb amrwb bs2b bl cpudetection dvdnav enca gmplayer live lzo md5sum mmxext mp2 nemesi nut opencore-amr pvr rar rtc srt teletext tga tivo xanim xvmc media-video/totem iplayer -tracker media-video/transcode extrafilters fame lzo mjpeg network nuv postproc -media-video/vlc atmo cdda cddax cdio corba daap dc1394 dirac fluidsynth gme httpd kate libass libcaca libtiger libv4l libv4l2 live matroska mod mpeg rtsp schroedinger shine shout skins stream taglib twolame vcdinfo vcdx vlm zvbi +media-video/vlc atmo cdda cddax cdio corba daap dc1394 dirac egl fbosd fluidsynth gme growl httpd kate libass libcaca libtar libtiger libv4l libv4l2 linsys live matroska mod mpeg omxil portaudio rtsp schroedinger shine shout skins stream switcher taglib twolame vcdinfo vcdx vlm zvbi net-analyzer/nagios-nrpe command-args net-analyzer/nagios-plugins nagios-dns nagios-ntp nagios-ping nagios-ssh @@ -242,7 +242,7 @@ sci-mathematics/pari -doc sci-visualization/gnuplot latex plotutils thin-splines wxwidgets sys-apps/acl nfs -sys-apps/busybox -pam savedconfig static +sys-apps/busybox math -pam savedconfig static # sys-apps/coreutils xattr sys-apps/paludis glsa inquisitio qa visibility sys-apps/pciutils network-cron -zlib