scripts + conf updates and merge

This commit is contained in:
Stefan Reimer 2013-09-02 17:54:59 -07:00
parent f6aef7591c
commit 0550745fde
5 changed files with 161 additions and 35 deletions

View File

@ -16,15 +16,7 @@ CHOST="x86_64-pc-linux-gnu"
DO_USE="mmx mmxext sse sse2 3dnow 3dnowext smp" DO_USE="mmx mmxext sse sse2 3dnow 3dnowext smp"
# X # X
# DO_USE="${DO_USE} qt3support cairo gtk gtk3 d3d gallium libkms nvidia X xcb opengl truetype xcomposite" DO_USE="${DO_USE} qt3support cairo gtk gtk3 gles2 gstreamer g3dvl nvidia vaapi vdpau libkms X xcb opengl s3tc truetype xcomposite"
# DO_USE="${DO_USE} qt3support cairo gtk gtk3 gstreamer g3dvl nvidia vaapi vdpau libkms X xcb opengl s3tc truetype xcomposite"
DO_USE="${DO_USE} qt3support cairo gtk gtk3 gstreamer nvidia vaapi vdpau g3dvl X xcb opengl truetype xcomposite"
# KDE
# DO_USE="${DO_USE} kde qt4 webkit"
# Gnome
# DO_USE="${DO_USE} gnome emerald nautilus"
# OpenBox # OpenBox
DO_USE="${DO_USE} thunar webkit" DO_USE="${DO_USE} thunar webkit"
@ -34,35 +26,41 @@ DO_USE="${DO_USE} apng raw pdf exif gif tiff png jpeg xvid lcms xmp avi dvd dvdr
# Sound # Sound
DO_USE="${DO_USE} pulseaudio alsa openal" DO_USE="${DO_USE} pulseaudio alsa openal"
DO_USE="${DO_USE} mpd mp3 m3u mpg123 ogg vorbis mad aac cdr lame libsamplerate taglib" DO_USE="${DO_USE} mpd mp3 m3u mpg123 ogg opus vorbis mad aac cdr lame libsamplerate taglib"
# Middleware # Middleware
DO_USE="${DO_USE} acpi curl cups dbus lm_sensors device-mapper gnutls net threads icu lvm nfs libnotify python resolvconf sql sqlite system-sqlite unicode udev xml" DO_USE="${DO_USE} acpi cryptsetup curl cups consolekit policykit java dbus lm_sensors device-mapper gnutls net threads icu nsplugin lvm nfs libnotify python resolvconf sql sqlite spice system-sqlite unicode udev xml"
# USE_NOT="-avahi -abiword -fortran -nfsv3 -arts -ipv6" # USE_NOT="-avahi -abiword -fortran -nfsv3 -arts -ipv6"
USE_NOT="-hal -libproxy" USE_NOT="-hal -ipv6 -libproxy"
# PORTDIR_OVERLAY="/mnt/portage/overlays/layman/pentoo" # PORTDIR_OVERLAY="/mnt/portage/overlays/layman/pentoo"
PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/quarks" PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/quarks"
PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/layman/steam"
# PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/layman/DuPol"
# PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/mv" # PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/mv"
# PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/layman/x11" # PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/layman/x11"
DISTDIR="/mnt/portage/distfiles" DISTDIR="/mnt/portage/distfiles"
PORTDIR="/mnt/portage/portage" PORTDIR="/mnt/portage/portage"
PKGDIR="/mnt/portage/packages" PKGDIR="/mnt/portage/packages"
PORT_LOGDIR="/var/log/portage"
DRACUT_MODULES="btrfs caps crypt crypt-gpg crypt-ssh lvm mdraid syslog" # Requires pbzip2 being installed
PORTAGE_BZIP2_COMMAND="pbzip2"
PORTAGE_COMPRESS="${PORTAGE_BZIP2_COMMAND}"
DRACUT_MODULES="btrfs caps crypt crypt-gpg dmsquash-live lvm mdraid nfs syslog iscsi plymouth"
#GRUB_PLATFORMS="coreboot efi-32 efi-64 pc qemu" #GRUB_PLATFORMS="coreboot efi-32 efi-64 pc qemu"
# FEATURES="skiprocheck userfetch parallel-fetch strict ccache" # FEATURES="skiprocheck userfetch parallel-fetch strict ccache"
FEATURES="skiprocheck userfetch parallel-fetch strict" FEATURES="clean-logs fail-clean parallel-install skiprocheck userfetch parallel-fetch strict"
CCACHE_DIR="/root/.ccache" CCACHE_DIR="/root/.ccache"
CCACHE_SIZE="4G" CCACHE_SIZE="4G"
# VIDEO_CARDS="fbdev vesa vga nvidia nouveau radeon fglrx" VIDEO_CARDS="nvidia fbdev radeon radeonsi vesa vga"
# VIDEO_CARDS="fglrx radeon radeonsi" INPUT_DEVICES="keyboard mouse evdev wacom"
# VIDEO_CARDS="nvidia nouveau fbdev vesa vga"
VIDEO_CARDS="fbdev vesa vga nvidia"
QEMU_SOFTMMU_TARGETS="i386 x86_64" QEMU_SOFTMMU_TARGETS="i386 x86_64"
QEMU_USER_TARGETS="i386 x86_64" QEMU_USER_TARGETS="i386 x86_64"
RUBY_TARGETS="ruby19" RUBY_TARGETS="ruby19"
@ -74,5 +72,5 @@ CLEAN_DELAY="3"
LINGUAS="en de" LINGUAS="en de"
USE="${DO_USE} ${USE_NOT}" USE="${DO_USE} ${USE_NOT}"
SYNC="rsync://rsync.ca.gentoo.org/gentoo-portage"
GENTOO_MIRRORS="http://gentoo.arcticnetwork.ca/" GENTOO_MIRRORS="rsync://gentoo.gossamerhost.com/gentoo-distfiles/ ftp://mirror.csclub.uwaterloo.ca/gentoo-distfiles/ ftp://mirror.datapipe.net/gentoo http://gentoo.netnitco.net http://gentoo.mirrors.easynews.com/linux/gentoo/"

View File

@ -1,6 +1,92 @@
sys-kernel/dracut # Base
sys-boot/grub sys-boot/grub
sys-fs/cryptsetup
sys-kernel/dracut
# sys-boot/efibootmgr
# sys-boot/os-prober
# sys-kernel/hardened-sources
app-admin/paxtest
app-emulation/lxc # AMD overclock
sys-firmware/amd-ucode
sys-power/tpc
# sys-power/cpupower
=media-sound/logitechmediaserver-bin-7.7.2-r2 # Shiny boot
sys-boot/plymouth-openrc-plugin
sys-boot/plymouth
media-gfx/gimp
# required by media-libs/gegl-0.2.0-r2
# required by media-gfx/gimp-2.8.6
# required by @selected
# required by @world (argument)
=media-libs/babl-0.1.10-r1 ~amd64
# required by media-gfx/gimp-2.8.6
# required by @selected
# required by @world (argument)
=media-libs/gegl-0.2.0-r2 ~amd64
app-emulation/wine
app-emulation/uae
games-emulation/advancemame
# Color Management
# media-gfx/colorhug-client
media-gfx/dispcalgui
www-client/firefox
www-plugins/adobe-flash
# EVE
games-util/gtkevemon **
games-util/pyfa
# required by games-util/pyfa-1.1.15[graph]
# required by pyfa (argument)
=dev-python/matplotlib-1.3.0 ~amd64
# required by games-util/pyfa-1.1.15
# required by pyfa (argument)
=dev-python/sqlalchemy-0.8.2 ~amd64
# media-libs/mesa
# app-admin/eselect-opengl
# sys-devel/llvm
# x11-proto/glproto
# x11-libs/libdrm
# x11-drivers/xf86-video-ati
# media-libs/libtxc_dxtn
# x11-drivers/ati-drivers
x11-drivers/nvidia-drivers
# media-video/nvidia-settings
# app-admin/eselect-opencl
#required by lxdm (argument)
lxde-base/lxdm
x11-misc/tint2
#required by dev-java/icedtea-7.2.0-r1[nsplugin], required by dev-java/icedtea (argument)
>=dev-java/icedtea-web-1.1.3-r7 ~amd64
#required by dev-java/icedtea-web-1.1.3-r7
>=dev-java/icedtea-7.2.0-r1 ~amd64
# Android
dev-util/android-sdk-update-manager
# PenTesting
#net-analyzer/metasploit
#dev-ruby/kissfft
#dev-ruby/msgpack
#net-analyzer/fierce
#net-analyzer/theHarvester
# net-analyzer/dnsrecon
#app-forensics/regripper
media-video/rtmpdump **
# sci-geosciences/googleearth
#required by sci-geosciences/googleearth-6.2.2.6613, required by sci-geosciences/googleearth (argument)
# =dev-util/patchelf-0.6 ~amd64
# media-video/mplayer2

View File

@ -0,0 +1 @@
www-plugins/adobe-flash AdobeFlash-11.x

View File

@ -1,6 +1,45 @@
# required by media-sound/pulseaudio-2.1-r1[udev] # sys-fs/cryptsetup dynamic
# required by media-libs/openal-1.15.1[pulseaudio] dev-libs/libgcrypt static-libs
# required by media-video/ffmpeg-1.0.7[openal] dev-libs/libgpg-error static-libs
# required by virtual/ffmpeg-0.10.3 dev-libs/popt static-libs
# required by media-plugins/alsa-plugins-1.0.26[ffmpeg] sys-apps/util-linux static-libs
=virtual/udev-200 hwdb
sys-fs/udev extras gudev hwdb
virtual/udev extras gudev hwdb
# x11-drivers/ati-drivers qt4
app-emulation/wine -win64 -gstreamer
dev-python/matplotlib wxwidgets
app-emulation/libvirt qemu virt-network
net-misc/spice-gtk -gstreamer
gnome-base/gvfs gdu
app-admin/conky eve
media-libs/libgpod ios
#required by app-text/gnome-doc-utils-0.20.6, required by gnome-doc-utils (argument)
dev-libs/libxml2 python
dev-db/sqlite secure-delete unlock-notify
net-analyzer/nmap lua
media-sound/pulseaudio gnome
x11-misc/tint2 battery
dev-lang/php pcntl gd zip
sys-kernel/hardened-sources injection symlink
# Don't support ruby1.9 yet
app-editors/gvim -ruby
app-editors/vim -ruby
#required by media-video/vlc-2.0.1, required by vlc (argument)
sys-libs/zlib minizip
www-client/firefox system-cairo system-jpeg

View File

@ -2,21 +2,23 @@
# set -x # set -x
CPUS=$(nproc) CPUS=$(nproc)
emerge --update --deep --newuse --pretend --jobs ${CPUS} world # as many cc as CPUs
export MAKEOPTS="-j${CPUS}"
echo "Press Ctrl-C to abort..."
read
# Trigger mount # Trigger mount
# ls /mnt/portage/distfiles /mnt/portage/portage > /dev/null # ls /mnt/portage/distfiles /mnt/portage/portage > /dev/null
emerge --update --deep --newuse --keep-going --jobs ${CPUS} world # Half as many emerge as CPUs, to speed up configure runs
emerge --ask --update --deep --newuse --keep-going --accept-properties=-interactive --jobs $((CPUS/2)) world
# echo "Fixing pax flags..." # echo "Fixing pax flags..."
# ${SCRIPT_DIR}/fix_grsec.sh # ${SCRIPT_DIR}/fix_grsec.sh
echo "Going to remove unneeded packages ..." echo "Going to remove unneeded packages ..."
emerge --depclean --jobs ${CPUS} emerge --depclean
echo "Fixing dependencies..." echo "Fixing dependencies..."
revdep-rebuild -i revdep-rebuild -i
echo "Updating eix cache..."
eix-update -q