Bladeren bron

Minimized USE flags overrides

Maxim Kammerer 11 jaren geleden
bovenliggende
commit
8de36ad0da
2 gewijzigde bestanden met toevoegingen van 13 en 23 verwijderingen
  1. 12 15
      src/etc/portage/make.conf
  2. 1 8
      src/etc/portage/package.use/all

+ 12 - 15
src/etc/portage/make.conf

@@ -23,21 +23,18 @@ FEATURES="webrsync-gpg usersync userpriv usersandbox collision-protect
 MAKEOPTS="-j3"
 
 # USE flags (aggregative)
-USE="aac acpi alsa apng archive bluetooth bs2b cairo calendar caps cdda cjk
-     consolekit cpudetection custom-cflags custom-optimization cue dbus dhcp
-     dmi eap-sim eap-tls exif expat flac gmp gpm grammar groupwise
-     gtk gtkspell hires-icons hybrid-auth id3tag idn iproute2 irda jbig jpeg
-     jpeg2k lcms libcanberra libkms libnotify libproxy lzma m17n-lib mad mbim mktemp
-     mmx mmxext modemmanager mp3 multicall netlink networkmanager ntfsdecrypt ntfsprogs
-     ogg pcmcia pcsc-lite pkcs11 png policykit scsi
+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
-     staticsocket svg symlink thesaurus threads tiff truetype udev uuid usb v4l
-     vorbis wavpack webgl wifi X X509 xattr xft xinerama xmp xps xv"
+     staticsocket svg symlink threads tiff truetype udev uuid usb v4l vorbis
+     wavpack wifi X X509 xattr xft xinerama xps xv"
 
-USE="${USE} -ant -automount -berkdb -cracklib -cramfs -cups -cxx -enca -firmware-loader
-     -fts3 -gdbm -git -http-cache -ipv6 -lvm1 -mudflap -netifrc -orc -postscript -ptpax
-     -qt4 -sendmail -session -sqlite -static -tcpd -thin -webkit -xscreensaver
-     -zeroconf"
+USE="${USE} -automount -berkdb -cracklib -cramfs -cxx -enca -firmware-loader
+     -gdbm -ipv6 -lvm1 -netifrc -postscript -ptpax -sendmail -session -sqlite
+     -tcpd -thin -webkit"
 
 # PaX markings
 PAX_MARKINGS="XT"
@@ -74,6 +71,7 @@ EMERGE_WARNING_DELAY=0
 DONT_MOUNT_BOOT=1
 
 # Explicitly list accepted license types
+# /usr/portage/{licenses,profiles/license_groups}
 # FREE                        = FSF-APPROVED + OSI-APPROVED + MISC-FREE + FREE-DOCUMENTS
 # freedist                    = unrestricted distribution
 # lha                         = unrestricted distribution via network
@@ -82,11 +80,10 @@ DONT_MOUNT_BOOT=1
 # myspell-ru_RU-ALexanderLebedev = unrestricted distribution in unmodified / binary form
 # Atmel                       = unrestricted distribution in binary form
 # bluez-firmware              = distribution by BlueZ project
-# Broadcom                    = should probably be "as-is" (#446658)
 # PUEL                        = personal license (build-time virtualbox-bin)
 # CC-BY-*, all-rights-res.    = claws-mail-themes (pruned except for Gnome (GPL-v3))
 ACCEPT_LICENSE="-* @FREE freedist unRAR lha @BINARY-REDISTRIBUTABLE Atmel
-                   myspell-ru_RU-ALexanderLebedev bluez-firmware Broadcom PUEL
+                   myspell-ru_RU-ALexanderLebedev bluez-firmware PUEL
                    CC-BY-NC-SA-3.0 CC-BY-ND-3.0 all-rights-reserved"
 
 # Backward compatibility wrt. /etc/portage/repos.conf (#474574, #478318)

+ 1 - 8
src/etc/portage/package.use/all

@@ -11,11 +11,9 @@ dev-lang/python                 -ncurses -readline
 app-text/hunspell               -ncurses
 sys-devel/gettext               -ncurses
 sys-apps/gawk                   -readline
-dev-lang/lua                    -readline
 dev-libs/libpcre                -readline
 dev-libs/libxml2                -readline
 dev-db/sqlite                   -readline
-dev-libs/gobject-introspection  -cairo
 app-i18n/uim                    gtk3
 x11-themes/light-themes         gtk3
 
@@ -36,7 +34,6 @@ net-misc/iputils                -ssl
 dev-libs/opensc                 -ssl
 app-i18n/uim                    -ssl
 net-libs/glib-networking        -gnome
-net-irc/hexchat                 -libproxy
 
 # Multimedia
 # [ffmpeg/libav: encode-only flags: mp3 aac faac theora vorbis x264 xvid]
@@ -44,13 +41,11 @@ virtual/ffmpeg                  -X -encode -truetype -speex
 media-video/libav               -X -encode -truetype -alsa -network -ssl -qt-faststart  -hardcoded-tables  -speex -v4l  avx
 media-sound/sox                 encode
 media-plugins/gst-plugins-meta  dv lame theora vpx x264 xvid  a52 dts dvd libass mms mpeg  ffmpeg
-media-libs/gst-plugins-base             theora
 www-client/firefox              -alsa gstreamer  system-jpeg system-cairo system-sqlite system-icu  -wifi
 media-libs/libass               -harfbuzz
 
 # Unnecessary functionality
 sys-libs/ncurses                minimal
-dev-util/dialog                 minimal
 media-libs/libsndfile           minimal
 dev-lang/spidermonkey           minimal
 sys-apps/util-linux             -suid
@@ -58,7 +53,6 @@ sys-apps/kmod                   -zlib -lzma
 sys-apps/pciutils               -zlib
 sys-apps/usbutils               -zlib
 sys-apps/usb_modeswitch         jimtcl
-sys-fs/lvm2                     -udev
 media-libs/libcanberra          -udev
 app-crypt/gnupg                 -usb
 net-firewall/iptables           -netlink
@@ -83,13 +77,12 @@ app-emulation/virtualbox-bin    headless -additions -chm
 # (ppp[ipv6]: #440696)
 sys-boot/syslinux               -custom-cflags
 sys-boot/grub                   -custom-cflags
-sys-apps/busybox                static savedconfig
+sys-apps/busybox                savedconfig
 sys-kernel/linux-firmware       savedconfig
 sys-devel/gcc                   cxx
 sys-devel/binutils              cxx
 virtual/udev                    gudev
 sys-fs/udev                     gudev
-media-libs/openjpeg             tools
 gnome-base/librsvg              tools
 dev-util/strace                 aio
 app-portage/eix                 strong-security