From a714634deddfc3645fc9190f4ebf67f1080da9a2 Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Tue, 27 Nov 2012 17:20:00 +0000 Subject: [PATCH] profile: this action merges in the vast majority of the default USE= section of the make.conf file. This won't be as noisy as it looks, but a few changes were made. Enjoy the ride and thanks for flying Pentoo. --- profiles/pentoo/base/make.defaults | 2 +- profiles/pentoo/base/package.use/app-admin | 1 + profiles/pentoo/base/package.use/app-emulation | 2 +- profiles/pentoo/base/package.use/app-forensics | 1 + profiles/pentoo/base/package.use/dev-java | 1 + profiles/pentoo/base/package.use/dev-libs | 1 + profiles/pentoo/base/package.use/dev-util | 2 +- profiles/pentoo/base/package.use/dev-vcs | 2 +- profiles/pentoo/base/package.use/enlightenment | 2 +- profiles/pentoo/base/package.use/media-libs | 5 ++--- profiles/pentoo/base/package.use/media-plugins | 2 ++ profiles/pentoo/base/package.use/media-sound | 1 + profiles/pentoo/base/package.use/media-video | 6 +++--- profiles/pentoo/base/package.use/net-analyzer | 1 + profiles/pentoo/base/package.use/net-misc | 1 + profiles/pentoo/base/package.use/net-wireless | 3 +++ profiles/pentoo/base/package.use/x11-base | 1 + profiles/pentoo/base/package.use/x11-libs | 4 +--- profiles/pentoo/base/package.use/xfce-base | 1 + profiles/pentoo/hardened/linux/base/package.mask | 8 ++++---- profiles/pentoo/hardened/linux/base/use.mask | 4 ++-- 21 files changed, 31 insertions(+), 20 deletions(-) create mode 100644 profiles/pentoo/base/package.use/dev-java create mode 100644 profiles/pentoo/base/package.use/media-plugins create mode 100644 profiles/pentoo/base/package.use/media-sound create mode 100644 profiles/pentoo/base/package.use/x11-base diff --git a/profiles/pentoo/base/make.defaults b/profiles/pentoo/base/make.defaults index c409bb27d..ac8e7af99 100644 --- a/profiles/pentoo/base/make.defaults +++ b/profiles/pentoo/base/make.defaults @@ -30,7 +30,7 @@ RUBY_TARGETS="ruby18 ruby19" PORTAGE_NICENESS="9" -USE="${USE} adns gps netlink caps lm_sensors perl pulseaudio ruby xattr" +USE="${USE} 32bit X aac acpi adns alsa cairo consolekit curl dbus fontconfig gtk gps gstreamer jack jpeg netlink caps lua lm_sensors lzma mp3 ogg opengl oss perl png policykit pulseaudio ruby sqlite subversion svg qt3support qt4 truetype udev usb vorbis xattr xrandr" PORTAGE_BZIP2_COMMAND="lbzip2" diff --git a/profiles/pentoo/base/package.use/app-admin b/profiles/pentoo/base/package.use/app-admin index 785ac8031..04cd491c3 100644 --- a/profiles/pentoo/base/package.use/app-admin +++ b/profiles/pentoo/base/package.use/app-admin @@ -1 +1,2 @@ +app-admin/sudo offensive app-admin/testdisk ntfs diff --git a/profiles/pentoo/base/package.use/app-emulation b/profiles/pentoo/base/package.use/app-emulation index f2ce6e2d4..c8be4a572 100644 --- a/profiles/pentoo/base/package.use/app-emulation +++ b/profiles/pentoo/base/package.use/app-emulation @@ -1,3 +1,3 @@ -app-emulation/libvirt python +app-emulation/libvirt python qemu app-emulation/virt-manager -policykit app-emulation/qemu mixemu diff --git a/profiles/pentoo/base/package.use/app-forensics b/profiles/pentoo/base/package.use/app-forensics index 054cee269..81a4ba75d 100644 --- a/profiles/pentoo/base/package.use/app-forensics +++ b/profiles/pentoo/base/package.use/app-forensics @@ -1,2 +1,3 @@ +app-forensics/afflib qemu app-forensics/sleuthkit aff ewf app-forensics/dff ewf diff --git a/profiles/pentoo/base/package.use/dev-java b/profiles/pentoo/base/package.use/dev-java new file mode 100644 index 000000000..618bacd39 --- /dev/null +++ b/profiles/pentoo/base/package.use/dev-java @@ -0,0 +1 @@ +dev-java/icedtea-bin nsplugin diff --git a/profiles/pentoo/base/package.use/dev-libs b/profiles/pentoo/base/package.use/dev-libs index 250bf732d..1c00e7360 100644 --- a/profiles/pentoo/base/package.use/dev-libs +++ b/profiles/pentoo/base/package.use/dev-libs @@ -2,3 +2,4 @@ dev-libs/libgcrypt static-libs dev-libs/libgpg-error static-libs dev-libs/popt static-libs dev-libs/libxml2 icu +dev-libs/boost mpi diff --git a/profiles/pentoo/base/package.use/dev-util b/profiles/pentoo/base/package.use/dev-util index 594cf7a18..086a476e9 100644 --- a/profiles/pentoo/base/package.use/dev-util +++ b/profiles/pentoo/base/package.use/dev-util @@ -1 +1 @@ -dev-util/nvidia-cuda-sdk opencl +dev-util/nvidia-cuda-sdk opencl -doc -examples diff --git a/profiles/pentoo/base/package.use/dev-vcs b/profiles/pentoo/base/package.use/dev-vcs index e2a2b43b8..59aaa67a7 100644 --- a/profiles/pentoo/base/package.use/dev-vcs +++ b/profiles/pentoo/base/package.use/dev-vcs @@ -1 +1 @@ -dev-vcs/subversion perl +dev-vcs/subversion perl -dso diff --git a/profiles/pentoo/base/package.use/enlightenment b/profiles/pentoo/base/package.use/enlightenment index cfe127102..5ec71013f 100644 --- a/profiles/pentoo/base/package.use/enlightenment +++ b/profiles/pentoo/base/package.use/enlightenment @@ -3,7 +3,7 @@ x11-misc/expedite X opengl -sdl dev-libs/eet ssl threads dev-libs/e_dbus hal libnotify connman dev-libs/ecore glib threads xim curl ssl inotify evas opengl X xscreensaver -sdl -media-libs/evas X cserve eet fontconfig gif jpeg mmx opengl png pnm safety-checks sse svg threads tiff xpm -static-modules -sdl +media-libs/evas X cserve eet fontconfig gif jpeg mmx opengl pnm safety-checks sse svg threads tiff xpm -static-modules -sdl media-libs/emotion gstreamer static-modules media-libs/ethumb dbus emotion epdf x11-libs/elementary X dbus opengl weather xdg -sdl diff --git a/profiles/pentoo/base/package.use/media-libs b/profiles/pentoo/base/package.use/media-libs index 03d002329..c3f9c4172 100644 --- a/profiles/pentoo/base/package.use/media-libs +++ b/profiles/pentoo/base/package.use/media-libs @@ -1,5 +1,4 @@ media-libs/libpng apng media-libs/mesa xa - -#required by media-gfx/graphviz -media-libs/gd truetype png fontconfig +media-libs/gd truetype fontconfig jpeg +media-libs/imlib2 gif diff --git a/profiles/pentoo/base/package.use/media-plugins b/profiles/pentoo/base/package.use/media-plugins new file mode 100644 index 000000000..49051f774 --- /dev/null +++ b/profiles/pentoo/base/package.use/media-plugins @@ -0,0 +1,2 @@ +media-plugins/gst-plugins-meta dvd mpeg wavpack +media-plugins/audacious-plugins wavpack diff --git a/profiles/pentoo/base/package.use/media-sound b/profiles/pentoo/base/package.use/media-sound new file mode 100644 index 000000000..e1f63f71b --- /dev/null +++ b/profiles/pentoo/base/package.use/media-sound @@ -0,0 +1 @@ +media-sound/sox wavpack diff --git a/profiles/pentoo/base/package.use/media-video b/profiles/pentoo/base/package.use/media-video index 36f02a7ad..a26c2af94 100644 --- a/profiles/pentoo/base/package.use/media-video +++ b/profiles/pentoo/base/package.use/media-video @@ -1,4 +1,4 @@ -media-video/vlc dvd ffmpeg mpeg mad wxwindows aac dts a52 ogg flac theora oggvorbis matroska freetype xv stream httpd lua cdda vcd cdio live run-as-root -virtual/ffmpeg gsm speex threads -media-video/ffmpeg speex threads gsm +media-video/vlc dvd ffmpeg mpeg mad wxwindows aac dts a52 ogg flac theora oggvorbis matroska freetype xv stream httpd lua cdda vcd cdio live run-as-root x264 rtsp +virtual/ffmpeg gsm speex threads x264 +media-video/ffmpeg speex threads gsm x264 xvid media-video/libav speex threads gsm diff --git a/profiles/pentoo/base/package.use/net-analyzer b/profiles/pentoo/base/package.use/net-analyzer index dde2aba08..55942765e 100644 --- a/profiles/pentoo/base/package.use/net-analyzer +++ b/profiles/pentoo/base/package.use/net-analyzer @@ -3,3 +3,4 @@ net-analyzer/snort dynamicplugin zlib net-analyzer/wireshark gcrypt gnutls kerberos threads ares geoip portaudio smi third-party-plugins net-analyzer/ucsniff ffmpeg plugins net-analyzer/ettercap plugins +net-analyzer/scapy gnuplot pyx diff --git a/profiles/pentoo/base/package.use/net-misc b/profiles/pentoo/base/package.use/net-misc index 85b59406c..cf7550f27 100644 --- a/profiles/pentoo/base/package.use/net-misc +++ b/profiles/pentoo/base/package.use/net-misc @@ -1,2 +1,3 @@ net-misc/openvpn -static net-misc/openssh -ldap +net-misc/tor nat-pmp tor-hardening transparent-proxy upnp threads diff --git a/profiles/pentoo/base/package.use/net-wireless b/profiles/pentoo/base/package.use/net-wireless index 9b3c5abc3..e66cc5718 100644 --- a/profiles/pentoo/base/package.use/net-wireless +++ b/profiles/pentoo/base/package.use/net-wireless @@ -4,3 +4,6 @@ net-wireless/grimwepa -extra net-wireless/gnuradio fcd filter audio grc uhd utils wavelet net-wireless/lorcon python net-wireless/wifite extra dict +net-wireless/wpa_supplicant wps +net-wireless/hostapd wps +net-wireless/bluez test-programs diff --git a/profiles/pentoo/base/package.use/x11-base b/profiles/pentoo/base/package.use/x11-base new file mode 100644 index 000000000..bbf9a56bd --- /dev/null +++ b/profiles/pentoo/base/package.use/x11-base @@ -0,0 +1 @@ +x11-base/xorg-server xvfb diff --git a/profiles/pentoo/base/package.use/x11-libs b/profiles/pentoo/base/package.use/x11-libs index cdcf50d81..3d020e20e 100644 --- a/profiles/pentoo/base/package.use/x11-libs +++ b/profiles/pentoo/base/package.use/x11-libs @@ -3,7 +3,5 @@ x11-libs/wxGTK tiff x11-libs/vte python x11-libs/fltk threads xft x11-libs/libdrm libkms - -#inline with libxml2, required for net-wireless/fern-wifi-cracker -dev-python/PyQt4 webkit x11-libs/qt-webkit icu +x11-libs/qt-gui gif diff --git a/profiles/pentoo/base/package.use/xfce-base b/profiles/pentoo/base/package.use/xfce-base index 3a5548a4c..b4dd4a34c 100644 --- a/profiles/pentoo/base/package.use/xfce-base +++ b/profiles/pentoo/base/package.use/xfce-base @@ -1,2 +1,3 @@ xfce-base/thunar udev xfce-base/xfdesktop thunar +xfce-base/xfce4-session consolekit diff --git a/profiles/pentoo/hardened/linux/base/package.mask b/profiles/pentoo/hardened/linux/base/package.mask index 24ce1804a..3769b5591 100644 --- a/profiles/pentoo/hardened/linux/base/package.mask +++ b/profiles/pentoo/hardened/linux/base/package.mask @@ -1,8 +1,8 @@ # here we remove the mask from hardened profile --x11-drivers/nvidia-drivers --media-video/nvidia-settings --dev-util/nvidia-cuda-sdk +#-x11-drivers/nvidia-drivers +#-media-video/nvidia-settings +#-dev-util/nvidia-cuda-sdk # Depends on x11-drivers/nvidia-drivers --dev-python/pyopencl +#-dev-python/pyopencl diff --git a/profiles/pentoo/hardened/linux/base/use.mask b/profiles/pentoo/hardened/linux/base/use.mask index 437bf2293..1c5e22a3d 100644 --- a/profiles/pentoo/hardened/linux/base/use.mask +++ b/profiles/pentoo/hardened/linux/base/use.mask @@ -1,6 +1,6 @@ # Binary nvidia drivers are masked, USE flags must be too. # I don't care what hardened thinks, we use our video cards to crack -video_cards_nvidia --nvidia --cuda +#-nvidia +#-cuda