diff --git a/conf/portage/make.conf b/conf/portage/make.conf index 21dc5fc..a4a1ec7 100644 --- a/conf/portage/make.conf +++ b/conf/portage/make.conf @@ -18,7 +18,7 @@ CHOST="x86_64-pc-linux-gnu" DO_USE="smp" # X -DO_USE="${DO_USE} cairo glamor gtk gtk3 gles2 gstreamer g3dvl imlib libkms nvidia qt4 qt3support vaapi vdpau libkms X xcb opencl opengl s3tc truetype vaapi xcomposite" +DO_USE="${DO_USE} cairo gtk gtk3 gtkstyle gles2 gstreamer g3dvl imlib libkms nvidia qt4 qt3support vaapi vdpau libkms X xcb opencl opengl s3tc truetype vaapi xcomposite" # OpenBox DO_USE="${DO_USE} thunar" @@ -66,7 +66,8 @@ FEATURES="clean-logs fail-clean parallel-install skiprocheck userfetch parallel- CCACHE_DIR="/root/.ccache" CCACHE_SIZE="4G" -VIDEO_CARDS="intel nvidia fbdev radeon radeonsi vesa vga" +#VIDEO_CARDS="intel nvidia fbdev radeon radeonsi vesa vga" +VIDEO_CARDS="intel nvidia fbdev vesa vga" INPUT_DEVICES="keyboard mouse evdev synaptics wacom" QEMU_SOFTMMU_TARGETS="i386 x86_64" diff --git a/conf/portage/package.keywords b/conf/portage/package.keywords index aa34606..587be77 100644 --- a/conf/portage/package.keywords +++ b/conf/portage/package.keywords @@ -41,6 +41,7 @@ app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-soundlibs app-emulation/emul-linux-x86-xlibs +app-emulation/emul-linux-x86-qtlibs # Color Management # media-gfx/colorhug-client @@ -105,3 +106,6 @@ app-misc/gcalcli # media-video/mplayer2 sys-block/partclone + +# Neccessary evil +net-im/skype diff --git a/conf/portage/package.license b/conf/portage/package.license index 794a796..55093db 100644 --- a/conf/portage/package.license +++ b/conf/portage/package.license @@ -1,3 +1,4 @@ +net-im/skype skype-4.0.0.7-copyright www-plugins/adobe-flash AdobeFlash-11.x games-fps/quake3-data Q3AEULA games-fps/quake3-teamarena Q3AEULA diff --git a/conf/portage/package.mask b/conf/portage/package.mask index 7522068..f479a85 100644 --- a/conf/portage/package.mask +++ b/conf/portage/package.mask @@ -1,6 +1,8 @@ +sys-apps/systemd sys-fs/udev sys-auth/polkit gnome-extra/polkit-gnome lxde-base/lxpolkit sys-auth/consolekit sys-auth/rtkit +sys-fs/udisks diff --git a/conf/portage/package.unmask b/conf/portage/package.unmask new file mode 100644 index 0000000..b4c8e8c --- /dev/null +++ b/conf/portage/package.unmask @@ -0,0 +1 @@ +net-im/skype diff --git a/scripts/setup_box.sh b/scripts/setup_box.sh index 6608853..69573a0 100755 --- a/scripts/setup_box.sh +++ b/scripts/setup_box.sh @@ -16,4 +16,4 @@ link() { } link "update_portage.sh update_box.sh make_kernel.sh" "/mnt/portage/overlays/quarks/scripts" "/usr/local/sbin" -link "make.conf package.use package.keywords package.license package.mask" "/mnt/portage/overlays/quarks/conf/portage" "/etc/portage" +link "make.conf package.use package.keywords package.license package.mask package.unmask" "/mnt/portage/overlays/quarks/conf/portage" "/etc/portage"