Maxim Kammerer 11 жил өмнө
parent
commit
d78fa34855

+ 1 - 2
doc/info.txt

@@ -47,7 +47,7 @@ openvpn                 ssl, polarssl           ssl             networkmanager-o
 pkcs11-helper           !ssl, gnutls, nss       ssl             openvpn
 pkcs11-helper           !ssl, gnutls, nss       ssl             openvpn
 
 
 glib-networking         gnutls                  gnutls          libsoup
 glib-networking         gnutls                  gnutls          libsoup
-libsoup                 gnutls                  gnutls          gst-plugins-soup
+libsoup                 gnutls                  gnutls
 libmicrohttpd           gnutls                  gnutls          cables
 libmicrohttpd           gnutls                  gnutls          cables
 curl                    ssl, gnutls, nss        ssl             cables, gnupg
 curl                    ssl, gnutls, nss        ssl             cables, gnupg
 wget                    ssl, gnutls             ssl             portage
 wget                    ssl, gnutls             ssl             portage
@@ -169,7 +169,6 @@ Tor                              (127.0.0.1:9050)
             libsoup-gnome        (GNOME libsoup plugin)
             libsoup-gnome        (GNOME libsoup plugin)
               Totem              (Playlist parser)
               Totem              (Playlist parser)
             NetworkManager       (connectivity checking)
             NetworkManager       (connectivity checking)
-            gst-plugins-soup     (GStreamer HTTP plugin, http_proxy envvar is supported)
       libxml2                    (NanoHTTP)
       libxml2                    (NanoHTTP)
       libmms
       libmms
           gst-plugins-libmms     (GStreamer MMS plugin)
           gst-plugins-libmms     (GStreamer MMS plugin)

+ 5 - 6
src/etc/portage/make.conf

@@ -22,12 +22,11 @@ FEATURES="webrsync-gpg collision-protect compress-build-logs clean-logs"
 MAKEOPTS="-j3"
 MAKEOPTS="-j3"
 
 
 # USE flags (aggregative)
 # USE flags (aggregative)
-USE="aac alsa apng bluetooth caps cdda cjk consolekit cpudetection custom-cflags
-     custom-optimization dbus dhcp dmi eap-sim eap-tls expat flac gmp gpm
-     gtk gtkspell id3tag idn iproute2 jbig jpeg jpeg2k lcms libcanberra
-     libnotify lzma m17n-lib mad mbim mktemp mmx mmxext modemmanager mp3
-     multicall netlink ntfsdecrypt ogg pcmcia pkcs11 png policykit scsi
-     smartcard smime sndfile speex spell sse sse2 startup-notification
+USE="aac alsa apng bluetooth caps cdda cjk consolekit dbus dhcp dmi eap-sim
+     eap-tls expat flac gmp gpm gtk gtkspell id3tag idn iproute2 jbig jpeg
+     jpeg2k lcms libcanberra libnotify lzma m17n-lib mad mbim mktemp mmx mmxext
+     modemmanager mp3 multicall netlink ntfsdecrypt ogg pcmcia pkcs11 png
+     policykit scsi smartcard smime sndfile spell sse sse2 startup-notification
      staticsocket svg symlink threads tiff truetype udev uuid usb v4l vorbis
      staticsocket svg symlink threads tiff truetype udev uuid usb v4l vorbis
      wavpack wifi X X509 xattr xft xinerama xps xv"
      wavpack wifi X X509 xattr xft xinerama xps xv"
 
 

+ 0 - 7
src/etc/portage/package.accept_keywords

@@ -25,10 +25,3 @@ x11-drivers/radeon-ucode
 
 
 # Compilation failure (#317539)
 # Compilation failure (#317539)
 =net-wireless/irda-utils-0.9.18*
 =net-wireless/irda-utils-0.9.18*
-
-# Python dependency (#398955)
-=gnome-base/libglade-2.6.4*
-
-# Stabilization (#511502)
-=net-libs/libpcap-1.5.3
-=net-analyzer/tcpdump-4.5.1-r1

+ 6 - 6
src/etc/portage/package.use/all

@@ -36,10 +36,11 @@ app-i18n/uim                    -ssl
 net-libs/glib-networking        -gnome
 net-libs/glib-networking        -gnome
 
 
 # Multimedia
 # Multimedia
-# [ffmpeg/libav: encode-only flags: mp3 aac faac theora vorbis x264 xvid]
-virtual/ffmpeg                  -X -encode -truetype -speex
-media-video/libav               -X -encode -truetype -alsa -network -ssl -qt-faststart  -hardcoded-tables  -speex -v4l  avx
+# [ffmpeg/libav: encode-only flags: mp3 aac faac fdk theora vorbis x264 xvid]
+virtual/ffmpeg                  -X -encode -truetype
+media-video/libav               -X -encode -truetype -alsa -network -ssl  -hardcoded-tables  -v4l
 media-sound/sox                 encode
 media-sound/sox                 encode
+media-sound/vorbis-tools        speex
 media-plugins/gst-plugins-meta  dv lame theora vpx x264 xvid  a52 dts dvd libass mms mpeg  ffmpeg
 media-plugins/gst-plugins-meta  dv lame theora vpx x264 xvid  a52 dts dvd libass mms mpeg  ffmpeg
 www-client/firefox              -alsa gstreamer  system-jpeg system-cairo system-sqlite system-icu  -wifi
 www-client/firefox              -alsa gstreamer  system-jpeg system-cairo system-sqlite system-icu  -wifi
 media-libs/libass               -harfbuzz
 media-libs/libass               -harfbuzz
@@ -75,13 +76,12 @@ app-emulation/virtualbox-bin    headless -additions -chm
 
 
 # Extra functionality
 # Extra functionality
 # (ppp[ipv6]: #440696)
 # (ppp[ipv6]: #440696)
-sys-boot/syslinux               -custom-cflags
-sys-boot/grub                   -custom-cflags
 sys-apps/busybox                savedconfig
 sys-apps/busybox                savedconfig
 sys-kernel/linux-firmware       savedconfig
 sys-kernel/linux-firmware       savedconfig
 sys-devel/gcc                   cxx
 sys-devel/gcc                   cxx
 sys-devel/binutils              cxx
 sys-devel/binutils              cxx
-virtual/udev                    gudev
+www-client/firefox              custom-cflags custom-optimization
+media-video/libav               custom-cflags cpudetection 3dnow 3dnowext ssse3 avx
 sys-fs/udev                     gudev
 sys-fs/udev                     gudev
 gnome-base/librsvg              tools
 gnome-base/librsvg              tools
 dev-util/strace                 aio
 dev-util/strace                 aio