Nove to new layout

2014-11-02 09:42:47 +01:00
parent 68d6318910
commit 250a08b5dd
124 changed files with 5211 additions and 1623 deletions
--- a/conf/armarch/portage/package.keywords/package.keywords
+++ b/conf/armarch/portage/package.keywords/package.keywords
@@ -0,0 +1,111 @@
+# Only use stable versions of these libs
+sys-kernel/linux-headers -~arm
+sys-libs/glibc -~arm
+=sys-libs/glibc-2.17* ~arm
+<dev-lang/python-3 -~arm
+dev-libs/openssl -~arm
+dev-lang/perl -~arm
+sys-devel/make -~arm
+sys-kernel/linux-headers -~arm
+net-libs/gnutls -~arm
+dev-lang/tcl -~arm
+dev-lang/tk -~arm
+dev-lang/ghc -~arm
+dev-lang/ruby -~arm
+# sci-mathematics/maxima needs texinfo <5.0
+# stick texinfo to stable to avoid matter bump it
+sys-apps/texinfo -~arm
+
+# We want Portage 2.2
+<sys-apps/portage-2.3 ** ~arm
+
+# Temp keywording, will test and add keywords back
+www-servers/nginx ** ~arm
+
+# it has long cmdline patch, they say it fixes webkit-gtk
+# (but it's not true)
+=sys-devel/make-3.82-r4 ** ~arm
+
+# Keyword E17
+=dev-libs/eio-1.7.4 ** ~arm
+=x11-wm/enlightenment-0.17.0 ** ~arm
+
+<xfce-extra/xfce4-notifyd-9999 ** ~arm
+
+# Want slim for testing
+<=x11-misc/slim-1.3.3 ** ~arm
+
+# Want gnumeric for testing
+=app-office/gnumeric-1.10.17 ** ~arm
+
+# Real men want dosbox on ARM
+=games-emulation/dosbox-0.74 ** ~arm
+
+# need this
+=dev-libs/gjs-1.32.0 ** ~arm
+
+# Games!
+<=games-strategy/freeciv-2.3.2 ** ~arm
+
+=app-office/glabels-3.0.0 ** ~arm
+
+# want WICD
+=dev-python/urwid-1.0.1 ** ~arm
+=net-misc/wicd-1.7.2.4-r1 ** ~arm
+
+# want xnoise
+=media-sound/xnoise-0.2.2 ** ~arm
+
+# want xvid
+=media-plugins/gst-plugins-xvid-0.10.22 ** ~arm
+
+# want lightdm
+=x11-misc/lightdm-1.2.2-r3 ** ~arm
+=x11-misc/lightdm-gtk-greeter-1.1.5 ** ~arm
+
+# want exaile
+=media-libs/mutagen-1.20 ** ~arm
+=media-sound/exaile-0.3.2.1 ** ~arm
+
+# want emesene
+dev-python/pywebkitgtk ** ~arm
+dev-python/papyon ** ~arm
+net-im/emesene ** ~arm
+
+# Additional deps pulled in that need to be keyworded
+=app-editors/xemacs-21.5.31 ** ~arm
+=app-xemacs/emerge-1.11 ** ~arm
+=app-xemacs/xemacs-base-2.27 ** ~arm
+<x11-libs/libdesktop-agnostic-9999 ** ~arm
+<media-libs/libprojectm-9999 ** ~arm
+<dev-lang/yasm-9999 ** ~arm
+<dev-lang/nacl-toolchain-newlib-9999 ** ~arm
+
+# Media stuff
+# =media-video/mpeg-tools-1.5b-r4 **
+=media-video/xvid4conf-1.12 ** ~arm
+
+# Frozen Bubble
+=games-arcade/frozen-bubble-2.2.1_beta1 ** ~arm
+
+# XBMC, we want unstable
+media-tv/xbmc ~arm
+
+# GNOME keywords
+<gnome-extra/nemo-9999 ** ~arm
+<x11-wm/muffin-9999 ** ~arm
+
+# Needed for MATE 1.6
+=x11-themes/gtk-engines-murrine-0.98.2 ** ~arm
+=x11-themes/murrine-themes-0.98.0 ** ~arm
+
+# Misc
+<media-libs/vigra-9999 ** ~arm
+
+# Firefox, we want stable
+www-client/firefox -~arm
+# Chromium, we want it
+www-client/chromium ** ~arm
+
+# We want to resolve mdns stuff
+<sys-auth/nss-mdns-9999 ** ~arm
--- a/conf/armarch/portage/package.license/package.license
+++ b/conf/armarch/portage/package.license/package.license
@@ -0,0 +1 @@
+sys-libs/imx-lib	Freescale
--- a/conf/armarch/portage/package.mask/package.mask
+++ b/conf/armarch/portage/package.mask/package.mask
@@ -0,0 +1 @@
+>sys-fs/udev-171-r5
--- a/conf/armarch/portage/package.unmask/package.unmask
+++ b/conf/armarch/portage/package.unmask/package.unmask
@@ -0,0 +1,4 @@
+# Unmask GNOME 3.8
+=dev-libs/glib-2.36*
+=dev-libs/gobject-introspection-common-1.36*
+=dev-libs/gobject-introspection-1.36*
--- a/conf/armarch/portage/package.use/00-sabayon.package.use
+++ b/conf/armarch/portage/package.use/00-sabayon.package.use
@@ -3,6 +3,7 @@ dev-lang/python sqlite
 sys-apps/file python
 dev-libs/boost python
 dev-db/sqlite soundex
+sys-libs/glibc suid nscd

 # GCC
 sys-devel/gcc gcj objc objc-gc objc++ graphite
@@ -20,7 +21,7 @@ media-libs/freetype auto-hinter
 media-gfx/imagemagick truetype fontconfig corefonts png

 # Required by several stuff
-sys-auth/pambase consolekit
+sys-auth/pambase -consolekit systemd
 sys-auth/consolekit policykit

 # doesn't compile with epoll
@@ -33,7 +34,8 @@ dev-libs/libxml2 icu
 xfce-base/xfce4-session policykit udev
 # required by xfce4 and upower stuff
 # extras is required by net-wireless/bluez
-sys-fs/udev gudev extras
+sys-apps/systemd -gtk plymouth cryptsetup static-libs lzma xattr openrc gudev extras hwdb keymap
+virtual/udev hwdb gudev keymap

 # LXDE stuff
 x11-misc/obconf lxde
@@ -42,7 +44,9 @@ x11-misc/obconf lxde
 media-libs/imlib2 X

 # Firefox stuff
-media-libs/libpng apng
+# -neon: /usr/lib/libpng16.so.16: undefined symbol: png_read_filter_row_avg4_neon
+media-libs/libpng apng -neon
+www-client/chromium -system-ffmpeg

 # Language packs!
 sys-apps/man-pages -linguas_da -linguas_de -linguas_fr -linguas_it -linguas_ja -linguas_nl -linguas_pl -linguas_ro -linguas_ru -linguas_zh_CN
@@ -69,15 +73,29 @@ sys-apps/man-pages -linguas_da -linguas_de -linguas_fr -linguas_it -linguas_ja -
 #app-text/hunspell linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh

 # KDE stuff
-x11-libs/qt-core qt3support ssl
+app-text/poppler qt4
+dev-qt/qtcore qt3support ssl
+dev-qt/qtsql qt3support mysql
+dev-qt/qtgui qt3support mng
+dev-qt/qtopengl qt3support
+dev-qt/qthelp qt3support
+dev-qt/qtdeclarative qt3support
+dev-qt/qtdemo qt3support
+dev-qt/qtwebkit icu
+kde-base/kdepimlibs semantic-desktop
+kde-base/kdelibs semantic-desktop opengl
+kde-base/kwin opengl gles
+dev-python/PyQt4 script svg declarative sql webkit X
+kde-base/kde-l10n linguas_be linguas_csb linguas_ne linguas_th linguas_wa

 # GNOME stuff
+app-accessibility/orca python_targets_python3_3
+app-crypt/gcr gtk
 app-text/poppler cairo
-sys-fs/udev hwdb
+app-text/poppler-glib cairo
 sys-apps/pciutils -zlib
-gnome-base/gvfs cdda
+gnome-base/gvfs cdda gtk
 x11-libs/gdk-pixbuf jpeg
-x11-libs/qt-core -qt3support
 sys-apps/dbus X
 net-libs/gtk-vnc gtk3
 net-print/cups dbus
@@ -86,12 +104,17 @@ gnome-base/gvfs gdu
 gnome-base/gnome-settings-daemon packagekit policykit
 gnome-base/gconf policykit
 net-im/empathy gnome-online-accounts
+net-im/mcabber otr
 mail-client/evolution networkmanager
 x11-libs/gtk+ X
 gnome-base/gnome-menus python
 # required by Sulfur
 x11-libs/vte:0 python
-dev-libs/folks eds
+dev-libs/folks eds vala
+gnome-extra/evolution-data-server vala
+app-i18n/ibus dconf
+# required by sabayon-artwork-gnome
+x11-themes/elementary-icon-theme monochrome

 # MATE stuff
 app-arch/mate-file-archiver caja
@@ -108,7 +131,7 @@ app-text/mate-document-viewer caja mate mate-keyring
 app-office/libreoffice -nsplugin -gnome -java templates -kde pdfimport

 # Multimedia!
-media-libs/libsdl X opengl
+media-libs/libsdl directfb X opengl 
 media-libs/sdl-image gif jpeg png
 media-video/mplayer jpeg png pulseaudio -dvdnav
 media-video/mplayer2 jpeg png pulseaudio -cpudetection -dvdnav
@@ -138,13 +161,55 @@ media-libs/evas X
 dev-python/pygobject cairo

 # Do not user thread worker
-<www-servers/apache-2.4 -threads
+www-servers/apache -threads

 # Enable USE=branding
 x11-themes/elementary-icon-theme branding

 # Enable cryptsetup in genkernel
 sys-kernel/genkernel cryptsetup crypt
+# Kernel stuff!
+sys-kernel/linux-odroid luks mdadm lvm
+sys-kernel/linux-sabayon luks mdadm lvm
+sys-kernel/linux-beaglebone luks mdadm lvm
+sys-kernel/linux-efikamx luks mdadm lvm
+sys-kernel/linux-raspberry luks mdadm lvm

 # Needed for emesene
 net-libs/farstream python
+
+# PHP wants gd
+dev-lang/php -threads apache2 curl gd truetype fpm ftp pdo sockets mysql mysqli
+app-admin/eselect-php fpm
+
+# GST stuff
+media-libs/gst-plugins-base X
+
+# NSS, we want utils!
+dev-libs/nss:0 utils
+
+# libmicrohttpd, we want messages!
+net-libs/libmicrohttpd:0 messages
+
+# bitcoin-qt needs -leveldb
+dev-libs/leveldb -snappy
+
+# Texlive
+app-text/texlive-core cjk xetex
+media-libs/harfbuzz icu
+
+# WX Widgets
+x11-libs/wxGTK X tiff
+
+# Disable Python (needs 3.x) in gedit
+app-editors/gedit -python
+app-editors/gedit-plugins -python -terminal
+
+# if USE=acl, then also upcall
+net-fs/cifs-utils upcall
+
+# cifs-utils requires samba[winbind]
+net-fs/samba winbind
+
+# pyside has opengl and X enabled
+dev-python/pyside opengl X
--- a/conf/armv5tel/portage/make.conf
+++ b/conf/armv5tel/portage/make.conf
@@ -0,0 +1,43 @@
+CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
+CXXFLAGS="${CFLAGS}"
+CHOST="armv6j-hardfloat-linux-gnueabi"
+
+### COMMON PART (besides USE=neon)
+#################################################
+# Portage configuration
+ACCEPT_KEYWORDS="arm ~arm"
+FEATURES="ccache distcc parallel-fetch protect-owned compressdebug splitdebug"
+# temp disabled: distcc-pump
+MAKEOPTS="-j6 -s"
+CCACHE_SIZE="5G"
+CCACHE_DIR="/var/ccache"
+# Global USE flags
+USE="cpudetection cups goom joystick jpeg opengl png svg theora fontconfig truetype xvid"
+# Sound USE flags
+USE="${USE} pulseaudio alsa flac mp3 vorbis ogg"
+# System USE flags
+USE="${USE} -consolekit dbus introspection logind perl policykit python systemd threads udev xattr xcb"
+# Video OpenGL stuff
+# Note: GLES2 is disabled globally atm. mesa-9.1.2 has bugs if both gl, and gles2 are enabled.
+# The bug is in the GL{ES2,} headers (name clash), and gnome-shell fails to build because of that.
+USE="${USE} -gles2"
+
+LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr" 
+LINGUAS="${LINGUAS} fy ga gl he hi hr hu ia is it ja kk km ko lt lv mk mn ms nb nds nl" 
+LINGUAS="${LINGUAS} nn pa pl pt pt_BR ro ru rw se si sk sl sr sr@Latn ss sv ta tg tr uk" 
+LINGUAS="${LINGUAS} uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE ug zh"
+
+# distcc configuration
+DISTCC_HOSTS="localhost/1 172.16.255.1/5"
+# DISTCC_VERBOSE=1
+
+# Package specific configuration
+APACHE2_MPMS="prefork"
+# No Python3 Noooo
+PYTHON_TARGETS="python2_7"
+USE_PYTHON="2.7"
+
+#################################################
+### END COMMON PART -- cut here
+
+source /var/lib/layman/make.conf
--- a/conf/armv5tel/portage/package.keywords
+++ b/conf/armv5tel/portage/package.keywords
@@ -0,0 +1 @@
+../../armarch/portage/package.keywords
--- a/conf/armv5tel/portage/package.license
+++ b/conf/armv5tel/portage/package.license
@@ -0,0 +1 @@
+../../armarch/portage/package.license
--- a/conf/armv5tel/portage/package.mask
+++ b/conf/armv5tel/portage/package.mask
@@ -0,0 +1 @@
+../../armarch/portage/package.mask
--- a/conf/armv5tel/portage/package.unmask
+++ b/conf/armv5tel/portage/package.unmask
@@ -0,0 +1 @@
+../../armarch/portage/package.unmask
--- a/conf/armv5tel/portage/package.use
+++ b/conf/armv5tel/portage/package.use
@@ -0,0 +1 @@
+../../armarch/portage/package.use
--- a/conf/armv5tel/repo/sabayonlinux.org/packages.db.critical
+++ b/conf/armv5tel/repo/sabayonlinux.org/packages.db.critical
@@ -0,0 +1,3 @@
+sys-devel/base-gcc:4.7
+>=sys-apps/portage-2.2.0_alpha142
+>sys-libs/glibc-2.16.9999
--- a/conf/armv5tel/repo/sabayonlinux.org/packages.db.fallback_mirrors
+++ b/conf/armv5tel/repo/sabayonlinux.org/packages.db.fallback_mirrors
@@ -0,0 +1,6 @@
+# Our fallback mirror is pkg.sabayon.org
+pkg.sabayon.org
+best.sabayon.org
+dl.sabayon.org
+r.sabayon.org
+redir.sabayon.org
--- a/conf/armv5tel/repo/sabayonlinux.org/packages.db.keywords
+++ b/conf/armv5tel/repo/sabayonlinux.org/packages.db.keywords
@@ -0,0 +1,129 @@
+app-accessibility/at-spi2-core ~arm
+app-accessibility/caribou ~arm
+app-admin/apg ~arm
+app-admin/packagekit ~arm
+app-admin/packagekit-gtk ~arm
+app-crypt/seahorse ~arm
+app-editors/gedit ~arm
+app-misc/geoclue ~arm
+app-office/abiword ~arm
+app-text/libexttextcat ~arm
+app-text/libwpd ~arm
+app-text/libwpg ~arm
+app-text/libwps ~arm
+app-text/mythes ~arm
+app-text/tofrodos ~arm
+app-txt/epdfview ~arm
+dev-libs/folks ~arm
+dev-libs/gjs ~arm
+dev-libs/hyphen ~arm
+dev-libs/json-glib ~arm
+dev-libs/libgdata ~arm
+dev-libs/libpeas ~arm
+dev-python/pyatspi ~arm
+dev-util/itstool ~arm
+dev-util/mdds ~arm
+games-board/aisleriot ~arm
+gnome-base/gnome-core-libs ~arm
+gnome-base/gnome-keyring ~arm
+gnome-base/gnome-session ~arm
+gnome-base/libgnome-keyring ~arm
+gnome-extra/avant-window-navigator ~arm
+gnome-extra/gnome-games ~arm
+gnome-extra/gnome-power-manager ~arm
+gnome-extra/gnome-screensaver ~arm
+gnome-extra/gnome-system-monitor ~arm
+gnome-extra/nm-applet ~arm
+gnome-extra/yelp-xsl ~arm
+media-gfx/eog ~arm
+media-gfx/shotwell ~arm
+media-libs/clutter ~arm
+media-libs/clutter-gtk ~arm
+media-libs/cogl ~arm
+media-libs/gexiv2 ~arm
+media-libs/libbluray ~arm
+media-libs/libchamplain ~arm
+media-libs/libgnome-media-profiles ~arm
+media-libs/libgphoto2 ~arm
+media-libs/libprojectm ~arm
+media-libs/libraw ~arm
+media-libs/memphis ~arm
+media-libs/sdl-gfx ~arm
+media-libs/sdl-sound ~arm
+media-libs/vigra ~arm
+media-plugins/gst-plugins-cdparanoia ~arm
+media-plugins/gst-plugins-lame ~arm
+media-sound/sound-juicer ~arm
+media-video/cheese ~arm
+media-video/gnome-video-effects ~arm
+net-im/telepathy-connection-managers ~arm
+net-im/telepathy-logger ~arm
+net-im/telepathy-mission-control ~arm
+net-libs/gtk-vnc ~arm
+net-libs/libmicrohttpd ~arm
+net-libs/liboauth ~arm
+net-libs/rest ~arm
+net-libs/telepathy-farsight ~arm
+net-misc/vinagre ~arm
+sci-libs/colamd ~arm
+sci-libs/hdf5 ~arm
+sci-libs/ufconfig ~arm
+sci-mathematics/lpsolve ~arm
+sys-apps/ifplugd ~arm
+sys-apps/lsb-release ~arm
+sys-apps/portage ~arm
+virtual/ffmpeg ~arm
+x11-libs/libdesktop-agnostic ~arm
+x11-libs/mx ~arm
+x11-themes/gnome-icon-theme-extras ~arm
+x11-themes/sabayon-artwork-loo ~arm
+lxde-base/lxpolkit ~arm
+xfce-extra/xfce4-notifyd ~arm
+app-accessibility/at-spi2-core ~arm
+net-libs/liboauth ~arm
+media-libs/libraw ~arm
+dev-util/itstool ~arm
+dev-libs/json-glib ~arm
+media-plugins/gst-plugins-lame ~arm
+media-video/gnome-video-effects ~arm
+app-admin/apg ~arm
+net-im/telepathy-connection-managers ~arm
+sys-apps/lsb-release ~arm
+gnome-base/gnome ~arm
+dev-libs/eeze ~arm
+net-libs/gnome-online-accounts ~arm
+gnome-base/gnome-core-apps ~arm
+gnome-extra/gnome-tweak-tool ~arm
+gnome-extra/nm-applet ~arm
+dev-libs/efreet ~arm
+media-libs/evas ~arm
+x11-wm/muffin ~arm
+gnome-extra/yelp ~arm
+media-libs/edje ~arm
+gnome-extra/gnome-contacts ~arm
+media-video/totem ~arm
+net-im/empathy ~arm
+net-wireless/gnome-bluetooth ~arm
+dev-libs/eina ~arm
+gnome-base/gnome-shell ~arm
+gnome-extra/sushi ~arm
+sys-devel/make ~arm
+dev-libs/ecore ~arm
+gnome-base/gdm ~arm
+x11-wm/mutter ~arm
+gnome-extra/evolution-data-server ~arm
+dev-libs/e_dbus ~arm
+gnome-base/gnome-fallback ~arm
+www-client/epiphany ~arm
+dev-libs/eet ~arm
+gnome-base/gnome-control-center ~arm
+dev-libs/embryo ~arm
+gnome-extra/nemo ~arm
+x11-libs/libdesktop-agnostic ~arm
+media-libs/libprojectm ~arm
+x11-themes/gtk-engines-murrine ~arm
+www-servers/nginx ~arm
+media-libs/vigra ~arm
+gnome-extra/nemo ~arm
+x11-wm/muffin ~arm
+x11-themes/murrine-themes ~arm
--- a/conf/armv5tel/repo/sabayonlinux.org/packages.db.mirrors
+++ b/conf/armv5tel/repo/sabayonlinux.org/packages.db.mirrors
@@ -0,0 +1,8 @@
+# these are all the same
+http://dl.sabayon.org/entropy
+http://best.sabayon.org/entropy
+http://redir.sabayon.org/entropy
+# This will be used as last resort, and must stay here
+http://pkg.sabayon.org
+# this is in case our DNS goes down
+http://na.mirror.garr.it/mirrors/sabayonlinux/entropy
--- a/conf/armv5tel/repo/sabayonlinux.org/packages.db.system_mask
+++ b/conf/armv5tel/repo/sabayonlinux.org/packages.db.system_mask
@@ -0,0 +1,15 @@
+app-admin/equo
+app-misc/sabayon-version
+dev-db/sqlite
+sys-apps/entropy
+sys-devel/base-gcc:4.7
+sys-libs/db:4.8
+virtual/cron   
+# virtual/linux-binary
+sys-auth/pambase
+
+# glibc cannot be removed, it's part of the system
+# nowadays it's not even a system pkg because
+# virtual/libc wraps it.
+# This makes sure we always block glibc
+sys-libs/glibc
--- a/conf/armv5tel/repo/sabayonlinux.org/packages.db.webservices
+++ b/conf/armv5tel/repo/sabayonlinux.org/packages.db.webservices
@@ -0,0 +1 @@
+https://packages.sabayon.org/service
--- a/conf/armv6l/portage/make.conf
+++ b/conf/armv6l/portage/make.conf
@@ -0,0 +1,43 @@
+CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
+CXXFLAGS="${CFLAGS}"
+CHOST="armv6j-hardfloat-linux-gnueabi"
+
+### COMMON PART (besides USE=neon)
+#################################################
+# Portage configuration
+ACCEPT_KEYWORDS="arm ~arm"
+FEATURES="ccache distcc parallel-fetch protect-owned compressdebug splitdebug"
+# temp disabled: distcc-pump
+MAKEOPTS="-j6 -s"
+CCACHE_SIZE="5G"
+CCACHE_DIR="/var/ccache"
+# Global USE flags
+USE="cpudetection cups goom joystick jpeg opengl png svg theora fontconfig truetype xvid"
+# Sound USE flags
+USE="${USE} pulseaudio alsa flac mp3 vorbis ogg"
+# System USE flags
+USE="${USE} -consolekit dbus introspection logind perl policykit python systemd threads udev xattr xcb"
+# Video OpenGL stuff
+# Note: GLES2 is disabled globally atm. mesa-9.1.2 has bugs if both gl, and gles2 are enabled.
+# The bug is in the GL{ES2,} headers (name clash), and gnome-shell fails to build because of that.
+USE="${USE} -gles2"
+
+LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr" 
+LINGUAS="${LINGUAS} fy ga gl he hi hr hu ia is it ja kk km ko lt lv mk mn ms nb nds nl" 
+LINGUAS="${LINGUAS} nn pa pl pt pt_BR ro ru rw se si sk sl sr sr@Latn ss sv ta tg tr uk" 
+LINGUAS="${LINGUAS} uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE ug zh"
+
+# distcc configuration
+DISTCC_HOSTS="localhost/1 172.16.255.1/5"
+# DISTCC_VERBOSE=1
+
+# Package specific configuration
+APACHE2_MPMS="prefork"
+# No Python3 Noooo
+PYTHON_TARGETS="python2_7"
+USE_PYTHON="2.7"
+
+#################################################
+### END COMMON PART -- cut here
+
+source /var/lib/layman/make.conf
--- a/conf/armv6l/portage/package.keywords
+++ b/conf/armv6l/portage/package.keywords
@@ -0,0 +1 @@
+../../armarch/portage/package.keywords
--- a/conf/armv6l/portage/package.license
+++ b/conf/armv6l/portage/package.license
@@ -0,0 +1 @@
+../../armarch/portage/package.license
--- a/conf/armv6l/portage/package.mask
+++ b/conf/armv6l/portage/package.mask
@@ -0,0 +1 @@
+../../armarch/portage/package.mask
--- a/conf/armv6l/portage/package.unmask
+++ b/conf/armv6l/portage/package.unmask
@@ -0,0 +1 @@
+../../armarch/portage/package.unmask
--- a/conf/armv6l/portage/package.use
+++ b/conf/armv6l/portage/package.use
@@ -0,0 +1 @@
+../../armarch/portage/package.use
--- a/conf/armv6l/repo/sabayonlinux.org/packages.db.critical
+++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.critical
@@ -0,0 +1,3 @@
+sys-devel/base-gcc:4.7
+>=sys-apps/portage-2.2.0_alpha142
+>sys-libs/glibc-2.16.9999
--- a/conf/armv6l/repo/sabayonlinux.org/packages.db.fallback_mirrors
+++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.fallback_mirrors
@@ -0,0 +1,6 @@
+# Our fallback mirror is pkg.sabayon.org
+pkg.sabayon.org
+best.sabayon.org
+dl.sabayon.org
+r.sabayon.org
+redir.sabayon.org
--- a/conf/armv6l/repo/sabayonlinux.org/packages.db.keywords
+++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.keywords
@@ -0,0 +1,129 @@
+app-accessibility/at-spi2-core ~arm
+app-accessibility/caribou ~arm
+app-admin/apg ~arm
+app-admin/packagekit ~arm
+app-admin/packagekit-gtk ~arm
+app-crypt/seahorse ~arm
+app-editors/gedit ~arm
+app-misc/geoclue ~arm
+app-office/abiword ~arm
+app-text/libexttextcat ~arm
+app-text/libwpd ~arm
+app-text/libwpg ~arm
+app-text/libwps ~arm
+app-text/mythes ~arm
+app-text/tofrodos ~arm
+app-txt/epdfview ~arm
+dev-libs/folks ~arm
+dev-libs/gjs ~arm
+dev-libs/hyphen ~arm
+dev-libs/json-glib ~arm
+dev-libs/libgdata ~arm
+dev-libs/libpeas ~arm
+dev-python/pyatspi ~arm
+dev-util/itstool ~arm
+dev-util/mdds ~arm
+games-board/aisleriot ~arm
+gnome-base/gnome-core-libs ~arm
+gnome-base/gnome-keyring ~arm
+gnome-base/gnome-session ~arm
+gnome-base/libgnome-keyring ~arm
+gnome-extra/avant-window-navigator ~arm
+gnome-extra/gnome-games ~arm
+gnome-extra/gnome-power-manager ~arm
+gnome-extra/gnome-screensaver ~arm
+gnome-extra/gnome-system-monitor ~arm
+gnome-extra/nm-applet ~arm
+gnome-extra/yelp-xsl ~arm
+media-gfx/eog ~arm
+media-gfx/shotwell ~arm
+media-libs/clutter ~arm
+media-libs/clutter-gtk ~arm
+media-libs/cogl ~arm
+media-libs/gexiv2 ~arm
+media-libs/libbluray ~arm
+media-libs/libchamplain ~arm
+media-libs/libgnome-media-profiles ~arm
+media-libs/libgphoto2 ~arm
+media-libs/libprojectm ~arm
+media-libs/libraw ~arm
+media-libs/memphis ~arm
+media-libs/sdl-gfx ~arm
+media-libs/sdl-sound ~arm
+media-libs/vigra ~arm
+media-plugins/gst-plugins-cdparanoia ~arm
+media-plugins/gst-plugins-lame ~arm
+media-sound/sound-juicer ~arm
+media-video/cheese ~arm
+media-video/gnome-video-effects ~arm
+net-im/telepathy-connection-managers ~arm
+net-im/telepathy-logger ~arm
+net-im/telepathy-mission-control ~arm
+net-libs/gtk-vnc ~arm
+net-libs/libmicrohttpd ~arm
+net-libs/liboauth ~arm
+net-libs/rest ~arm
+net-libs/telepathy-farsight ~arm
+net-misc/vinagre ~arm
+sci-libs/colamd ~arm
+sci-libs/hdf5 ~arm
+sci-libs/ufconfig ~arm
+sci-mathematics/lpsolve ~arm
+sys-apps/ifplugd ~arm
+sys-apps/lsb-release ~arm
+sys-apps/portage ~arm
+virtual/ffmpeg ~arm
+x11-libs/libdesktop-agnostic ~arm
+x11-libs/mx ~arm
+x11-themes/gnome-icon-theme-extras ~arm
+x11-themes/sabayon-artwork-loo ~arm
+lxde-base/lxpolkit ~arm
+xfce-extra/xfce4-notifyd ~arm
+app-accessibility/at-spi2-core ~arm
+net-libs/liboauth ~arm
+media-libs/libraw ~arm
+dev-util/itstool ~arm
+dev-libs/json-glib ~arm
+media-plugins/gst-plugins-lame ~arm
+media-video/gnome-video-effects ~arm
+app-admin/apg ~arm
+net-im/telepathy-connection-managers ~arm
+sys-apps/lsb-release ~arm
+gnome-base/gnome ~arm
+dev-libs/eeze ~arm
+net-libs/gnome-online-accounts ~arm
+gnome-base/gnome-core-apps ~arm
+gnome-extra/gnome-tweak-tool ~arm
+gnome-extra/nm-applet ~arm
+dev-libs/efreet ~arm
+media-libs/evas ~arm
+x11-wm/muffin ~arm
+gnome-extra/yelp ~arm
+media-libs/edje ~arm
+gnome-extra/gnome-contacts ~arm
+media-video/totem ~arm
+net-im/empathy ~arm
+net-wireless/gnome-bluetooth ~arm
+dev-libs/eina ~arm
+gnome-base/gnome-shell ~arm
+gnome-extra/sushi ~arm
+sys-devel/make ~arm
+dev-libs/ecore ~arm
+gnome-base/gdm ~arm
+x11-wm/mutter ~arm
+gnome-extra/evolution-data-server ~arm
+dev-libs/e_dbus ~arm
+gnome-base/gnome-fallback ~arm
+www-client/epiphany ~arm
+dev-libs/eet ~arm
+gnome-base/gnome-control-center ~arm
+dev-libs/embryo ~arm
+gnome-extra/nemo ~arm
+x11-libs/libdesktop-agnostic ~arm
+media-libs/libprojectm ~arm
+x11-themes/gtk-engines-murrine ~arm
+www-servers/nginx ~arm
+media-libs/vigra ~arm
+gnome-extra/nemo ~arm
+x11-wm/muffin ~arm
+x11-themes/murrine-themes ~arm
--- a/conf/armv6l/repo/sabayonlinux.org/packages.db.mirrors
+++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.mirrors
@@ -0,0 +1,8 @@
+# these are all the same
+http://dl.sabayon.org/entropy
+http://best.sabayon.org/entropy
+http://redir.sabayon.org/entropy
+# This will be used as last resort, and must stay here
+http://pkg.sabayon.org
+# this is in case our DNS goes down
+http://na.mirror.garr.it/mirrors/sabayonlinux/entropy
--- a/conf/armv6l/repo/sabayonlinux.org/packages.db.system_mask
+++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.system_mask
@@ -0,0 +1,15 @@
+app-admin/equo
+app-misc/sabayon-version
+dev-db/sqlite
+sys-apps/entropy
+sys-devel/base-gcc:4.7
+sys-libs/db:4.8
+virtual/cron   
+# virtual/linux-binary
+sys-auth/pambase
+
+# glibc cannot be removed, it's part of the system
+# nowadays it's not even a system pkg because
+# virtual/libc wraps it.
+# This makes sure we always block glibc
+sys-libs/glibc
--- a/conf/armv6l/repo/sabayonlinux.org/packages.db.webservices
+++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.webservices
@@ -0,0 +1 @@
+https://packages.sabayon.org/service
--- a/conf/armv7l/entropy/triggers/sys-devel/base-gcc/trigger
+++ b/conf/armv7l/entropy/triggers/sys-devel/base-gcc/trigger
@@ -1,35 +0,0 @@
-def configure_correct_gcc():
-    import re
-    import subprocess
-    import os
-    from entropy.const import etpConst
-
-    gcc_targets = ["4.8", "4.7", "4.6"]
-    uname_arch = os.uname()[4]
-    gcc_dir = etpConst['systemroot'] + "/etc/env.d/gcc"
-    gcc_profile_file = None
-    for gcc_target in gcc_targets:
-        gcc_profile_file_pfx = uname_arch + "-pc-linux-gnu-" + gcc_target
-        regex = re.compile(gcc_profile_file_pfx + "((.[0-30])?)$")
-
-        for curdir, subs, files in os.walk(gcc_dir):
-            for fname in files:
-                if regex.match(fname):
-                   gcc_profile_file = os.path.join(curdir, fname)
-                   break
-            break
-        if gcc_profile_file is not None:
-            break
-    if gcc_profile_file is not None:
-        # if we're hardened, we want the vanilla one by default
-        # to avoid stressing the user too much
-        vanilla_profile_file = gcc_profile_file + "-vanilla"
-        if os.path.isfile(vanilla_profile_file):
-            gcc_profile_file = vanilla_profile_file
-        profile_name = os.path.basename(gcc_profile_file)
-        subprocess.call(("gcc-config", profile_name))
-
-if stage == "postinstall":
-    configure_correct_gcc()
-
-my_ext_status = 0
--- a/conf/armv7l/portage/env/no-distcc-ccache.conf
+++ b/conf/armv7l/portage/env/no-distcc-ccache.conf
@@ -1 +1 @@
-FEATURES="-distcc -distcc-pump parallel-fetch protect-owned splitdebug -ccache"
+FEATURES="-distcc -distcc-pump parallel-fetch protect-owned compressdebug splitdebug -ccache"
--- a/conf/armv7l/portage/env/no-distcc.conf
+++ b/conf/armv7l/portage/env/no-distcc.conf
@@ -1 +1 @@
-FEATURES="-distcc parallel-fetch protect-owned splitdebug"
+FEATURES="-distcc parallel-fetch protect-owned compressdebug splitdebug"
--- a/conf/armv7l/portage/make.conf
+++ b/conf/armv7l/portage/make.conf
@@ -0,0 +1,48 @@
+# Temp disable Graphite due to known x11-libs/qt bugs
+FPUABI="-mfloat-abi=hard"
+
+CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI}"
+CXXFLAGS="${CFLAGS}"
+LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+CHOST="armv7a-hardfloat-linux-gnueabi"
+
+### COMMON PART
+#################################################
+# Portage configuration
+ACCEPT_KEYWORDS="arm ~arm"
+FEATURES="ccache distcc parallel-fetch protect-owned compressdebug splitdebug"
+# temp disabled: distcc-pump
+MAKEOPTS="-j6 -s"
+CCACHE_SIZE="5G"
+CCACHE_DIR="/var/ccache"
+# Global USE flags
+USE="cpudetection cups goom joystick jpeg opengl png neon theora truetype xvid fontconfig jpeg png"
+# Sound USE flags
+USE="${USE} pulseaudio alsa flac mp3 vorbis ogg"
+# System USE flags
+USE="${USE} -consolekit dbus introspection logind perl policykit python systemd threads udev xattr xcb"
+# Video OpenGL stuff
+# Note: GLES2 is disabled globally atm. mesa-9.1.2 has bugs if both gl, and gles2 are enabled.
+# The bug is in the GL{ES2,} headers (name clash), and gnome-shell fails to build because of that.
+USE="${USE} -gles2"
+
+LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr"
+LINGUAS="${LINGUAS} fy ga gl he hi hr hu ia is it ja kk km ko lt lv mk mn ms nb nds nl"
+LINGUAS="${LINGUAS} nn pa pl pt pt_BR ro ru rw se si sk sl sr sr@Latn ss sv ta tg tr uk"
+LINGUAS="${LINGUAS} uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE ug zh"
+
+# distcc configuration
+DISTCC_HOSTS="localhost/1 172.16.255.1/5"
+# DISTCC_VERBOSE=1
+
+# Package specific configuration
+APACHE2_MPMS="prefork"
+# No Python3 Noooo
+PYTHON_TARGETS="python2_7"
+USE_PYTHON="2.7"
+
+#################################################
+### END COMMON PART -- cut here
+
+source /var/lib/layman/make.conf
+
--- a/conf/armv7l/portage/make.conf.hardfp
+++ b/conf/armv7l/portage/make.conf.hardfp
@@ -1,40 +0,0 @@
-# Temp disable Graphite due to known x11-libs/qt bugs
-GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
-FPUABI="-mfloat-abi=hard"
-
-CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI}"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-CHOST="armv7a-hardfloat-linux-gnueabi"
-
-### COMMON PART
-#################################################
-# Portage configuration
-ACCEPT_KEYWORDS="~arm arm"
-FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug"
-MAKEOPTS="-j16 -s"
-CCACHE_SIZE="50G"
-CCACHE_DIR="/var/ccache"
-# Global USE flags
-USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis"
-
-# distcc configuration
-DISTCC_SSH="/etc/distcc/distcc-ssh"
-# <host>/<number of jobs>
-# Works with QEMU warnings (damn)
-# DISTCC_HOSTS="localhost/1 distcc@localhost/15,lzo,cpp"
-# Works
-DISTCC_HOSTS="localhost/1 127.0.0.1/15,lzo,cpp"
-# DISTCC_VERBOSE=1
-
-# Package specific configuration
-APACHE2_MPMS="prefork"
-
-# Filter out crap from packages
-INSTALL_MASK="usr/share/gtk-doc/html/*"
-PKG_INSTALL_MASK="${INSTALL_MASK}"
-#################################################
-### END COMMON PART -- cut here
-
-source /var/lib/layman/make.conf
-
--- a/conf/armv7l/portage/make.conf.softfp
+++ b/conf/armv7l/portage/make.conf.softfp
@@ -1,39 +0,0 @@
-# Temp disable Graphite due to known x11-libs/qt-* bugs
-GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
-FPUABI="-mfloat-abi=softfp"
-
-CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI}"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-CHOST="armv7a-unknown-linux-gnueabi"
-
-### COMMON PART
-#################################################
-# Portage configuration
-ACCEPT_KEYWORDS="~arm arm"
-FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug"
-MAKEOPTS="-j16 -s"
-CCACHE_SIZE="50G"
-CCACHE_DIR="/var/ccache"
-# Global USE flags
-USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis"
-
-# distcc configuration
-DISTCC_SSH="/etc/distcc/distcc-ssh"
-# <host>/<number of jobs>
-# Works with QEMU warnings (damn)
-# DISTCC_HOSTS="localhost/1 distcc@localhost/15,lzo,cpp"
-# Works
-DISTCC_HOSTS="localhost/1 127.0.0.1/15,lzo,cpp"
-# DISTCC_VERBOSE=1
-
-# Package specific configuration
-APACHE2_MPMS="prefork"
-
-# Filter out crap from packages
-INSTALL_MASK="usr/share/gtk-doc/html/*"
-PKG_INSTALL_MASK="${INSTALL_MASK}"
-#################################################
-### END COMMON PART -- cut here
-
-source /var/lib/layman/make.conf
--- a/conf/armv7l/portage/package.env
+++ b/conf/armv7l/portage/package.env
@@ -11,6 +11,7 @@ media-tv/xbmc xbmc.conf
 dev-lang/spidermonkey neon.conf
 x11-drivers/xf86-video-omapfb neon.conf
 www-client/chromium neon.conf
+media-sound/pulseaudio neon.conf

 # force MAKEOPTS="-j1"
 x11-libs/cairo makeopts-j1.conf
--- a/conf/armv7l/portage/package.keywords
+++ b/conf/armv7l/portage/package.keywords
@@ -1,139 +0,0 @@
-# hardfloat is only supported since gcc-4.5
-# We force gcc-4.5 because this stage should be closer to stable
-# When gcc-4.5 is stable this could be removed
-=sys-devel/gcc-4.5*
-# <3.0 doesn't build with gcc-4.5
-sys-apps/diffutils
-
-# We want Portage 2.2
-<sys-apps/portage-2.3 **
-
-# Temp keywording, will test and add keywords back
-www-servers/nginx **
-
-# it has long cmdline patch, they say it fixes webkit-gtk
-# (but it's not true)
-=sys-devel/make-3.82-r4 **
-
-# Keyword E17
-<dev-libs/embryo-9999 **
-<dev-libs/eeze-9999 **
-<dev-libs/ecore-9999 **
-<dev-libs/e_dbus-9999 **
-<dev-libs/eina-9999 **
-<media-libs/edje-9999 **
-<dev-libs/efreet-9999 **
-<media-libs/evas-9999 **
-<dev-libs/eet-9999 **
-
-<xfce-extra/xfce4-notifyd-9999 **
-
-# Want slim for testing
-<=x11-misc/slim-1.3.3 **
-
-# Want gnumeric for testing
-=app-office/gnumeric-1.10.17 **
-
-# Real men want dosbox on ARM
-=games-emulation/dosbox-0.74 **
-
-# need this
-=dev-libs/gjs-1.32.0 **
-
-# Games!
-<=games-strategy/freeciv-2.3.2 **
-
-=app-office/glabels-3.0.0 **
-
-# want WICD
-=dev-python/urwid-1.0.1 **
-=net-misc/wicd-1.7.2.4-r1 **
-
-# want xnoise
-=media-sound/xnoise-0.2.2 **
-
-# want xvid
-=media-plugins/gst-plugins-xvid-0.10.22 **
-
-# want lightdm
-=x11-misc/lightdm-1.2.2-r3 **
-=x11-misc/lightdm-gtk-greeter-1.1.5 **
-
-# want exaile
-=media-libs/mutagen-1.20 **
-=media-sound/exaile-0.3.2.1 **
-
-# want emesene
-dev-python/pywebkitgtk **
-dev-python/papyon **
-net-im/emesene **
-
-# GNOME 3 stuff
-<media-libs/cogl-9999 **
-<gnome-extra/sushi-9999 **
-<media-libs/clutter-9999 **
-<x11-wm/muffin-9999 **
-<media-libs/clutter-gtk-9999 **
-<x11-wm/mutter-9999 **
-<media-video/cheese-9999 **
-<gnome-base/gnome-shell-9999 **
-<x11-libs/mx-9999 **
-<media-libs/libchamplain-9999 **
-<media-plugins/gst-plugins-vp8-9999 **
-<media-video/totem-9999 **
-<gnome-extra/gnome-games-9999 **
-<media-libs/clutter-gst-9999 **
-<gnome-extra/gnome-games-9999 **
-<net-im/telepathy-mission-control-9999 **
-<net-libs/gnome-online-accounts-9999 **
-<net-im/empathy-9999 **
-<net-im/telepathy-logger-9999 **
-<sci-geosciences/geocode-glib-9999 **
-<dev-libs/folks-9999 **
-<net-libs/telepathy-farstream-9999 **
-<gnome-base/gnome-core-apps-9999 **
-<gnome-extra/gnome-screensaver-9999 **
-<gnome-base/gnome-control-center-9999 **
-<sys-auth/nss-myhostname-9999 **
-<gnome-extra/gnome-contacts-9999 **
-<gnome-extra/yelp-9999 **
-<media-gfx/shotwell-9999 **
-<mail-client/evolution-9999 **
-<media-libs/gexiv2-9999 **
-<gnome-extra/nm-applet-9999 **
-<gnome-extra/gnome-system-monitor-9999 **
-<gnome-base/gnome-core-libs-9999 **
-<gnome-extra/yelp-xsl-9999 **
-<gnome-extra/gnome-power-manager-9999 **
-<app-admin/openrc-settingsd-9999 **
-<media-gfx/eog-9999 **
-<net-wireless/gnome-bluetooth-9999 **
-<gnome-base/gnome-session-9999 **
-<app-editors/gedit-9999 **
-<media-sound/sound-juicer-9999 **
-<gnome-base/gnome-extra-apps-9999 **
-<x11-themes/gnome-icon-theme-extras-9999 **
-<www-client/epiphany-9999 **
-<app-crypt/seahorse-9999 **
-<gnome-extra/gnome-color-manager-9999 **
-<gnome-extra/gnome-tweak-tool-9999 **
-<gnome-base/gnome-9999 **
-<gnome-extra/evolution-data-server-9999 **
-<gnome-base/gdm-9999 **
-<net-misc/vinagre-9999 **
-<gnome-base/gnome-fallback-9999 **
-<gnome-extra/nemo-9999 **
-
-# Additional deps pulled in that need to be keyworded
-=app-editors/xemacs-21.5.31 **
-=app-xemacs/emerge-1.11 **
-=app-xemacs/xemacs-base-2.27 **
-<x11-libs/libdesktop-agnostic-9999 **
-<media-libs/libprojectm-9999 **
-
-# Media stuff
-# =media-video/mpeg-tools-1.5b-r4 **
-=media-video/xvid4conf-1.12 **
-
-# Frozen Bubble
-=games-arcade/frozen-bubble-2.2.1_beta1 **
--- a/conf/armv7l/portage/package.keywords
+++ b/conf/armv7l/portage/package.keywords
@@ -0,0 +1 @@
+../../armarch/portage/package.keywords
--- a/conf/armv7l/portage/package.license
+++ b/conf/armv7l/portage/package.license
@@ -1 +0,0 @@
-sys-libs/imx-lib	Freescale
--- a/conf/armv7l/portage/package.license
+++ b/conf/armv7l/portage/package.license
@@ -0,0 +1 @@
+../../armarch/portage/package.license
--- a/conf/armv7l/portage/package.mask
+++ b/conf/armv7l/portage/package.mask
@@ -1 +0,0 @@
->sys-fs/udev-171-r5
--- a/conf/armv7l/portage/package.mask
+++ b/conf/armv7l/portage/package.mask
@@ -0,0 +1 @@
+../../armarch/portage/package.mask
--- a/conf/armv7l/portage/package.unmask
+++ b/conf/armv7l/portage/package.unmask
@@ -1,79 +0,0 @@
-# sys-devel/gcc:4.6 is fine for us
-sys-devel/gcc:4.6
-
-# Nirbheek Chauhan <nirbheek@gentoo.org> (25 Mar 2012)
-# This is now the GNOME 3.4 mask
-# Masked for testing, clutter-1.10, and bugs in some packages:
-=app-accessibility/accerciser-3.4*
-=app-accessibility/at-spi2-atk-2.4*
-=app-accessibility/at-spi2-core-2.4*
-=app-accessibility/orca-3.4*
-=app-admin/gnome-system-log-3.4*
-=app-crypt/gcr-3.4*
-=app-crypt/seahorse-3.4*
-=app-dicts/gnome-dictionary-3.4*
-=app-misc/tracker-0.14*
->=dev-libs/folks-0.6.8
-=dev-libs/libgdata-0.12*
-=dev-libs/totem-pl-parser-3*
-=dev-util/gnome-devel-docs-3.4*
-=dev-python/pyatspi-2.4*
-=gnome-base/gdm-3.4*
-=gnome-base/gnome-control-center-3.4*
-=gnome-base/gnome-core-apps-3.4*
-=gnome-base/gnome-core-libs-3.4*
-=gnome-base/gnome-desktop-3.4*
-=gnome-base/gnome-extra-apps-3.4*
-=gnome-base/gnome-fallback-3.4*
-=gnome-base/gnome-3.4*
-=gnome-base/gnome-keyring-3.4*
-=gnome-base/gnome-light-3.4*
-=gnome-base/gnome-menus-3.4*
-=gnome-base/gnome-panel-3.4*
-=gnome-base/gnome-power-manager-3.4*
-=gnome-base/gnome-session-3.4*
-=gnome-base/gnome-settings-daemon-3.4*
-=gnome-base/gnome-shell-3.4*
-=gnome-base/libgnome-keyring-3.4*
-=gnome-base/libgnomekbd-3.4*
-=gnome-base/nautilus-3.4*
-=gnome-extra/evolution-data-server-3.4*
-=gnome-extra/evolution-ews-3.4*
-=gnome-extra/evolution-exchange-3.4*
-=gnome-extra/evolution-groupwise-3.4*
-=gnome-extra/gnome-color-manager-3.4*
-=gnome-extra/gnome-contacts-3.4*
-=gnome-extra/gnome-documents-0.4*
-=gnome-extra/gnome-games-3.4*
-=gnome-extra/gnome-search-tool-3.4*
-=gnome-extra/gnome-shell-extensions-3.4*
->=gnome-extra/gnome-tweak-tool-3.3
-=gnome-extra/gnome-user-docs-3.4*
-=gnome-extra/gnome-utils-3.4*
-=gnome-extra/mousetweaks-3.4*
-=gnome-extra/nautilus-tracker-tags-0.14*
-=gnome-extra/seahorse-nautilus-3.4*
-=gnome-extra/sushi-0.4*
-=mail-client/evolution-3.4*
-=media-gfx/gnome-font-viewer-3.4*
-=media-gfx/gnome-screenshot-3.4*
-=media-video/cheese-3.4*
-=media-video/totem-3.4*
-=net-im/empathy-3.4*
-=net-libs/gnome-online-accounts-3.4*
->=net-libs/telepathy-farstream-0.2
-=net-wireless/gnome-bluetooth-3.4*
-=sys-apps/baobab-3.4*
-=x11-libs/libcryptui-3.4*
-=x11-libs/libwnck-3.4*
->=x11-wm/metacity-2.34.2
-=x11-wm/mutter-3.4*
->=x11-themes/zukitwo-shell-2012.04.24
-# New clutter API breaks almost everything
-=media-libs/cogl-1.10*
-=media-libs/clutter-1.10*
-=media-libs/clutter-gtk-1.2*
-=media-libs/clutter-gst-1.5*
-=media-libs/clutter-gst-1.6*
-# Needs gst-plugins-flac-0.10.31 + commit 265a5bfa to write seekable flac files
-=media-sound/sound-juicer-3.4*
--- a/conf/armv7l/portage/package.unmask
+++ b/conf/armv7l/portage/package.unmask
@@ -0,0 +1 @@
+../../armarch/portage/package.unmask
--- a/conf/armv7l/portage/package.use
+++ b/conf/armv7l/portage/package.use
@@ -0,0 +1 @@
+../../armarch/portage/package.use
--- a/conf/armv7l/repo/sabayon-limbo/packages.db.critical
+++ b/conf/armv7l/repo/sabayon-limbo/packages.db.critical
@@ -0,0 +1,3 @@
+sys-devel/base-gcc:4.7
+>=sys-apps/portage-2.2.0_alpha142
+>sys-libs/glibc-2.16.9999
--- a/conf/armv7l/repo/sabayon-limbo/packages.db.fallback_mirrors
+++ b/conf/armv7l/repo/sabayon-limbo/packages.db.fallback_mirrors
@@ -0,0 +1,6 @@
+# Our fallback mirror is pkg.sabayon.org
+pkg.sabayon.org
+best.sabayon.org
+dl.sabayon.org
+r.sabayon.org
+redir.sabayon.org
--- a/conf/armv7l/repo/sabayon-limbo/packages.db.keywords
+++ b/conf/armv7l/repo/sabayon-limbo/packages.db.keywords
@@ -0,0 +1,129 @@
+app-accessibility/at-spi2-core ~arm
+app-accessibility/caribou ~arm
+app-admin/apg ~arm
+app-admin/packagekit ~arm
+app-admin/packagekit-gtk ~arm
+app-crypt/seahorse ~arm
+app-editors/gedit ~arm
+app-misc/geoclue ~arm
+app-office/abiword ~arm
+app-text/libexttextcat ~arm
+app-text/libwpd ~arm
+app-text/libwpg ~arm
+app-text/libwps ~arm
+app-text/mythes ~arm
+app-text/tofrodos ~arm
+app-txt/epdfview ~arm
+dev-libs/folks ~arm
+dev-libs/gjs ~arm
+dev-libs/hyphen ~arm
+dev-libs/json-glib ~arm
+dev-libs/libgdata ~arm
+dev-libs/libpeas ~arm
+dev-python/pyatspi ~arm
+dev-util/itstool ~arm
+dev-util/mdds ~arm
+games-board/aisleriot ~arm
+gnome-base/gnome-core-libs ~arm
+gnome-base/gnome-keyring ~arm
+gnome-base/gnome-session ~arm
+gnome-base/libgnome-keyring ~arm
+gnome-extra/avant-window-navigator ~arm
+gnome-extra/gnome-games ~arm
+gnome-extra/gnome-power-manager ~arm
+gnome-extra/gnome-screensaver ~arm
+gnome-extra/gnome-system-monitor ~arm
+gnome-extra/nm-applet ~arm
+gnome-extra/yelp-xsl ~arm
+media-gfx/eog ~arm
+media-gfx/shotwell ~arm
+media-libs/clutter ~arm
+media-libs/clutter-gtk ~arm
+media-libs/cogl ~arm
+media-libs/gexiv2 ~arm
+media-libs/libbluray ~arm
+media-libs/libchamplain ~arm
+media-libs/libgnome-media-profiles ~arm
+media-libs/libgphoto2 ~arm
+media-libs/libprojectm ~arm
+media-libs/libraw ~arm
+media-libs/memphis ~arm
+media-libs/sdl-gfx ~arm
+media-libs/sdl-sound ~arm
+media-libs/vigra ~arm
+media-plugins/gst-plugins-cdparanoia ~arm
+media-plugins/gst-plugins-lame ~arm
+media-sound/sound-juicer ~arm
+media-video/cheese ~arm
+media-video/gnome-video-effects ~arm
+net-im/telepathy-connection-managers ~arm
+net-im/telepathy-logger ~arm
+net-im/telepathy-mission-control ~arm
+net-libs/gtk-vnc ~arm
+net-libs/libmicrohttpd ~arm
+net-libs/liboauth ~arm
+net-libs/rest ~arm
+net-libs/telepathy-farsight ~arm
+net-misc/vinagre ~arm
+sci-libs/colamd ~arm
+sci-libs/hdf5 ~arm
+sci-libs/ufconfig ~arm
+sci-mathematics/lpsolve ~arm
+sys-apps/ifplugd ~arm
+sys-apps/lsb-release ~arm
+sys-apps/portage ~arm
+virtual/ffmpeg ~arm
+x11-libs/libdesktop-agnostic ~arm
+x11-libs/mx ~arm
+x11-themes/gnome-icon-theme-extras ~arm
+x11-themes/sabayon-artwork-loo ~arm
+lxde-base/lxpolkit ~arm
+xfce-extra/xfce4-notifyd ~arm
+app-accessibility/at-spi2-core ~arm
+net-libs/liboauth ~arm
+media-libs/libraw ~arm
+dev-util/itstool ~arm
+dev-libs/json-glib ~arm
+media-plugins/gst-plugins-lame ~arm
+media-video/gnome-video-effects ~arm
+app-admin/apg ~arm
+net-im/telepathy-connection-managers ~arm
+sys-apps/lsb-release ~arm
+gnome-base/gnome ~arm
+dev-libs/eeze ~arm
+net-libs/gnome-online-accounts ~arm
+gnome-base/gnome-core-apps ~arm
+gnome-extra/gnome-tweak-tool ~arm
+gnome-extra/nm-applet ~arm
+dev-libs/efreet ~arm
+media-libs/evas ~arm
+x11-wm/muffin ~arm
+gnome-extra/yelp ~arm
+media-libs/edje ~arm
+gnome-extra/gnome-contacts ~arm
+media-video/totem ~arm
+net-im/empathy ~arm
+net-wireless/gnome-bluetooth ~arm
+dev-libs/eina ~arm
+gnome-base/gnome-shell ~arm
+gnome-extra/sushi ~arm
+sys-devel/make ~arm
+dev-libs/ecore ~arm
+gnome-base/gdm ~arm
+x11-wm/mutter ~arm
+gnome-extra/evolution-data-server ~arm
+dev-libs/e_dbus ~arm
+gnome-base/gnome-fallback ~arm
+www-client/epiphany ~arm
+dev-libs/eet ~arm
+gnome-base/gnome-control-center ~arm
+dev-libs/embryo ~arm
+gnome-extra/nemo ~arm
+x11-libs/libdesktop-agnostic ~arm
+media-libs/libprojectm ~arm
+x11-themes/gtk-engines-murrine ~arm
+www-servers/nginx ~arm
+media-libs/vigra ~arm
+gnome-extra/nemo ~arm
+x11-wm/muffin ~arm
+x11-themes/murrine-themes ~arm
--- a/conf/armv7l/repo/sabayon-limbo/packages.db.mirrors
+++ b/conf/armv7l/repo/sabayon-limbo/packages.db.mirrors
@@ -0,0 +1,8 @@
+# these are all the same
+http://dl.sabayon.org/entropy
+http://best.sabayon.org/entropy
+http://redir.sabayon.org/entropy
+# This will be used as last resort, and must stay here
+http://pkg.sabayon.org
+# this is in case our DNS goes down
+http://na.mirror.garr.it/mirrors/sabayonlinux/entropy
--- a/conf/armv7l/repo/sabayon-limbo/packages.db.system_mask
+++ b/conf/armv7l/repo/sabayon-limbo/packages.db.system_mask
@@ -0,0 +1,15 @@
+app-admin/equo
+app-misc/sabayon-version
+dev-db/sqlite
+sys-apps/entropy
+sys-devel/base-gcc:4.7
+sys-libs/db:4.8
+virtual/cron   
+# virtual/linux-binary
+sys-auth/pambase
+
+# glibc cannot be removed, it's part of the system
+# nowadays it's not even a system pkg because
+# virtual/libc wraps it.
+# This makes sure we always block glibc
+sys-libs/glibc
--- a/conf/armv7l/repo/sabayon-limbo/packages.db.webservices
+++ b/conf/armv7l/repo/sabayon-limbo/packages.db.webservices
@@ -0,0 +1 @@
+https://packages.sabayon.org/service
--- a/conf/armv7l/repo/sabayonlinux.org/packages.db.critical
+++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.critical
@@ -0,0 +1,3 @@
+sys-devel/base-gcc:4.7
+>=sys-apps/portage-2.2.0_alpha142
+>sys-libs/glibc-2.16.9999
--- a/conf/armv7l/repo/sabayonlinux.org/packages.db.fallback_mirrors
+++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.fallback_mirrors
@@ -0,0 +1,6 @@
+# Our fallback mirror is pkg.sabayon.org
+pkg.sabayon.org
+best.sabayon.org
+dl.sabayon.org
+r.sabayon.org
+redir.sabayon.org
--- a/conf/armv7l/repo/sabayonlinux.org/packages.db.keywords
+++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.keywords
@@ -121,3 +121,9 @@ dev-libs/embryo ~arm
 gnome-extra/nemo ~arm
 x11-libs/libdesktop-agnostic ~arm
 media-libs/libprojectm ~arm
+x11-themes/gtk-engines-murrine ~arm
+www-servers/nginx ~arm
+media-libs/vigra ~arm
+gnome-extra/nemo ~arm
+x11-wm/muffin ~arm
+x11-themes/murrine-themes ~arm
--- a/conf/armv7l/repo/sabayonlinux.org/packages.db.mirrors
+++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.mirrors
@@ -0,0 +1,8 @@
+# these are all the same
+http://dl.sabayon.org/entropy
+http://best.sabayon.org/entropy
+http://redir.sabayon.org/entropy
+# This will be used as last resort, and must stay here
+http://pkg.sabayon.org
+# this is in case our DNS goes down
+http://na.mirror.garr.it/mirrors/sabayonlinux/entropy
--- a/conf/armv7l/repo/sabayonlinux.org/packages.db.system_mask
+++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.system_mask
@@ -0,0 +1,15 @@
+app-admin/equo
+app-misc/sabayon-version
+dev-db/sqlite
+sys-apps/entropy
+sys-devel/base-gcc:4.7
+sys-libs/db:4.8
+virtual/cron   
+# virtual/linux-binary
+sys-auth/pambase
+
+# glibc cannot be removed, it's part of the system
+# nowadays it's not even a system pkg because
+# virtual/libc wraps it.
+# This makes sure we always block glibc
+sys-libs/glibc
--- a/conf/armv7l/repo/sabayonlinux.org/packages.db.webservices
+++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.webservices
@@ -0,0 +1 @@
+https://packages.sabayon.org/service
--- a/conf/home/.bash_profile
+++ b/conf/home/.bash_profile
@@ -0,0 +1,4 @@
+# Do this or ssh localhost:123 screen -Rx won't source bashrc
+if [ -f ~/.bashrc ]; then
+  . ~/.bashrc
+fi
--- a/conf/home/eixrc
+++ b/conf/home/eixrc
@@ -0,0 +1,6 @@
+# Don't clobber screen status!
+# STRING
+# If the beginning of TERM matches a word of this space-separated list,
+# it is assumed that the terminal supports a status line.
+#TERM_STATUSLINE="xterm screen rxvt aterm konsole gnome Eterm eterm kterm interix"
+TERM_STATUSLINE=""
--- a/conf/intel/entropy/packages/packages.server.sets
+++ b/conf/intel/entropy/packages/packages.server.sets
@@ -19,7 +19,7 @@ sabayonlinux.org entropy packagekit
 # Sabayon stuff
 sabayonlinux.org sabayon-artwork
 # Desktop environments
-sabayonlinux.org X e17 xfce lxde fluxbox gnome
+sabayonlinux.org X enlightenment xfce lxde fluxbox gnome
 # gst plugins for GNOME, KDE, Xfce
 sabayonlinux.org gst-plugins gst-plugins-extra
 # IME fonts stuff
--- a/conf/intel/entropy/triggers/sys-devel/base-gcc/trigger
+++ b/conf/intel/entropy/triggers/sys-devel/base-gcc/trigger
@@ -1,35 +0,0 @@
-def configure_correct_gcc():
-    import re
-    import subprocess
-    import os
-    from entropy.const import etpConst
-
-    gcc_targets = ["4.8", "4.7", "4.6"]
-    uname_arch = os.uname()[4]
-    gcc_dir = etpConst['systemroot'] + "/etc/env.d/gcc"
-    gcc_profile_file = None
-    for gcc_target in gcc_targets:
-        gcc_profile_file_pfx = uname_arch + "-pc-linux-gnu-" + gcc_target
-        regex = re.compile(gcc_profile_file_pfx + "((.[0-30])?)$")
-
-        for curdir, subs, files in os.walk(gcc_dir):
-            for fname in files:
-                if regex.match(fname):
-                   gcc_profile_file = os.path.join(curdir, fname)
-                   break
-            break
-        if gcc_profile_file is not None:
-            break
-    if gcc_profile_file is not None:
-        # if we're hardened, we want the vanilla one by default
-        # to avoid stressing the user too much
-        vanilla_profile_file = gcc_profile_file + "-vanilla"
-        if os.path.isfile(vanilla_profile_file):
-            gcc_profile_file = vanilla_profile_file
-        profile_name = os.path.basename(gcc_profile_file)
-        subprocess.call(("gcc-config", profile_name))
-
-if stage == "postinstall":
-    configure_correct_gcc()
-
-my_ext_status = 0
--- a/conf/intel/portage/env/O3.amd64.conf
+++ b/conf/intel/portage/env/O3.amd64.conf
@@ -1,5 +1,5 @@
 # Set -O3 for perf. critical packages
-FEATURES="test splitdebug"
+FEATURES="test compressdebug splitdebug"
 CFLAGS="-O3 -march=x86-64 -pipe ${GRAPHITE}"
 #CFLAGS="-O3 -ffast-math -march=x86-64 -pipe ${GRAPHITE}"
 CXXFLAGS="${CFLAGS}"
--- a/conf/intel/portage/env/O3.amd64.notest.conf
+++ b/conf/intel/portage/env/O3.amd64.notest.conf
@@ -0,0 +1,5 @@
+# Set -O3 for perf. critical packages
+FEATURES="compressdebug splitdebug"
+CFLAGS="-O3 -march=x86-64 -pipe ${GRAPHITE}"
+#CFLAGS="-O3 -ffast-math -march=x86-64 -pipe ${GRAPHITE}"
+CXXFLAGS="${CFLAGS}"
--- a/conf/intel/portage/env/O3.x86.conf
+++ b/conf/intel/portage/env/O3.x86.conf
@@ -1,5 +1,5 @@
 # Set -O3 for perf. critical packages
-FEATURES="test splitdebug"
+FEATURES="test compressdebug splitdebug"
 CFLAGS="-O3 -march=i686 -pipe ${GRAPHITE}"
 #CFLAGS="-O3 -ffast-math -march=i686 -pipe ${GRAPHITE}"
 CXXFLAGS="${CFLAGS}"
--- a/conf/intel/portage/env/disable.debug+userpriv.conf
+++ b/conf/intel/portage/env/disable.debug+userpriv.conf
@@ -0,0 +1 @@
+FEATURES="parallel-fetch protect-owned -debug -compressdebug -splitdebug -userpriv"
--- a/conf/intel/portage/env/disable.debug.conf
+++ b/conf/intel/portage/env/disable.debug.conf
@@ -1 +1 @@
-FEATURES="parallel-fetch protect-owned -debug -splitdebug"
+FEATURES="parallel-fetch protect-owned -debug -compressdebug -splitdebug"
--- a/conf/intel/portage/env/disable.userpriv.conf
+++ b/conf/intel/portage/env/disable.userpriv.conf
@@ -0,0 +1 @@
+FEATURES="parallel-fetch protect-owned -userpriv"
--- a/conf/intel/portage/env/ggdb.amd64.conf
+++ b/conf/intel/portage/env/ggdb.amd64.conf
@@ -0,0 +1,2 @@
+CFLAGS="-O2 -march=x86-64 -pipe -ggdb"
+CXXFLAGS="${CFLAGS}"
--- a/conf/intel/portage/env/ggdb.x86.conf
+++ b/conf/intel/portage/env/ggdb.x86.conf
@@ -0,0 +1,2 @@
+CFLAGS="-O2 -march=i686 -pipe -ggdb"
+CXXFLAGS="${CFLAGS}"
--- a/conf/intel/portage/env/linguas-en.conf
+++ b/conf/intel/portage/env/linguas-en.conf
@@ -0,0 +1 @@
+LINGUAS="en"
--- a/conf/intel/portage/make.conf.amd64
+++ b/conf/intel/portage/make.conf.amd64
@@ -12,17 +12,17 @@ MAKEOPTS="-j16 -s"

 # Portage stuff
 ACCEPT_KEYWORDS="~amd64"
-FEATURES="ccache parallel-fetch protect-owned splitdebug"
+FEATURES="parallel-fetch protect-owned compressdebug splitdebug"
 CCACHE_SIZE="2G"
 CCACHE_DIR="/var/ccache"

 LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta tg tr uk uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE zh"

-## USE ARRAYS ##
+## USE ##
 SAB_BAD="-kdeprefix -arts -qt3 -beagle -gnome -evo -mono -eds -apm -oss -branding -esd"
-SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr dvi mp3rtp xine cddb alsa dvb dvd network dvdread ipod audiofile artswrappersuid dvdr jack dri cdda mjpeg mmx joystick xvmc cpudetection v4l v4l2"
+SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr dvi mp3rtp xine cddb alsa dvb dvd bluray network dvdread ipod audiofile artswrappersuid dvdr jack dri cdda mjpeg mmx joystick xvmc cpudetection v4l v4l2"
 SAB_CODECS="x264 gsm lame dv mp3 stream live openal theora ogg a52 win32codecs matroska xvid flac ffmpeg aac speex real dts musepack"
-SAB_SYSTEM="cjk unicode gnutls nptl gcj udev kerberos acl dbus bash-completion lzo rar policykit xcb bzip2 bidi wifi lm_sensors acpi usb pcmcia bluetooth irda ieee1394 perl python"
+SAB_SYSTEM="cjk unicode gnutls nptl gcj udev systemd logind -consolekit kerberos acl dbus bash-completion lzo rar policykit xcb bzip2 bidi wifi lm_sensors acpi usb pcmcia bluetooth irda ieee1394 perl python"
 SAB_FILESYS="fat hfs jfs xfs ntfs reiserfs sysfs inotify"
 SAB_PRINT="cups ppds foomatic-db gimpprint freetype xprint scanner"
 SAB_XSYS="cairo X opengl png gif gtk qt4 qt3support xpm tiff xinerama aiglx svg gphoto2 dga lcd openexr" 
@@ -34,7 +34,7 @@ USE="${SAB_BAD} ${SAB_MEDIA} ${SAB_CODECS} ${SAB_SYSTEM} ${SAB_FILESYS} ${SAB_PR

 ## DEVICES ##
 INPUT_DEVICES="evdev void"
-VIDEO_CARDS="fbdev vesa radeonhd"
+VIDEO_CARDS="fbdev vesa radeonsi radeon"
 LIRC_DEVICES="audio audio_alsa serial pctv"
 ALSA_CARDS="emu10k1x darla20 darla24 emu10k1 gina20 gina24 hdsp hdspm ice1712 indigo indigoio layla20 layla24 mia mixart mona pcxhr rme32 rme96 sb16 sbawe sscape usbusx2y vx222 usb-usx2y"
 CAMERAS="agfa_cl20 casio_qv dimagev dimera3500 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica_qm150 panasonic_coolshot panasonic_dc1000 panasonic_dc1580 panasonic_l859 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ricoh_g3 sipix_blink sipix_blink2 sipix_web2 sony_dscf1 sony_dscf55 toshiba_pdrm11 adc65 aox barbie canon clicksmart310 digigr8 digita directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 konica largan lg_gsm mars mustek pccam300 pccam600 ptp2 ricoh samsung sierra smal sonix soundvision spca50x sq905 stv0674 stv0680 sx330z template"
@@ -47,22 +47,34 @@ QEMU_USER_TARGETS="alpha arm armeb cris i386 m68k microblaze mips mipsel ppc ppc
 QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el mipsel ppc ppc64 ppcemb sh4 sh4eb sparc sparc64"

 ## PORTAGE CONFIG ##
+PORTDIR_OVERLAY="/usr/local/portage"
 source /var/lib/layman/make.conf
 CONFIG_PROTECT="/usr/share/config/kdm /etc /etc/conf.d /etc/init.d"
-CONFIG_PROTECT_MASK="/etc/skel"
+# /lib/modules mask is useful for our internal tinderbox
+CONFIG_PROTECT_MASK="/etc/skel /lib/modules"
 SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage"
 APACHE2_MPMS="prefork"
-GENTOO_MIRRORS="ftp://mirrors.tera-byte.com/pub/gentoo ftp://ftp.spline.inf.fu-berlin.de/mirrors/gentoo/ http://archive.mmu.edu.my/gentoo rsync://gentoo.bloodhost.ru/gentoo-distfiles ftp://gentoo.mirrors.tds.net/gentoo ftp://ftp.halifax.rwth-aachen.de/gentoo/ rsync://mirror.neolabs.kz/gentoo http://ftp.gentoo.bg/ http://ftp.cc.uoc.gr/mirrors/linux/gentoo/ ftp://ftp.cc.uoc.gr/mirrors/linux/gentoo/"
+GENTOO_MIRRORS="ftp://ftp.spline.inf.fu-berlin.de/mirrors/gentoo/ http://archive.mmu.edu.my/gentoo rsync://gentoo.bloodhost.ru/gentoo-distfiles ftp://gentoo.mirrors.tds.net/gentoo ftp://ftp.halifax.rwth-aachen.de/gentoo/ rsync://mirror.neolabs.kz/gentoo http://ftp.gentoo.bg/ http://ftp.cc.uoc.gr/mirrors/linux/gentoo/ ftp://ftp.cc.uoc.gr/mirrors/linux/gentoo/ ftp://mirrors.tera-byte.com/pub/gentoo"

-## FUCK KILL PYTHON 3 WITH FIRE ##
-# Avoids python.eclass to compile stuff for Python 3
 USE_PYTHON="2.7"
-PYTHON_TARGETS="python2_7"
+PYTHON_TARGETS="python2_7 python3_3"

 # Some more forced targets
-PHP_TARGETS="php5-3"
+PHP_TARGETS="php5-5"
 RUBY_TARGETS="ruby19"

 # Apache suEXEC default UMASK
 # See bug 3544
 SUEXEC_UMASK=022
+
+# Setup GRUB platforms
+GRUB_PLATFORMS="efi-32 efi-64 pc"
+
+# Support both 64bit and 32bit
+ABI_X86="64 32"
+
+# Set PORTDIR for backward compatibility with various tools:
+#   gentoo-bashcomp - bug #478444
+#   euse - bug #474574
+#   euses and ufed - bug #478318
+PORTDIR="/usr/portage"
--- a/conf/intel/portage/make.conf.x86
+++ b/conf/intel/portage/make.conf.x86
@@ -11,19 +11,19 @@ LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 MAKEOPTS="-j16 -s"

 # Portage stuff
-FEATURES="ccache parallel-fetch protect-owned splitdebug"
+FEATURES="parallel-fetch protect-owned compressdebug splitdebug"
 ACCEPT_KEYWORDS="~x86"
 CCACHE_SIZE="2G"
 CCACHE_DIR="/var/ccache"

 LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta tg tr uk uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE zh"

-## USE ARRAYS ##
+## USE ##
 SAB_BAD="-kdeprefix -arts -qt3 -beagle -gnome -evo -mono -eds -apm -oss -branding -esd"
-SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr mp3rtp xine cddb alsa dvb dvd network dvdread ipod audiofile artswrappersuid dvdr jack dri cdda mjpeg mmx joystick xvmc cpudetection v4l v4l2"
+SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr mp3rtp xine cddb alsa dvb dvd bluray network dvdread ipod audiofile artswrappersuid dvdr jack dri cdda mjpeg mmx joystick xvmc cpudetection v4l v4l2"
 #dvi
 SAB_CODECS="x264 gsm lame dv mp3 stream live openal theora ogg a52 win32codecs matroska xvid flac ffmpeg aac speex real dts musepack"
-SAB_SYSTEM="cjk unicode gnutls nptl gcj udev kerberos acl dbus bash-completion lzo rar policykit xcb bzip2 bidi wifi lm_sensors acpi usb pcmcia bluetooth irda ieee1394 perl python"
+SAB_SYSTEM="cjk unicode gnutls nptl gcj udev systemd logind -consolekit kerberos acl dbus bash-completion lzo rar policykit xcb bzip2 bidi wifi lm_sensors acpi usb pcmcia bluetooth irda ieee1394 perl python"
 SAB_FILESYS="fat hfs jfs xfs ntfs reiserfs sysfs inotify"
 SAB_PRINT="cups ppds foomatic-db gimpprint freetype xprint scanner"
 SAB_XSYS="cairo X opengl gif gtk qt4 qt3support xpm tiff xinerama aiglx svg gphoto2 dga lcd openexr"
@@ -36,7 +36,7 @@ USE="${SAB_BAD} ${SAB_MEDIA} ${SAB_CODECS} ${SAB_SYSTEM} ${SAB_FILESYS} ${SAB_PR

 ## DEVICES ##
 INPUT_DEVICES="evdev void"
-VIDEO_CARDS="fbdev vesa radeonhd"
+VIDEO_CARDS="fbdev vesa radeonsi radeon"
 LIRC_DEVICES="audio audio_alsa serial pctv"
 ALSA_CARDS="emu10k1x darla20 darla24 emu10k1 gina20 gina24 hdsp hdspm ice1712 indigo indigoio layla20 layla24 mia mixart mona pcxhr rme32 rme96 sb16 sbawe sscape usbusx2y vx222 usb-usx2y"
 CAMERAS="agfa_cl20 casio_qv dimagev dimera3500 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica_qm150 panasonic_coolshot panasonic_dc1000 panasonic_dc1580 panasonic_l859 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ricoh_g3 sipix_blink sipix_blink2 sipix_web2 sony_dscf1 sony_dscf55 toshiba_pdrm11 adc65 aox barbie canon clicksmart310 digigr8 digita directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 konica largan lg_gsm mars mustek pccam300 pccam600 ptp2 ricoh samsung sierra smal sonix soundvision spca50x sq905 stv0674 stv0680 sx330z template"
@@ -51,21 +51,30 @@ QEMU_USER_TARGETS="alpha arm armeb cris i386 m68k microblaze mips mipsel ppc ppc
 QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el mipsel ppc ppc64 ppcemb sh4 sh4eb sparc sparc64"

 ## PORTAGE CONFIG ##
+PORTDIR_OVERLAY="/usr/local/portage"
 source /var/lib/layman/make.conf
 CONFIG_PROTECT="/usr/share/config/kdm /etc /etc/conf.d /etc/init.d"
-CONFIG_PROTECT_MASK="/etc/skel"
+# /lib/modules mask is useful for our internal tinderbox
+CONFIG_PROTECT_MASK="/etc/skel /lib/modules"
 SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage"
 GENTOO_MIRRORS="http://ftp.heanet.ie/pub/gentoo/ ftp://ftp.halifax.rwth-aachen.de/gentoo/ ftp://mirror.cambrium.nl/pub/os/linux/gentoo/ ftp://mirror.opteamax.de/gentoo/ http://ftp.heanet.ie/pub/gentoo/"

-## FUCK KILL PYTHON 3 WITH FIRE ##
-# Avoids python.eclass to compile stuff for Python 3
 USE_PYTHON="2.7"
-PYTHON_TARGETS="python2_7"
+PYTHON_TARGETS="python2_7 python3_3"

 # Other forced targets
-PHP_TARGETS="php5-3"
+PHP_TARGETS="php5-4"
 RUBY_TARGETS="ruby19"

 # Apache suEXEC default UMASK
 # See bug 3544
 SUEXEC_UMASK=022
+
+# Setup GRUB platforms
+GRUB_PLATFORMS="pc"
+
+# Set PORTDIR for backward compatibility with various tools:
+#   gentoo-bashcomp - bug #478444
+#   euse - bug #474574
+#   euses and ufed - bug #478318
+PORTDIR="/usr/portage"
--- a/conf/intel/portage/package.env.amd64
+++ b/conf/intel/portage/package.env.amd64
@@ -1,24 +1,27 @@
 media-video/ffmpeg O3.amd64.conf
-media-video/libav O3.amd64.conf
+media-video/libav O3.amd64.notest.conf
 games-fps/nexuiz O3.amd64.conf
 games-fps/xonotic O3.amd64.conf
 games-fps/quake3 O3.amd64.conf
 games-fps/openarena O3.amd64.conf
 games-fps/warsow O3.amd64.conf
 www-servers/apache apache.conf
-sys-kernel/linux-fusion disable.debug.conf
-sys-kernel/linux-openvz disable.debug.conf
-sys-kernel/linux-rt disable.debug.conf
-sys-kernel/linux-sabayon disable.debug.conf
-sys-kernel/linux-server disable.debug.conf
-sys-kernel/linux-vserver disable.debug.conf
-sys-kernel/linux-xen-dom0 disable.debug.conf
-sys-kernel/linux-xen-domU disable.debug.conf
+
+# kernels, portage 2.2 enables FEATURES=userpriv, genkernel fails
+sys-kernel/linux-openvz disable.debug+userpriv.conf
+sys-kernel/linux-ec2 disable.debug+userpriv.conf
+sys-kernel/linux-sabayon disable.debug+userpriv.conf
+sys-kernel/linux-server disable.debug+userpriv.conf
+
 # micia: nvidia toolkit packages require GCC 4.4 
 # as of 05/jan/2012 disable graphite on it
 dev-util/nvidia-cuda-sdk nographite.amd64.conf
 dev-util/nvidia-cuda-toolkit nographite.amd64.conf

+net-print/pnm2ppa linguas-en.conf
+# separate language packages are used
+www-client/firefox linguas-en.conf
+
 # Enable hardening
 app-admin/osiris hardened.conf
 app-admin/sudo hardened.conf
--- a/conf/intel/portage/package.env.x86
+++ b/conf/intel/portage/package.env.x86
@@ -5,21 +5,25 @@ games-fps/xonotic O3.x86.conf
 games-fps/quake3 O3.x86.conf
 games-fps/openarena O3.x86.conf
 games-fps/warsow O3.x86.conf	
+games-strategy/0ad damn.sse.conf
 media-gfx/darktable damn.sse.conf
 www-servers/apache apache.conf
-sys-kernel/linux-fusion disable.debug.conf
-sys-kernel/linux-openvz disable.debug.conf
-sys-kernel/linux-rt disable.debug.conf
-sys-kernel/linux-sabayon disable.debug.conf
-sys-kernel/linux-server disable.debug.conf
-sys-kernel/linux-vserver disable.debug.conf
-sys-kernel/linux-xen-dom0 disable.debug.conf
-sys-kernel/linux-xen-domU disable.debug.conf
+
+# kernels, portage 2.2 enables FEATURES=userpriv, genkernel fails
+sys-kernel/linux-openvz disable.debug+userpriv.conf
+sys-kernel/linux-ec2 disable.debug+userpriv.conf
+sys-kernel/linux-sabayon disable.debug+userpriv.conf
+sys-kernel/linux-server disable.debug+userpriv.conf
+
 # micia: nvidia toolkit packages require GCC 4.4
 # as of 05/jan/2012 disable graphite on it
 dev-util/nvidia-cuda-sdk nographite.x86.conf
 dev-util/nvidia-cuda-toolkit nographite.x86.conf

+net-print/pnm2ppa linguas-en.conf
+# separate language packages are used
+www-client/firefox linguas-en.conf
+
 # Enable hardening
 app-admin/osiris hardened.conf
 app-admin/sudo hardened.conf
--- a/conf/intel/portage/package.env/.keep
+++ b/conf/intel/portage/package.env/.keep
--- a/conf/intel/portage/package.keywords
+++ b/conf/intel/portage/package.keywords
@@ -1,33 +0,0 @@
-# Only use stable versions of these libs
-# sys-kernel/linux-headers -~amd64 -~x86
-sys-libs/glibc -~amd64 -~x86
-<dev-lang/python-3 -~amd64 -~x86
-dev-libs/openssl -~amd64 -~x86
-dev-lang/perl -~amd64 -~x86
-sys-devel/make -~amd64 -~x86
-sys-kernel/linux-headers -~amd64 -~x86
-# make 3.82-r1 contains corruption patches
-=sys-devel/make-3.82-r1 ~amd64 ~x86
-
-app-crypt/qca:2 **
-dev-python/pycups **
-
-# Grub2, make binpkg for now, keep masked
-<sys-boot/grub-2.99 **
-dev-embedded/avr-libc * ~* -x86 -~x86 -amd64 -~amd64
-
-# Use portage-2.2
-=sys-apps/portage-2.2* **
-
-# versioned ebuilds missing ~x86 keword, GNOME 3.2 stuff
-<net-libs/gnome-online-accounts-9999 ** ~*
-<gnome-extra/gnome-contacts-9999 ** ~*
->=gnome-extra/gnome-dvb-daemon-0.2.5 ** ~amd64 ~x86
-# required by gnome-extra/gnome-dvb-daemon-0.2.5, required by gnome-extra/gnome-dvb-daemon (argument)
->=media-libs/gst-rtsp-server-0.10.8 ** ~amd64 ~x86
-
-
-# gst-plugins missing x86 keywords
-media-plugins/gst-plugins-assrender **
-# ~x86 arch missing
-media-video/hwdecode-demos ** ~x86 ~amd64
--- a/conf/intel/portage/package.keywords/00-sabayon.package.keywords
+++ b/conf/intel/portage/package.keywords/00-sabayon.package.keywords
@@ -0,0 +1,194 @@
+# Only use stable versions of these libs
+# sys-kernel/linux-headers -~amd64 -~x86
+sys-libs/glibc -~amd64 -~x86
+# Allow glibc 2.17, it's good enough and:
+# https://bugs.sabayon.org/show_bug.cgi?id=4182
+=sys-libs/glibc-2.17* ~amd64 ~x86
+<dev-lang/python-3 -~amd64 -~x86
+dev-libs/openssl -~amd64 -~x86
+dev-lang/perl -~amd64 -~x86
+sys-devel/make -~amd64 -~x86
+sys-kernel/linux-headers -~amd64 -~x86
+sys-libs/libselinux -~amd64 -~x86
+net-libs/gnutls -~amd64 -~x86
+# Accept gnutls-3.3 now
+=net-libs/gnutls-3.3* ~amd64 ~x86 amd64 x86
+dev-lang/tcl -~amd64 -~x86
+dev-lang/tk -~amd64 -~x86
+dev-lang/ghc -~amd64 -~x86
+dev-lang/ruby -~amd64 -~x86
+media-video/libav -~amd64 -~x86
+virtual/ffmpeg -~amd64 -~x86
+net-libs/ptlib -~amd64 -~x86
+net-libs/opal -~amd64 -~x86
+# Force stable boost
+dev-libs/boost -~amd64 -~x86
+dev-util/boost-build -~amd64 -~x86
+=dev-libs/boost-1.52* ~amd64 ~x86 amd64 x86
+=dev-util/boost-build-1.52* ~amd64 ~x86 amd64 x86
+# sci-mathematics/maxima needs texinfo <5.0
+# stick texinfo to stable to avoid matter bump it
+sys-apps/texinfo -~amd64 -~x86
+
+# Apache is a critical component and 2.2 is still
+# "good enough", 2.4 isn't yet stabilized
+app-admin/apache-tools -~amd64 -~x86
+www-servers/apache -~amd64 -~x86
+<www-servers/apache-2.3 ~amd64 ~x86 amd64 x86
+<app-admin/apache-tools-2.3 ~amd64 ~x86 amd64 x86
+# required to compile Chromium on x86, it seems
+=sys-devel/make-3.82-r4 ~amd64 ~x86
+
+# force stable libpng
+media-libs/libpng -~amd64 -~x86
+# but allow libpng 1.6, we need ABI_X86 support
+=media-libs/libpng-1.6* ~amd64 ~x86
+
+# force stable icu
+dev-libs/icu -~amd64 -~x86
+
+app-crypt/qca:2 **
+dev-python/pycups **
+
+# Grub2, make binpkg for now, keep masked
+<sys-boot/grub-2.99 **
+dev-embedded/avr-libc * ~* -x86 -~x86 -amd64 -~amd64
+
+# Use portage-2.2
+=sys-apps/portage-2.2* **
+
+# versioned ebuilds missing ~x86 keword, GNOME 3.2 stuff
+<net-libs/gnome-online-accounts-9999 ** ~*
+<gnome-extra/gnome-contacts-9999 ** ~*
+>=gnome-extra/gnome-dvb-daemon-0.2.5 ** ~amd64 ~x86
+# required by gnome-extra/gnome-dvb-daemon-0.2.5, required by gnome-extra/gnome-dvb-daemon (argument)
+>=media-libs/gst-rtsp-server-0.10.8 ** ~amd64 ~x86
+
+
+# gst-plugins missing x86 keywords
+media-plugins/gst-plugins-assrender **
+# ~x86 arch missing
+media-video/hwdecode-demos ** ~x86 ~amd64
+
+# using only stable versions
+www-client/chromium -~amd64 -~x86
+
+# From the bumblebee overlay
+=x11-misc/primus-9999 ** ~amd64 ~x86
+
+# Keeps being pulled in while qgis still needs an older version
+>=x11-libs/qwtpolar-1.0 -~amd64 -~x86
+
+# Python 3.3, add keywords
+dev-lang/python:3.3 ** ~amd64 ~x86
+
+# OpenEXR 2.0.0 causes a huge breakage, keep stable, mask unstable
+media-libs/ilmbase -~amd64 -~x86
+media-libs/openexr -~amd64 -~x86
+media-gfx/openexr_viewers -~amd64 -~x86
+
+# leechcraft only stable versions
+app-leechcraft/leechcraft-meta -~amd64 -~x86
+
+# These are a pain in the ass when they abi break
+net-libs/libosip -~amd64 -~x86
+# net-libs/libeXosip -~amd64 -~x86
+
+# Keyword libsdl2 required by steam on amd64
+=media-libs/libsdl2-2.0.0-r1 ** ~amd64
+
+# 7.6.3-r1 (stable) does not compile on x86
+# (related to Sabayon hardening)
+=dev-lang/ghc-7.6.3 **
+
+# Force stable, since shorewall{6,}-lite
+# inverse deps are not updated with the same freq.
+net-firewall/shorewall-core -~amd64 -~x86
+
+# Accept any libav-0.8* and virtual/ffmpeg-0.10*
+# This is what we currently support
+=virtual/ffmpeg-0.10* ~amd64 ~x86
+=media-video/libav-9* ~amd64 ~x86
+=virtual/ffmpeg-9* ~amd64 ~x86
+
+# new libvirt may break virtinst revdep, force stable
+app-emulation/libvirt -~amd64 -~x86
+
+# Latest libgcrypt may break a gazillion of pkgs,
+# wait for it to be stabilized
+dev-libs/libgcrypt -~amd64 -~x86
+# allow 1.5 and 1.6 on amd64, mainly due to true multilib
+=dev-libs/libgcrypt-1.5* ~amd64
+=dev-libs/libgcrypt-1.6* ~amd64
+
+# Force stable, due to Gentoo bug #495236
+dev-python/tempita -~amd64 -~x86
+
+# GNOME 3.10/3.12 crap for x86
+# required by =gnome-base/gnome-3.10* (argument)
+=gnome-base/gnome-3.12* ** ~x86
+=gnome-extra/gnome-documents-3.12* ** ~x86
+# required by =gnome-base/gnome-extra-apps-3.10* (argument)
+=gnome-base/gnome-extra-apps-3.12* ** ~x86
+=net-misc/gnome-online-miners-3.12* ** ~x86
+# required by gnome-weather (argument)
+=gnome-extra/gnome-weather-3.12* ** ~x86
+# required by gnome-music (argument)
+=media-sound/gnome-music-3.12* ** ~x86
+# required by gnome-photos (argument)
+=media-gfx/gnome-photos-3.12* ** ~x86
+# required by gnome-maps (argument)
+=sci-geosciences/gnome-maps-3.12* ** ~x86
+
+# vlc fails configure with unstable libdvbpsi
+media-libs/libdvbpsi -~amd64 -~x86
+
+# singular fails with unstable ntl
+dev-libs/ntl -~amd64 -~x86
+
+# we want stable systemd stack
+virtual/udev -~amd64 -~x86
+# accept udev-208-r2 since it provides true multilib support
+=virtual/udev-208-r2 ~amd64
+sys-apps/systemd -~amd64 -~x86
+# except systemd-208
+=sys-apps/systemd-208* ~amd64 ~x86
+
+# Allow any openssl 0.9.8y revision as well
+=dev-libs/openssl-0.9.8* ~amd64 ~x86
+# Allow any openssl 1.0.1 as well, this includes
+# true multilib aware versions, only needed for amd64
+=dev-libs/openssl-1.0.1* ~amd64
+
+# required by x11-wm/mutter-3.12.1
+# required by gnome-base/gnome-shell-3.12.1
+# required by gnome-shell (argument)
+=sys-power/upower-0.99* ** ~amd64 ~x86
+=sys-power/upower-0.100* ** ~amd64 ~x86
+
+# required by net-misc/gnome-online-miners-3.12.0
+# required by gnome-extra/gnome-documents-3.12.0
+# required by gnome-documents (argument)
+=net-libs/libgfbgraph-0.2* ** ~amd64 ~x86
+
+# keep xdebug-client to stable, since devs tend to update
+# xdebug and xdebug-client separately
+dev-php/xdebug-client -~amd64 -~x86
+
+# Prefer a stable and reliable version of freetype
+media-libs/freetype -~amd64 -~x86
+
+# Allow systemd and upower-0.99 friendly version
+=xfce-extra/xfce4-power-manager-1.2.0_p20140527 ** ~amd64 ~x86 amd64 x86
+
+# Use stable clhep to avoid breaking geant
+sci-physics/clhep -~amd64 -~x86
+# Allow 2.1.4.2 as it works fine
+~sci-physics/clhep-2.1.4.2 ~amd64 ~x86 amd64 x86
+
+# Use stable libgit2 to allow reverse deps to catch up
+dev-libs/libgit2 -~amd64 -~x86
+
+# Force stable pyparsing since unstable 2.0.x introduces incompatible changes
+dev-python/pyparsing -~amd64 -~x86
+
--- a/conf/intel/portage/package.license
+++ b/conf/intel/portage/package.license
@@ -8,6 +8,8 @@ dev-lang/icc				Intel-SDP
 dev-lang/idb				Intel-SDP
 dev-lang/ifc				Intel-SDP
 dev-libs/intel-common			Intel-SDP
+dev-util/intel-ocl-sdk			Intel-SDP
+dev-util/nvidia-cuda-toolkit		NVIDIA-CUDA
 games-action/mutantstorm-demo		POMPOM
 games-action/spacetripper-demo		POMPOM
 games-arcade/thinktanks-demo		THINKTANKS
@@ -17,6 +19,7 @@ games-fps/quake3-data			Q3AEULA
 games-fps/quake3-demo			Q3AEULA
 games-fps/quake4-demo			QUAKE4
 games-fps/enemy-territory		RTCW-ETEULA
+games-fps/urbanterror			Q3AEULA Q3AEULA-20000111
 games-fps/ut2004			ut2003
 games-fps/ut2004-data			ut2003
 games-server/ut2004-ded			ut2003
@@ -26,16 +29,21 @@ games-strategy/darwinia-demo		Introversion
 games-strategy/darwinia			Introversion
 app-cdr/nero				Nero-EULA-US
 games-simulation/bcs-demo       	BCS
+media-sound/google-musicmanager		Google-TOS Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB libtiff
 net-wireless/broadcom-sta		Broadcom
 app-emulation/virtualbox-bin		PUEL
-media-sound/google-musicmanager		google-talkplugin Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB as-is
-media-tv/livestation			Livestation-EULA
+media-sound/neroaac			Nero-AAC-EULA
 media-video/makemkv			MakeMKV-EULA
 games-action/heretic2-demo		LOKI-EULA
-net-im/skype				>=net-im/skype-4.0.0.7-r2 skype-4.0.0.7-copyright 
+net-im/skype				>=net-im/skype-4.0.0.7-r2 skype-4.0.0.7-copyright
 sci-electronics/eagle                   cadsoft
 sci-geosciences/googleearth             googleearth
-www-plugins/adobe-flash			AdobeFlash-10.3
-www-plugins/google-talkplugin           google-talkplugin
+sci-misc/mendeleydesktop 		Mendeley-EULA
+www-client/google-chrome		google-chrome
+www-plugins/adobe-flash			AdobeFlash-10.3 AdobeFlash-11.x
+www-plugins/chrome-binary-plugins	google-chrome
+www-plugins/google-talkplugin           Google-TOS
 dev-java/oracle-jdk-bin			Oracle-BCLA-JavaSE
 dev-java/oracle-jre-bin			Oracle-BCLA-JavaSE
+sys-firmware/b43-firmware		Broadcom
+net-misc/teamviewer			TeamViewer
--- a/conf/intel/portage/package.mask
+++ b/conf/intel/portage/package.mask
@@ -1,189 +0,0 @@
-# Masked because it requires a flag change.
-
-# Temp. masked
-app-i18n/anthy-ss
-app-i18n/atokx2
-app-vim/cvscommand
-app-vim/vcscommand
-sci-biology/mira
->dev-lang/erlang-13.2.4
-x11-misc/bumblebee::gentoo
-x11-plugins/compiz-plugins-main::gentoo
-=dev-libs/libxml2-2.8.0_rc1::gentoo
-
-
-# Joost Ruis: Masked because on our overlay, prevent pulling in Portage versions
-x11-drivers/ati-drivers::gentoo
-media-gfx/splashutils::gentoo
-sys-apps/baselayout::gentoo
-# remove mask to pull in sys-fs/udev::gentoo for testing
-# sys-fs/udev::gentoo
-
-# Joost Ruis: Needed by masked python:3.1
->=dev-python/simpletal-5.0
->=dev-util/eric-5.0.2
->=net-irc/znc-0.098
->=net-zope/zope-interface-3.6.1
-
-# Sławomir Nizio: needs Python 3
->=app-text/nfoview-1.10
-
-# Joost Ruis: Old as wolfden!
-x11-libs/gtk+:1
-
-### Blockers
-
-# 2010-10-29 Joost Ruis: Blocks sci-biology/emboss
-sys-devel/cons
-dev-java/emma
-
-# Joost Ruis: Blocks bash
-app-shells/bashdb
-
-# Joost Ruis: Blocks media-gfx/hugin
-dev-util/cocom
-
-# Joost Ruis: We use KDE and want the KDE phonon package
-#x11-libs/qt-phonon
-
-# Joost Ruis: Requires mesa +motif
-media-libs/openinventor
-sci-biology/arb
-
-# Joost Ruis: needs pciutils with zlib, but we have it in package.use with -zlib no idea why.
-xfce-extra/xfce4-cellmodem-plugin
-
-### Temp masked due a bug
-
-### Slotted packages 
-<net-analyzer/metasploit-3.2_p6750
-app-editors/emacs:18
-
-### net-analyser
-
-# Joost Ruis: We have netcat6 in our tree
-net-analyzer/netcat
-app-forensics/air
-
-### net-p2p
-
-### www-client 
-
-# Joost Ruis: This requires x11-libs/fltk with -cairo, that ain't happening
-# Sławomir Nizio (30 Dec 2011): now fltk:2 is compiled with -cairo, and it's used by dillo 2 (3 wants fltk:1)
->=www-client/dillo-3
-
-### net-misc 
-
-# Joost Ruis: We have Openswan in our tree so we must mask this
-net-misc/strongswan
-
-# Joost Ruis: We have tightvnc in our tree so we must mask this
-net-misc/tigervnc
-
-# Joost Ruis: This package cannot be in tree with distcc
-net-misc/pump
-
-# Joost Ruis: This package cannot be in tree with sys-apps/iproute2
-net-misc/arpd
-
-#Joost Ruis: Wants >=dev-lang/perl-5.6.1[-ithreads] never going to happen.
-net-irc/epic4
-
-# Joost Ruis: We use net-misc/ntp so we want to mask this
-net-misc/openntpd
-
-# Joost Ruis: We use net-misc/netkit-telnetd so we want to mask
-net-misc/telnet-bsd
-
-# Joost Ruis: Seems to be incompatible with latest net-misc/asterisk 
-=net-misc/asterisk-rate_engine-0.5.4
-
-# Joost Ruis: We use dev-texlive/texlive-latexextra so we want to mask this
-dev-tex/prosper
-
-# Joost Ruis: wants dev-python/imaging +tk compiled, ain't going to happen
-=media-sound/lilycomp-1.0.2-r1
-media-gfx/skencil
-media-gfx/asymptote
-
-### Games
-
-# Joost Ruis: Requires media-libs/sdl-mixer[timidity]
-games-rpg/xu4
-games-arcade/rocksndiamonds
-
-# Joost Ruis: Wants gd-external for PHP, not want
-net-analyzer/pnp4nagios
-
-# 2010-05-07 Be careful, these versions made xbmc+vdpau go boom
-# >media-video/ffmpeg-0.5_p20373
-
-# 2010-10-02 Joost Ruis: Needs PHP with +mssql
-dev-php/PEAR-MDB2_Driver_mssql
-
-# 2010-10-02 Joost Ruis: Needs PHP with +firebird
-dev-php/PEAR-MDB2_Driver_ibase
-
-# 2010-10-02 Joost Ruis: Needs PHP with +oci8
-dev-php/PEAR-MDB2_Driver_oci8
-
-# 2010-07-26 Joost Ruis: Needs PHP with +xsl
-# move dev-php5/phing dev-php/phing
-dev-php/phing
-dev-php/agavi
-
-# 2010-10-29 Joost Ruis: Needs media-libs/mesa +motif
-sci-chemistry/molmol
-
-# 2010-10-29 Joost Ruis: collision with sci-libs/gdal
-sci-astronomy/cpl
-sci-astronomy/esorex
-
-# 2010-11-16 Joost Ruis: Needs qt-gui with +gtk (What the hell??)
-media-sound/qtractor
-
-# 2010-11-18 Joost Ruis: Blocks media-fonts/jsmath-extra-dark 
-media-fonts/jsmath-extra-light
-
-# 2010-11-18 Joost Ruis: Blocks media-fonts/culmus
-media-fonts/culmus-ancient
-
-# 2010-11-26 Fabio Erculiani: Keep networkmanager from our overlay
-net-misc/networkmanager::gentoo
-
-# 2010-12-28 Joost Ruis: Needs vdr with -noepg
-media-plugins/vdr-noepgmenu
-
-# 2010-12-28 Joost Ruis: Needs vdr +setup, but we cannot enable that flag. 
-media-plugins/vdr-setup
-
-# 2011-01-08 Fabio Erculiani: broken, resolv.conf issue
-# see http://forum.sabayon.org/viewtopic.php?f=52&t=22717
->net-dns/openresolv-3.4
-
-# 2011-08-16 Fabio Erculiani: Cruft we don't want
-dev-php/eaccelerator
-dev-php/xcache
-
-# udevadm settle bug on LiveCD boot
-# reported upstream...
-# Upstream is LAME
-# Kay Sievers !!
-# >=sys-fs/udev-168
-
-# 2011-08-17 Joost Ruis: Wants pulseaudio +gnome
-media-sound/paprefs
-
-# 2011-08-17 Fabio Erculiani: Conflicts with x11-terms/terminal
-gnustep-apps/terminal
-
-# 2011-11-02 Joost Ruis: Breaks games-arcade/smc. See Gentoo bug #357761 
->dev-games/cegui-0.6.2b 
-
-# Fabio Erculiani, matter masks (preserved-libs bullshit):
->app-i18n/fcitx-4.1
->app-i18n/fcitx-configtool-0.3
-
-# 2012-02-15 Joost Ruis: Only use pymol from our overlay since it has depends on python-tk  
-sci-chemistry/pymol::gentoo
--- a/conf/intel/portage/package.mask/00-sabayon.package.mask
+++ b/conf/intel/portage/package.mask/00-sabayon.package.mask
@@ -0,0 +1,284 @@
+# Joost Ruis: Old as wolfden!
+x11-libs/gtk+:1
+
+### Blockers
+
+# 2010-10-29 Joost Ruis: Blocks sci-biology/emboss
+sys-devel/cons
+dev-java/emma
+
+# Joost Ruis: Blocks bash
+app-shells/bashdb
+
+# Joost Ruis: Blocks media-gfx/hugin
+dev-util/cocom
+
+# Joost Ruis: Requires mesa +motif
+sci-biology/arb
+
+# Joost Ruis: needs pciutils with zlib, but we have it in package.use with -zlib no idea why.
+xfce-extra/xfce4-cellmodem-plugin
+
+### Temp masked due a bug
+
+### Slotted packages
+<net-analyzer/metasploit-3.2_p6750
+app-editors/emacs:18
+
+### net-analyser
+
+# Joost Ruis: We have netcat6 in our tree
+net-analyzer/netcat
+app-forensics/air
+
+### net-p2p
+
+### www-client
+
+# Joost Ruis: This requires x11-libs/fltk with -cairo, that ain't happening
+# Sławomir Nizio (30 Dec 2011): now fltk:2 is compiled with -cairo, and it's used by dillo 2 (3 wants fltk:1)
+>=www-client/dillo-3
+
+### net-misc
+
+# Joost Ruis: This package cannot be in tree with distcc
+net-misc/pump
+
+# Joost Ruis: This package cannot be in tree with sys-apps/iproute2
+net-misc/arpd
+
+#Joost Ruis: Wants >=dev-lang/perl-5.6.1[-ithreads] never going to happen.
+net-irc/epic4
+
+# Joost Ruis: We use net-misc/ntp so we want to mask this
+net-misc/openntpd
+
+# Joost Ruis: We use net-misc/netkit-telnetd so we want to mask
+net-misc/telnet-bsd
+
+# Joost Ruis: Seems to be incompatible with latest net-misc/asterisk 
+=net-misc/asterisk-rate_engine-0.5.4
+
+# Joost Ruis: We use dev-texlive/texlive-latexextra so we want to mask this
+dev-tex/prosper
+
+# Joost Ruis: wants dev-python/imaging +tk compiled, ain't going to happen
+=media-sound/lilycomp-1.0.2-r1
+media-gfx/skencil
+media-gfx/asymptote
+
+### Games
+
+# Joost Ruis: Requires media-libs/sdl-mixer[timidity]
+games-rpg/xu4
+games-arcade/rocksndiamonds
+
+# Joost Ruis: Wants gd-external for PHP, not want
+net-analyzer/pnp4nagios
+
+# 2010-10-02 Joost Ruis: Needs PHP with +mssql
+dev-php/PEAR-MDB2_Driver_mssql
+
+# 2010-10-02 Joost Ruis: Needs PHP with +firebird
+dev-php/PEAR-MDB2_Driver_ibase
+
+# 2010-10-02 Joost Ruis: Needs PHP with +oci8
+dev-php/PEAR-MDB2_Driver_oci8
+
+# 2010-07-26 Joost Ruis: Needs PHP with +xsl
+# move dev-php5/phing dev-php/phing
+dev-php/phing
+dev-php/agavi
+
+# 2010-10-29 Joost Ruis: Needs media-libs/mesa +motif
+sci-chemistry/molmol
+
+# 2010-10-29 Joost Ruis: collision with sci-libs/gdal
+sci-astronomy/cpl
+sci-astronomy/esorex
+
+# 2010-11-16 Joost Ruis: Needs qt-gui with +gtk (What the hell??)
+media-sound/qtractor
+
+# 2010-11-18 Joost Ruis: Blocks media-fonts/jsmath-extra-dark
+media-fonts/jsmath-extra-light
+
+# 2010-11-18 Joost Ruis: Blocks media-fonts/culmus
+media-fonts/culmus-ancient
+
+# 2010-11-26 Fabio Erculiani: Keep networkmanager from our overlay
+net-misc/networkmanager::gentoo
+
+# 2010-12-28 Joost Ruis: Needs vdr with -noepg
+media-plugins/vdr-noepgmenu
+
+# 2010-12-28 Joost Ruis: Needs vdr +setup, but we cannot enable that flag
+media-plugins/vdr-setup
+
+# 2011-08-16 Fabio Erculiani: Cruft we don't want
+dev-php/eaccelerator
+dev-php/xcache
+
+# udevadm settle bug on LiveCD boot
+# reported upstream...
+# Upstream is LAME
+# Kay Sievers !!
+# >=sys-fs/udev-168
+
+# 2011-08-17 Joost Ruis: Wants pulseaudio +gnome
+media-sound/paprefs
+
+# 2011-08-17 Fabio Erculiani: Conflicts with x11-terms/terminal
+gnustep-apps/terminal
+
+# 2012-12-14 Fabio Erculiani: it is causing annoying sh errors on chroots
+>=app-shells/autojump-21.1.0
+
+# 2013-01-13 Fabio Erculiani: we use media-video/libav
+media-video/ffmpeg
+
+# 2013-02-08 Fabio Erculiani: we use man-db
+sys-apps/man
+
+# 2013-04-03 Fabio Erculiani: we are currently supporting 1.14
+>=x11-base/xorg-server-1.15
+
+# 2013-06-26 Fabio Erculiani: migrated to logind
+sys-auth/consolekit
+
+# 2013-08-12 Fabio Erculiani: oyranos 0.9.4 wants elektra 0.7
+# stop matter from bumping it for now.
+>=app-admin/elektra-0.8
+
+# 2013-08-12 Fabio Erculiani: dev-python/python-novaclient and
+# dev-python/python-glanceclient want older prettytable and
+# matter keeps pulling it it.
+# 2013-04-18 Sławomir Nizio: bump masked version to avoid this
+# problem, even though 0.7 is the latest currently (relevant
+# mask is now: <dev-python/prettytable-0.8).
+>=dev-python/prettytable-0.8
+
+# 2013-08-12 Fabio Erculiani: dev-python/sqlalchemy-migrate-0.7
+# requires an older version of sqlalchemy (of course!)
+>=dev-python/sqlalchemy-0.8
+
+# 2013-08-12 Fabio Erculiani: dev-perl/math-pari wants exactly
+# sci-mathematics/pari-2.3.5
+<sci-mathematics/pari-2.3.5
+>sci-mathematics/pari-2.3.5
+
+# 2013-08-20 Fabio Erculiani: dev-python/warlock needs it and matter
+# keeps bumping it.
+>dev-python/jsonpatch-0.10
+
+# 2013-08-26 Fabio Erculiani: mask the gamerlay version of osg
+# osg has a very unstable API.
+dev-games/openscenegraph::gamerlay
+
+# 2013-09-16 Fabio Erculiani: wtf? live ebuild with keywords?
+>=dev-python/python-keystoneclient-9999
+
+# 2013-09-26 Fabio Erculiani: we're shipping with ruby:1.9 atm
+>=dev-lang/ruby-2.0
+
+# 2013-10-21 Fabio Erculiani: avoid libsdl from gamerlay, since
+# version 2 is in the main tree under a different PN (libsdl2).
+media-libs/libsdl::gamerlay
+games-util/steam-games-meta::gamerlay
+games-util/steam-client-meta::gamerlay
+
+# 2013-11-13 Sławomir Nizio: this package (v. 2013.1.4, 2013.2)
+# depends directly or indirectly on packages older than we already
+# provide. It cannot be supported properly (easily), and seems to
+# be unpopular.
+app-admin/glance
+
+# 2014-03-26 Fabui Erculiani: we now use systemd from sabayon-distro
+sys-apps/systemd::systemd-love
+sys-apps/systemd::gentoo
+
+# 2014-04-04 Fabio Erculiani: migrated to dev-python/pillow
+dev-python/imaging
+
+# 2014-04-15 Fabio Erculiani: no tomcat 7.0.53 yet
+~dev-java/tomcat-servlet-api-7.0.53
+
+# 2014-05-26 Fabio Erculiani: we are still using cpufrequtils
+sys-power/cpupower
+
+# 2014-06-01 Fabio Erculiani: always prefer stable chrome-binary-plugins
+www-plugins/chrome-binary-plugins:beta
+www-plugins/chrome-binary-plugins:unstable
+
+# 2014-07-24 Fabio Erculiani: mwlib wants an old pyparsing
+>=dev-python/pyparsing-1.6
+
+# 2014-08-02 Fabio Erculiani: plymouth 0.9.0 simply does not work
+>=sys-boot/plymouth-0.9.0
+>=sys-boot/plymouth-extras-0.9.0
+
+# 2014-08-31 Sławomir Nizio: we cannot support it properly, bug 3776
+app-portage/g-octave
+
+# 2014-09-30 Joost Ruis: Do not pull xbmc from Portage
+media-tv/xbmc::gentoo
+
+# 2014-09-30 Joost Ruis: Do not pull poppler from Portage
+app-text/poppler::gentoo
+
+# 2014-09-30 Joost Ruis: Masked because we bump to latest stable pull and not want to pull in unstable
+>virtual/perl-AutoLoader-5.730.0-r2
+>virtual/perl-Package-Constants-0.20.0-r4
+>virtual/perl-CPAN-Meta-2.120.921-r2
+>virtual/perl-CPAN-Meta-YAML-0.8.0-r2
+>virtual/perl-CPAN-Meta-Requirements-2.122.0-r2
+>virtual/perl-ExtUtils-Command-1.170.0-r5
+>virtual/perl-ExtUtils-MakeMaker-6.660.0-r1
+>virtual/perl-ExtUtils-CBuilder-0.280.210-r1
+>virtual/perl-File-Spec-3.400.0-r2
+>virtual/perl-Exporter-5.680.0-r2
+>virtual/perl-DB_File-1.829.0
+>virtual/perl-bignum-0.330.0
+>virtual/perl-Module-Load-0.240.0-r1
+>virtual/perl-Module-Load-Conditional-0.580.0
+>virtual/perl-CGI-3.630.0-r2
+>virtual/perl-Attribute-Handlers-0.940.0-r1
+>virtual/perl-I18N-LangTags-0.390.0
+>virtual/perl-Math-BigInt-FastCalc-0.300.0-r3
+>virtual/perl-Module-Metadata-1.0.11-r1
+>virtual/perl-Net-Ping-2.41-r1
+>virtual/perl-if-0.60.200-r1
+>virtual/perl-IPC-Cmd-0.800.0-r1
+>virtual/perl-JSON-PP-2.272.20-r1
+>virtual/perl-Encode-2.490.0-r2
+>virtual/perl-Socket-2.9.0-r2
+>virtual/perl-Storable-2.410.0-r1
+>virtual/perl-Parse-CPAN-Meta-1.440.400-r1
+>virtual/perl-Time-Piece-1.20-r1
+>virtual/perl-IO-Compress-2.60.0-r1
+>virtual/perl-Compress-Raw-Bzip2-2.60.0-r2
+>virtual/perl-ExtUtils-ParseXS-3.180.0-r2
+>virtual/perl-Pod-Parser-1.600.0
+>virtual/perl-Pod-Escapes-1.40.0-r4
+>virtual/perl-Scalar-List-Utils-1.350.0
+>virtual/perl-Module-Build-0.400.300-r1
+>virtual/perl-Digest-SHA-5.850.0
+>virtual/perl-Test-Harness-3.260.0-r2
+>virtual/perl-Archive-Tar-1.900.0-r2
+>virtual/perl-Compress-Raw-Zlib-2.60.0-r2
+>virtual/perl-XSLoader-0.160.0-r1
+>virtual/perl-Math-BigRat-0.260.400
+>virtual/perl-Perl-OSType-1.3.0-r1
+>virtual/perl-Test-Simple-0.980.0-r5
+>virtual/perl-threads-1.860.0-r3
+>virtual/perl-threads-shared-1.430.0-r1
+>virtual/perl-Thread-Queue-3.20.0-r1
+>virtual/perl-Locale-Maketext-1.230.0-r1
+>dev-lang/perl-5.18.2-r1
+
+# 10-03-2014 Joost Ruis: Mask libnl-3
+# See bug #4807
+>=dev-libs/libnl-3.2.25
+
+# 2014-10-12 Sławomir Nizio: sci-visualization/mayavi (4.3.0) does not build with it
+=sci-libs/vtk-6.0.0*
--- a/conf/intel/portage/package.unmask
+++ b/conf/intel/portage/package.unmask
@@ -1,133 +0,0 @@
-media-sound/potamus
-<sys-apps/portage-2.3
-
-# Unmasking development kernel sources for openvz
-=sys-kernel/openvz-sources-2.6.32*
-
-# Only version 1.6.x works with latest kernels
-net-fs/openafs-kernel
-net-fs/openafs
-
-# it's broken, but we have it in repos
->=x11-drivers/nvidia-drivers-275.21
-
-# GCC 4.6, welcome!
-sys-devel/gcc:4.6::sabayon-distro
-
-# Needed for the >=games-action/teeworlds-0.6.1
->=dev-util/bam-0.4.0
-
-# Our version is fine
-media-video/nvidia-settings::sabayon-distro
-
-# Unmask Gimp 2.7, we want it
-<=media-gfx/gimp-2.8
-
-# Anaconda uses it (perhaps bundle it?)
-<sys-libs/libsepol-9999
-
-# Compiz Fusion stuff is hopefully going to be
-# resurrected by upstream volunteers
-<dev-python/compizconfig-python-9999
-<x11-apps/fusion-icon-9999
-<x11-apps/simple-ccsm-9999
-<x11-apps/ccsm-9999
-<x11-plugins/compiz-plugins-extra-9999
-<x11-themes/emerald-themes-9999
-<x11-libs/compizconfig-backend-gconf-9999
-<x11-libs/compiz-bcop-9999
-<x11-plugins/compiz-plugins-main-9999
-<x11-plugins/compiz-plugins-unsupported-9999
-<x11-wm/compiz-fusion-9999
-<x11-wm/emerald-9999
-<x11-libs/libcompizconfig-9999
-
-# Nirbheek Chauhan <nirbheek@gentoo.org> (25 Mar 2012)
-# This is now the GNOME 3.4 mask
-# Masked for testing, clutter-1.10, and bugs in some packages:
-=app-accessibility/accerciser-3.4*
-=app-accessibility/at-spi2-atk-2.4*
-=app-accessibility/at-spi2-core-2.4*
-=app-accessibility/orca-3.4*
-=app-admin/gnome-system-log-3.4*
-=app-crypt/gcr-3.4*
-=app-crypt/seahorse-3.4*
-=app-dicts/gnome-dictionary-3.4*
-=app-misc/tracker-0.14*
->=dev-libs/folks-0.6.8
-=dev-libs/libgdata-0.12*
-=dev-libs/totem-pl-parser-3*
-=dev-util/gnome-devel-docs-3.4*
-=dev-python/pyatspi-2.4*
-=gnome-base/gdm-3.4*
-=gnome-base/gnome-control-center-3.4*
-=gnome-base/gnome-core-apps-3.4*
-=gnome-base/gnome-core-libs-3.4*
-=gnome-base/gnome-desktop-3.4*
-=gnome-base/gnome-extra-apps-3.4*
-=gnome-base/gnome-fallback-3.4*
-=gnome-base/gnome-3.4*
-=gnome-base/gnome-keyring-3.4*
-=gnome-base/gnome-light-3.4*
-=gnome-base/gnome-menus-3.4*
-=gnome-base/gnome-panel-3.4*
-=gnome-base/gnome-power-manager-3.4*
-=gnome-base/gnome-session-3.4*
-=gnome-base/gnome-settings-daemon-3.4*
-=gnome-base/gnome-shell-3.4*
-=gnome-base/libgnome-keyring-3.4*
-=gnome-base/libgnomekbd-3.4*
-=gnome-base/nautilus-3.4*
-=gnome-extra/evolution-data-server-3.4*
-=gnome-extra/evolution-ews-3.4*
-=gnome-extra/evolution-exchange-3.4*
-=gnome-extra/evolution-groupwise-3.4*
-=gnome-extra/gnome-color-manager-3.4*
-=gnome-extra/gnome-contacts-3.4*
-=gnome-extra/gnome-documents-0.4*
-=gnome-extra/gnome-games-3.4*
-=gnome-extra/gnome-search-tool-3.4*
-=gnome-extra/gnome-shell-extensions-3.4*
->=gnome-extra/gnome-tweak-tool-3.3
-=gnome-extra/gnome-user-docs-3.4*
-=gnome-extra/gnome-utils-3.4*
-=gnome-extra/mousetweaks-3.4*
-=gnome-extra/nautilus-tracker-tags-0.14*
-=gnome-extra/seahorse-nautilus-3.4*
-=gnome-extra/sushi-0.4*
-=mail-client/evolution-3.4*
-=media-gfx/gnome-font-viewer-3.4*
-=media-gfx/gnome-screenshot-3.4*
-=media-video/cheese-3.4*
-=media-video/totem-3.4*
-=net-im/empathy-3.4*
-=net-libs/gnome-online-accounts-3.4*
->=net-libs/telepathy-farstream-0.2
-=net-wireless/gnome-bluetooth-3.4*
-=sys-apps/baobab-3.4*
-=x11-libs/libcryptui-3.4*
-=x11-libs/libwnck-3.4*
->=x11-wm/metacity-2.34.2
-=x11-wm/mutter-3.4*
->=x11-themes/zukitwo-shell-2012.04.24
-# New clutter API breaks almost everything
-=media-libs/cogl-1.10*
-=media-libs/clutter-1.10*
-=media-libs/clutter-gtk-1.2*
-=media-libs/clutter-gst-1.5*
-=media-libs/clutter-gst-1.6*
-# Needs gst-plugins-flac-0.10.31 + commit 265a5bfa to write seekable flac files
-=media-sound/sound-juicer-3.4*
-
-# We want MySQL 5.5, do we?
-=dev-db/mariadb-5.5*
-=dev-db/mysql-5.5*
-=virtual/mysql-5.5*
-
-# Unmask for us:
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (11 May 2012)
-# Nouveau API break, mask until situation becomes palatable for users
-# xf86-video-ati-6.14.5 needs new libdrm
-<x11-drivers/xf86-video-ati-9999
-<x11-drivers/xf86-video-nouveau-9999
-<x11-libs/libdrm-9999
--- a/conf/intel/portage/package.unmask/00-sabayon.package.unmask
+++ b/conf/intel/portage/package.unmask/00-sabayon.package.unmask
@@ -0,0 +1,327 @@
+media-sound/potamus
+<sys-apps/portage-2.3
+
+# Unmasking development kernel sources for openvz
+=sys-kernel/openvz-sources-2.6.32*
+
+# Only version 1.6.x works with latest kernels
+net-fs/openafs-kernel
+net-fs/openafs
+
+# it's broken, but we have it in repos
+>=x11-drivers/nvidia-drivers-275.21
+
+# GCC 4.6, welcome!
+sys-devel/gcc:4.6::sabayon-distro
+
+# Needed for the >=games-action/teeworlds-0.6.1
+>=dev-util/bam-0.4.0
+
+# Our version is fine
+media-video/nvidia-settings::sabayon-distro
+
+# Anaconda uses it (perhaps bundle it?)
+<sys-libs/libsepol-9999
+
+# Compiz Fusion stuff is hopefully going to be
+# resurrected by upstream volunteers
+<dev-python/compizconfig-python-9999
+<x11-apps/fusion-icon-9999
+<x11-apps/simple-ccsm-9999
+<x11-apps/ccsm-9999
+<x11-plugins/compiz-plugins-extra-9999
+<x11-themes/emerald-themes-9999
+<x11-libs/compizconfig-backend-gconf-9999
+<x11-libs/compiz-bcop-9999
+<x11-plugins/compiz-plugins-main-9999
+<x11-plugins/compiz-plugins-unsupported-9999
+<x11-wm/compiz-fusion-9999
+<x11-wm/emerald-9999
+<x11-libs/libcompizconfig-9999
+
+# We want MySQL 5.5, do we?
+=dev-db/mariadb-5.5*
+=dev-db/mysql-5.5*
+=virtual/mysql-5.5*
+
+# Unmask for us:
+# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (11 May 2012)
+# Nouveau API break, mask until situation becomes palatable for users
+# xf86-video-ati-6.14.5 needs new libdrm
+<x11-drivers/xf86-video-ati-9999
+<x11-drivers/xf86-video-nouveau-9999
+<x11-libs/libdrm-9999
+
+# Unmask for us:
+media-video/avidemux:2
+media-gfx/blender:0
+media-gfx/yafaray:0
+
+# Unmask for us:
+<dev-embedded/openocd-9999
+
+# >=qemu-1.2.0 has been masked on x86 due to futile reasons
+<app-emulation/qemu-9999
+
+# Yeah Yeah, security...
+<app-text/cuneiform-9999:0
+
+# GNOME 3.10/3.12 related unmasks
+# required by gnome-base/gnome-settings-daemon-3.10.1::gnome-next
+# required by gnome-base/gnome-core-apps-3.10.1::gnome-next
+# required by gnome-base/gnome-3.10.1::gnome-next
+# required by gnome-base/gnome (argument)
+# /usr/portage/profiles/package.mask:
+# Alexandre Rostovtsev <tetromino@gentoo.org> (04 Aug 2013)
+# API break, reverse dependencies need patching; bug #479458.
+=sci-geosciences/geocode-glib-3.10.0
+# required by dev-libs/totem-pl-parser-3.10.0::gnome-next[quvi]
+# required by media-video/totem-3.10.1::gnome-next
+# required by gnome-base/gnome-core-apps-3.10.1::gnome-next
+# required by gnome-base/gnome-3.10.1::gnome-next
+# required by gnome-base/gnome (argument)
+# /usr/portage/profiles/package.mask:
+# Tim Harder <radhermit@gentoo.org> (22 May 2013)
+# masked for testing
+=media-libs/libquvi-0.9.3
+=media-libs/quvi-0.9.4
+# required by app-crypt/seahorse-3.10.1::gnome-next
+# required by gnome-base/gnome-core-apps-3.10.1::gnome-next
+# required by gnome-base/gnome-3.10.1::gnome-next
+# required by gnome-base/gnome (argument)
+# /usr/portage/profiles/package.mask:
+# Alexandre Rostovtsev <tetromino@gentoo.org> (02 Sep 2013)
+# Silent API/ABI change; mask until seahorse is patched; bug #483414
+=app-crypt/libsecret-0.16
+# required by media-libs/libquvi-0.9.3
+# required by dev-libs/totem-pl-parser-3.10.0::gnome-next[quvi]
+# required by media-video/totem-3.10.1::gnome-next
+# required by gnome-base/gnome-core-apps-3.10.1::gnome-next
+# required by gnome-base/gnome-3.10.1::gnome-next
+# required by gnome-base/gnome (argument)
+# /usr/portage/profiles/package.mask:
+# Tim Harder <radhermit@gentoo.org> (22 May 2013)
+# masked for testing
+=media-libs/libquvi-scripts-0.9.20131104
+
+# Gilles Dartiguelongue <eva@gentoo.org> (27 Apr 2014)
+# Gnome 3.12 mask. Also requires:
+#  * >=upower-0.99
+>=app-accessibility/accerciser-3.12.0
+>=app-accessibility/at-spi2-atk-2.12.1
+>=app-accessibility/at-spi2-core-2.12.0
+>=app-accessibility/orca-3.12.1
+>=app-arch/file-roller-3.12.1
+>=app-cdr/brasero-3.11.3
+>=app-crypt/gcr-3.12.0
+>=app-crypt/libsecret-0.18
+>=app-crypt/seahorse-3.12.0
+>=app-editors/gedit-3.12.1
+>=app-editors/gedit-plugins-3.12.1
+>=app-misc/bijiben-3.12.0
+>=app-misc/geoclue-2.1.8
+>=app-misc/gnote-3.12.0
+>=app-misc/tracker-1.0.0
+>=app-text/evince-3.12.1
+>=app-text/yelp-tools-3.12.1
+>=dev-cpp/glibmm-2.40.0
+>=dev-cpp/gtkmm-3.12.0
+# don't want -r1 because of emul-linux-x86 crap
+=dev-libs/atk-2.12.0
+>=dev-libs/folks-0.9.6-r1
+>=dev-libs/gdl-3.12.0
+>=dev-libs/gjs-1.40.1
+>=dev-libs/glib-2.40.0
+>=dev-libs/gobject-introspection-1.40.0
+>=dev-libs/gobject-introspection-common-1.40.0
+>=dev-libs/json-glib-1.0.0
+>=dev-libs/libgee-0.14.0
+>=dev-libs/libgweather-3.12.1
+>=dev-libs/libpeas-1.10.0
+>=dev-python/pyatspi-2.12.0
+>=dev-python/pygobject-3.12.1
+>=dev-util/anjuta-3.12.0
+>=dev-util/devhelp-3.12.1
+>=dev-util/gdbus-codegen-2.40.0
+>=dev-util/glade-3.18.2
+>=dev-util/gnome-devel-docs-3.12.1
+>=games-arcade/gnome-nibbles-3.12.1
+>=games-arcade/gnome-robots-3.12.1
+>=games-board/four-in-a-row-3.12.1
+>=games-board/gnome-chess-3.12.1
+>=games-board/gnome-mahjongg-3.12.1
+>=games-board/gnome-mines-3.12.1
+>=games-board/iagno-3.12.1
+>=games-board/tali-3.12.1
+>=games-puzzle/five-or-more-3.12.1
+>=games-puzzle/gnome-klotski-3.12.1
+>=games-puzzle/gnome-sudoku-3.12.1
+>=games-puzzle/gnome-tetravex-3.12.1
+>=games-puzzle/lightsoff-3.12.1
+>=games-puzzle/quadrapassel-3.12.1
+>=games-puzzle/swell-foop-3.12.1
+>=gnome-base/dconf-0.20.0
+>=gnome-base/gdm-3.12.1
+>=gnome-base/gnome-3.12.0
+>=gnome-base/gnome-common-3.12.0
+>=gnome-base/gnome-control-center-3.12.1
+>=gnome-base/gnome-core-apps-3.12.0
+>=gnome-base/gnome-core-libs-3.12.0
+>=gnome-base/gnome-desktop-3.12.1
+>=gnome-base/gnome-extra-apps-3.12.0
+>=gnome-base/gnome-keyring-3.12.0
+>=gnome-base/gnome-session-3.12.1
+>=gnome-base/gnome-settings-daemon-3.12.1
+>=gnome-base/gnome-shell-3.12.1
+>=gnome-base/gsettings-desktop-schemas-3.12.0
+>=gnome-base/gvfs-1.20.1
+>=gnome-base/libgnome-keyring-3.12.0
+>=gnome-base/nautilus-3.12.0
+>=gnome-extra/at-spi-2.12.0
+>=gnome-extra/evolution-data-server-3.12.1
+>=gnome-extra/evolution-ews-3.12.1
+>=gnome-extra/gnome-boxes-3.12.1
+>=gnome-extra/gnome-calculator-3.12.1
+>=gnome-extra/gnome-clocks-3.12.0
+>=gnome-extra/gnome-color-manager-3.12.1
+>=gnome-extra/gnome-contacts-3.12.0
+>=gnome-extra/gnome-documents-3.12.0
+>=gnome-extra/gnome-packagekit-3.12.1
+>=gnome-extra/gnome-power-manager-3.12.0
+>=gnome-extra/gnome-shell-extensions-3.12.0
+>=gnome-extra/gnome-system-monitor-3.12.1
+>=gnome-extra/gnome-tweak-tool-3.12.0
+>=gnome-extra/gnome-user-docs-3.12.1
+>=gnome-extra/gnome-weather-3.12.0
+>=gnome-extra/gtkhtml-4.8.0
+>=gnome-extra/gucharmap-3.12.0
+>=gnome-extra/mousetweaks-3.12.0
+>=gnome-extra/nautilus-tracker-tags-1.0.0
+>=gnome-extra/nm-applet-0.9.8.10
+>=gnome-extra/sushi-3.12.0
+>=gnome-extra/yelp-3.12.0
+>=gnome-extra/yelp-xsl-3.12.0
+>=mail-client/evolution-3.12.1
+>=media-gfx/eog-3.12.1
+>=media-gfx/eog-plugins-3.12.1
+>=media-gfx/gnome-font-viewer-3.12.0
+>=media-gfx/gnome-photos-3.12.1
+>=media-gfx/gnome-screenshot-3.12.0
+>=media-libs/clutter-1.18.2
+>=media-libs/cogl-1.18.0
+>=media-libs/libmediaart-0.4.0
+>=media-plugins/grilo-plugins-0.2.12
+>=media-sound/gnome-music-3.12.1
+>=media-sound/gnome-sound-recorder-3.12.1
+>=media-sound/sound-juicer-3.11.90
+>=media-video/cheese-3.12.1
+>=media-video/totem-3.12.0
+>=net-im/empathy-3.12.1
+>=net-im/telepathy-mission-control-5.16.1
+>=net-libs/glib-networking-2.40.1
+>=net-libs/gnome-online-accounts-3.12.0
+>=net-libs/libgfbgraph-0.2.2
+>=net-libs/libsoup-2.46.0
+>=net-libs/libsoup-gnome-2.46.0
+>=net-libs/rest-0.7.91
+>=net-libs/webkit-gtk-2.4.1
+>=net-misc/gnome-online-miners-3.12.0
+>=net-misc/networkmanager-0.9.8.10
+>=net-misc/vinagre-3.12.1
+>=net-misc/vino-3.12.0
+>=net-wireless/gnome-bluetooth-3.12.0
+>=sci-geosciences/geocode-glib-3.12.0
+>=sci-geosciences/gnome-maps-3.12.1
+>=sys-apps/baobab-3.12.1
+>=sys-apps/gnome-disk-utility-3.12.1
+>=sys-libs/libosinfo-0.2.10
+>=www-client/epiphany-3.12.0
+>=x11-libs/gnome-pty-helper-0.36.0
+>=x11-libs/gtk+-3.12.1
+>=x11-libs/gtksourceview-3.12.1
+>=x11-libs/vte-0.36.0
+>=x11-terms/gnome-terminal-3.12.0
+>=x11-themes/gnome-backgrounds-3.12.1
+>=x11-themes/gnome-icon-theme-3.12.0
+>=x11-themes/gnome-icon-theme-extras-3.12.0
+>=x11-themes/gnome-icon-theme-symbolic-3.12.0
+>=x11-themes/gnome-themes-standard-3.12.0
+>=x11-wm/mutter-3.12.1
+# required by app-misc/tracker-0.16.4[iso]
+# required by gnome-base/nautilus-3.12.0::sabayon-distro
+# required by app-text/evince-3.12.1[nautilus]
+# required by gnome-extra/gnome-documents-3.12.0
+# required by gnome-documents (argument)
+# /usr/portage/profiles/package.mask:
+# Gilles Dartiguelongue <eva@gentoo.org> (27 Apr 2014)
+# Gnome 3.12 mask. Also requires:
+#  * >=upower-0.99
+=sys-libs/libosinfo-0.2*
+# required by app-misc/tracker-1.0.0
+# required by gnome-extra/gnome-documents-3.12.0
+# required by gnome-documents (argument)
+# /usr/portage/profiles/package.mask:
+# Gilles Dartiguelongue <eva@gentoo.org> (27 Apr 2014)
+# Gnome 3.12 mask. Also requires:
+#  * >=upower-0.99
+=media-libs/libmediaart-0.4*
+# required by net-misc/gnome-online-miners-3.10.3
+# required by gnome-extra/gnome-documents-3.12.0
+# required by gnome-documents (argument)
+# /usr/portage/profiles/package.mask:
+# Gilles Dartiguelongue <eva@gentoo.org> (27 Apr 2014)
+# Gnome 3.12 mask. Also requires:
+#  * >=upower-0.99
+=app-misc/tracker-1.0*
+
+# required by gnome-base/nautilus-3.12.0::sabayon-distro[tracker]
+# required by nautilus (argument)
+# /usr/portage/profiles/package.mask:
+# Gilles Dartiguelongue <eva@gentoo.org> (27 Apr 2014)
+# Gnome 3.12 mask. Also requires:
+#  * >=upower-0.99
+=gnome-extra/nautilus-tracker-tags-1.0*
+# required by net-misc/gnome-online-miners-3.12.0
+# required by gnome-extra/gnome-documents-3.12.0
+# required by gnome-documents (argument)
+# /usr/portage/profiles/package.mask:
+# Gilles Dartiguelongue <eva@gentoo.org> (27 Apr 2014)
+# Gnome 3.12 mask. Also requires:
+#  * >=upower-0.99
+=net-libs/libgfbgraph-0.2*
+
+# True multilib aware openal, want!
+=media-libs/openal-1.15.1-r1
+
+# Michał Górny <mgorny@gentoo.org> (28 Feb 2014)
+# New multilib conversions for testing, grouped with corresponding
+# emul-linux bumps. Please unmask in order, after getting ACK from
+# package maintainer.
+#
+# Note: yngwin explicitly requested 30 days + 1 version bump for cairo.
+>=dev-libs/libgcrypt-1.6.1-r1
+dev-libs/libgcrypt:11
+>=dev-libs/lzo-2.06-r1
+>=app-emulation/emul-linux-x86-baselibs-20131008-r20
+>=x11-libs/cairo-1.12.16-r1
+>=app-emulation/emul-linux-x86-gtklibs-20131008-r2
+>=x11-libs/gdk-pixbuf-2.30.5-r1
+>=app-emulation/emul-linux-x86-gtklibs-20131008-r3
+>=media-gfx/graphite2-1.2.4-r1
+>=media-libs/harfbuzz-0.9.26-r1
+>=x11-libs/pango-1.36.2-r1
+>=app-emulation/emul-linux-x86-gtklibs-20131008-r4
+=dev-libs/libxslt-1.1.28-r2
+=sys-libs/slang-2.2.4-r1
+=media-libs/giflib-4.2.3-r1
+=media-libs/libart_lgpl-2.3.21-r2
+=net-libs/libtirpc-0.2.4-r2
+=sys-libs/cracklib-2.9.1-r1
+=sys-libs/pam-1.1.8-r2
+=sys-devel/flex-2.5.39-r1
+=net-libs/neon-0.30.0-r1
+=dev-libs/nspr-4.10.6-r1
+=net-misc/curl-7.37.0-r1
+
+# We want LXC 1.0.x
+=app-emulation/lxc-1.0*
--- a/conf/intel/portage/package.use/00-sabayon.package.use
+++ b/conf/intel/portage/package.use/00-sabayon.package.use
--- a/conf/intel/portage/profile/package.provided
+++ b/conf/intel/portage/profile/package.provided
@@ -1,4 +0,0 @@
-x11-plugins/compiz-plugins-main-0.8.6-r1
-x11-plugins/compiz-plugins-unsupported-0.8.8
-x11-plugins/compiz-plugins-extra-0.8.8
-x11-wm/compiz-fusion-0.8.8
--- a/conf/intel/portage/profile/package.use.mask
+++ b/conf/intel/portage/profile/package.use.mask
@@ -1 +0,0 @@
-kde-base/solid -networkmanager
--- a/conf/intel/portage/profile/package.use.mask/00-sabayon.mask
+++ b/conf/intel/portage/profile/package.use.mask/00-sabayon.mask
@@ -0,0 +1,16 @@
+kde-base/solid -networkmanager
+
+# media-gfx/blender wants Python 3.3
+# need to unmask its use flag
+media-gfx/blender -python_single_target_python3_3 -python_targets_python3_3
+
+# http://bugs.sabayon.org/show_bug.cgi?id=4115
+media-sound/audacity -ffmpeg
+
+# USE=systemd unmasking, no need to keep them masked
+sys-auth/polkit -systemd
+sys-power/upower -systemd
+sys-fs/udisks -systemd
+
+# We use a builtin module for sys-fs/zfs
+sys-fs/zfs -kernel-builtin
--- a/conf/intel/portage/profile/use.mask
+++ b/conf/intel/portage/profile/use.mask
@@ -3,3 +3,15 @@

 # Unmask USE=hardened globally
 -hardened
+
+# Unmask Python 3.3 stuff
+-python_targets_python3_3
+
+# Unmask systemd for everything
+-systemd
+
+# packagekit is ready for primetime in Sabayon
+-packagekit
+
+# We want true multilib abi
+-abi_x86_32
--- a/conf/intel/repo/sabayon-hell/packages.db.critical
+++ b/conf/intel/repo/sabayon-hell/packages.db.critical
@@ -1,3 +1,4 @@
-sys-devel/base-gcc:4.6
->=sys-apps/portage-2.2_alpha13
->sys-libs/glibc-2.14.9999
+sys-devel/base-gcc:4.8
+>=sys-apps/portage-2.2.0_alpha142
+>sys-libs/glibc-2.16.9999
+>=sys-apps/entropy-205
--- a/conf/intel/repo/sabayon-hell/packages.db.keywords
+++ b/conf/intel/repo/sabayon-hell/packages.db.keywords
@@ -0,0 +1,7 @@
+sys-apps/portage ~x86 ~amd64
+dev-lang/python:3.3 ~x86 ~amd64
+
+# GNOME 3.12 mask
+>=sys-power/upower-0.99.0 ~x86 ~amd64
+# Allow systemd and upower 0.99 friendly version
+=xfce-extra/xfce4-power-manager-1.2.0_p20140527 ~amd64 ~x86 amd64 x86
--- a/conf/intel/repo/sabayon-hell/packages.db.lic_whitelist
+++ b/conf/intel/repo/sabayon-hell/packages.db.lic_whitelist
@@ -0,0 +1,770 @@
+3DFX
+3proxy
+3ware
+4F
+7plus
+9wm
+ACME
+ACML
+aczoom
+Adaptec
+adobe-ps
+AdobePS
+Adobe-SourceCode
+AECA
+aewm
+AFL-2.0
+AFL-2.1
+AFL-3.0
+AFTERSTEP
+AICCU
+Aladdin
+Allegro
+amiwm
+AMPAS
+AMS
+ANTL
+Apache-1.1
+Apache-2.0
+APL-1.0
+appres
+APSL-2
+aquafont
+arj
+Arphic
+Artistic
+Artistic-2
+as-is
+astrolog
+astromenace
+ATOK
+AURA
+BAEKMUK
+bass
+BCS
+bdftopcf
+BEER-WARE
+beforelight
+bigresproto
+bioapi
+bitmap
+BitstreamVera
+BitTorrent
+blackshades
+Blitz-Artistic
+bonnie
+Boost-1.0
+BSD
+BSD-2
+BSD-4
+BSD-4
+bungie-marathon
+BWidget
+BZIP2
+C3
+cadsoft
+Caldera
+canada-med
+CAOSL
+ccp4
+CCPL-Attribution-2.0
+CCPL-Attribution-3.0
+CCPL-Attribution-NoDerivs-2.5
+CCPL-Attribution-NonCommercial-NoDerivs-2.0
+CCPL-Attribution-NonCommercial-NoDerivs-2.5
+CCPL-Attribution-ShareAlike-2.0
+CCPL-Attribution-ShareAlike-2.5
+CCPL-Attribution-ShareAlike-3.0
+CCPL-Attribution-ShareAlike-NonCommercial-2.5
+CCPL-ShareAlike-1.0
+CDDL
+CDDL-Schily
+cdegroot
+CDF
+CeCILL-2
+Cenon
+CGL
+charm
+chasen
+circlemud
+cisco-vpn-client
+Clarified-Artistic
+clustalw
+CMake
+CMASS-M3
+cmigemo
+CNRI
+CNRI-QUIXOTE-2.4
+codehaus-classworlds
+codehaus-groovy
+colt
+compositeproto
+Conexant
+cos
+CPL-0.5
+CPL-1.0
+CRACKLIB
+crafty
+crazney
+cryptopp
+CS-1.0
+CyberNeko-1.0
+damageproto
+DB
+dbgphp
+DCC
+DEC-M3
+DES
+dgen-sdl
+dlj-1.1
+dmxproto
+dom4j
+DSL
+DSNIFF
+DUMB-0.9.2
+dvibook
+EAPL
+ECWPL
+EDB
+editres
+eGenixPublic
+eGenixPublic-1.1
+ElementTree
+Elm
+Emacs
+encodings
+EPL
+EPL-1.0
+EPSON
+eternal_lands
+evieext
+Exolab
+FastCGI
+FDL-1.1
+FDL-1.2
+FDL-1.3+
+FESTIVAL
+FIPL-1.0
+fixesproto
+FLEX
+FLTK
+FML-1
+fmod
+folding-at-home
+font-adobe-100dpi
+font-adobe-75dpi
+font-adobe-utopia-100dpi
+font-adobe-utopia-75dpi
+font-adobe-utopia-type1
+font-alias
+font-arabic-misc
+font-bh-100dpi
+font-bh-75dpi
+font-bh-lucidatypewriter-100dpi
+font-bh-lucidatypewriter-75dpi
+font-bh-ttf
+font-bh-type1
+font-bitstream-100dpi
+font-bitstream-75dpi
+font-bitstream-speedo
+font-bitstream-type1
+fontcacheproto
+fontconfig
+font-cronyx-cyrillic
+font-cursor-misc
+font-daewoo-misc
+font-dec-misc
+font-ibm-type1
+font-isas-misc
+font-jis-misc
+font-micro-misc
+font-misc-cyrillic
+font-misc-ethiopic
+font-misc-meltho
+font-misc-misc
+font-mutt-misc
+font-schumacher-misc
+font-screen-cyrillic
+font-sony-misc
+fontsproto
+font-sun-misc
+fonttosfnt
+font-util
+font-winitzki-cyrillic
+font-xfree86-type1
+fping
+FreeArt
+freedist
+freemarker
+freetts
+Frodo
+fslsfonts
+fstobdf
+FTL
+FVWM
+galaxyhack
+GAlib
+gamess
+gccmakedep
+gcc-runtime-library-exception-3.1
+GDLS
+gips_iLBClicense.pdf
+glest-data
+glimpse
+glproto
+glut
+GLX
+GMGPL
+gnuplot
+GPL-1
+GPL-2
+GPL-2+
+GPL-2-with-exceptions
+GPL-2-with-linking-exception
+GPL-2-with-MySQL-FLOSS-exception
+GPL-3
+GPL-3+
+grass-ipafonts
+guild
+HPL
+HYDRA
+hylafax
+hyperic
+HyperSpec
+iASL
+IBM
+IBM-J1.4
+IBM-J1.5
+ICE
+iceauth
+ico
+icu
+IDPL
+imagemagick
+imake
+immon-sflow
+Indir
+Inform
+Info-ZIP
+inputproto
+Interbase-1.0
+ipadic
+IPL-1
+IRPDL
+ISC
+isc-dhcp
+ITS4
+JamesClark
+jardinains
+JasPer
+jaxen
+jcraft
+jdepend
+JDOM
+jlex
+JNIC
+JPython
+jrockit
+kbproto
+KenMacLeod
+Kermit
+knights-demo
+kvirc
+lam-mpi
+LDP
+LDP-1a
+less
+levee
+LFS
+LGPL-2
+LGPL-2+
+LGPL-2.1
+LGPL-2.1+
+LGPL-2.1-linking-exception
+LGPL-2.1-UUST
+LGPL-3
+LGPL-3+
+lha
+libdmx
+libdomainkeys-1.1
+libdrm
+libf2c
+libffi
+libfontenc
+libFS
+libgcc
+LIBGLOSS
+libICE
+liblbxutil
+liboldX
+libSM
+libstdc++
+libX11
+libXau
+libXaw
+libXcomposite
+libXcursor
+libXdamage
+libXdmcp
+libXevie
+libXext
+libXfixes
+libXfont
+libXfontcache
+libXft
+libXi
+libXinerama
+libxkbfile
+libxkbui
+libXmu
+libXp
+libXpm
+libXprintAppUtil
+libXprintUtil
+libxproxy
+libXrandr
+libXrender
+libXres
+libXScrnSaver
+libXt
+libXTrap
+libXtst
+libXv
+libXvMC
+libXxf86dga
+libXxf86misc
+libXxf86vm
+LICENSE-BITSTREAM
+lisp2wish
+listres
+LLGPL-2.1
+LOKI-EULA
+LPPL-1.2
+LPPL-1.3
+LPPL-1.3b
+LPPL-1.3c
+lsof
+luit
+maestro
+MagickWand
+makedepend
+MakeIndex
+mapm
+marginalhacks
+mayadoc-5.0
+MBROLA
+mekanix
+meme
+Memonix
+metapackage
+MILO
+mindterm
+Mini-XML
+MIT
+mkfontdir
+mkfontscale
+mmix
+molmol
+molscript
+MonetDBPL-1.1
+mongrel
+mopac7
+Moria
+MOTIF
+Mozart
+MPEG4
+MPL-1.0
+MPL-1.1
+mplus-fonts
+mserv
+MSF-1.2
+Ms-PL
+mx4j
+myspell-en_CA-JRossBeresford
+myspell-en_CA-KevinAtkinson
+myspell-et_EE-IEL
+myspell-hyph_sk_SK-TiborBako
+myspell-ispell-GeoffKuenning
+myspell-lt_LT-AlbertasAgejevas
+myspell-ru_RU-ALexanderLebedev
+myspell-th_cs_CZ-PavelRychlySmrz
+namd
+NCSA-HDF
+nemerle
+nethack
+netlogo
+netperf
+NewArtisans
+NEWLIB
+newton
+nhc98
+No-Problem-Bugroff
+Norvig
+NPL-1.1
+oclock
+OFL
+OFL-1.1
+OGL-1.0a
+OGTSL
+openafs-krb5
+openafs-krb5-a
+openknights
+OPENLDAP
+openmarket
+openpbs
+OpenSoftware
+openspml
+openssl
+OpenSymphony-1.1
+OPERA-9
+OPL
+OracleDB
+OSI-Approved
+OSIRIS
+OSL-1.1
+OSL-2.0
+OTN
+otter
+Palm-SDK
+PAM
+Parallels
+paraview
+PathfinderPL-1.1
+PBZIP2
+PDB
+PDFLite
+PEL
+penguzzle
+perforce
+petrify
+pgasync
+PHP
+PHP-2.02
+PHP-3
+PHP-3.01
+phrack
+PICO
+PicoContainer
+pixman
+pkcrack
+PLAN9
+pmd
+POMPOM
+poster
+POSTGRESQL
+Princeton
+printproto
+proxymngr
+PSF-2
+PSF-2.2
+PSF-2.3
+PSF-2.4
+PSTT
+public-domain
+pymol
+pysqlite
+PYTHON
+qeradiant
+qlogic-fibre-channel-firmware
+qpage
+QPL
+QPL-1.0
+qpopper
+queen
+qwt
+randrproto
+RDist
+REALbasic
+recordproto
+renderproto
+Resounding
+resourceproto
+rgb
+RiceBSD
+richardson
+ringtonetools
+Roadrunner
+RSA-MD2
+RSA-MD4
+RSA-MD5
+RSA-PKCS11
+rstart
+Ruby
+ruby-debug
+satan
+saxpath
+scilab
+Scintilla
+scripts
+scrnsaverproto
+selfhtml
+Sendmail
+Sendmail-Open-Source
+sessreg
+setxkbmap
+SGI-B
+SGI-B-1.1
+SGMLUG
+showfont
+SIFT
+SIL-freeware
+singular
+sip
+SixXS
+Sleepycat
+Smart-Link
+smproxy
+SNNS-4.2
+SOPLA-2.3
+sparky
+Spice-1.1
+SPL
+Spread-1.0
+ssh
+sslwrap
+staden
+Stanford
+stardock-images
+stix
+Subversion
+Sudo
+sun-asis-javamake
+sun-bcla-j2ee
+sun-bcla-j2ee-deployment
+sun-bcla-j2me
+sun-bcla-jai
+sun-bcla-jimi
+sun-bcla-jmf
+sun-bcla-jmi
+sun-bcla-jms
+sun-bcla-jsapi
+sun-bcla-jsr101
+sun-bcla-jta
+sun-bcla-jvmstat
+sun-j2sl
+sun-j2sl-6
+sun-jrl
+sun-jsr67
+sun-jsr93
+sun-openlook
+sun-rpc
+SVFL
+tacc
+t-coffee
+tcp_wrappers_license
+TeX
+trac
+trapproto
+truecrypt-collective-1.0
+truecrypt-collective-1.3
+twm
+UCAR-Unidata
+unicode
+unRAR
+ut2003-demo
+util-macros
+ValveSDK
+ventrilo
+VGBA
+videoproto
+vienna-rna
+viewres
+VIGRA
+vim
+visual
+vlgothic
+Volano
+VOSTROM
+W3C
+W3C-document
+w3m
+WarpPipe
+WebMO
+Werken-1.1.1.1
+werken.xpath
+whitehead
+WordNet-1.6
+worldofpadman
+WTFPL-2
+wxWinFDL-3
+wxWinLL-3
+X11
+x11perf
+XAnim
+xauth
+xbacklight
+xbattle
+xbiff
+xbitmaps
+xboing
+xcalc
+XCIN
+xclipboard
+xcmiscproto
+xcmsdb
+xconsole
+xcursorgen
+xcursor-themes
+xdbedizzy
+Xdebug
+xditview
+xdm
+xdpyinfo
+xdriinfo
+xearth
+xedit
+XeTeX
+xev
+xextproto
+xeyes
+xf86bigfontproto
+xf86dga
+xf86dgaproto
+xf86driproto
+xf86-input-acecad
+xf86-input-aiptek
+xf86-input-calcomp
+xf86-input-citron
+xf86-input-digitaledge
+xf86-input-dmc
+xf86-input-dynapro
+xf86-input-elo2300
+xf86-input-elographics
+xf86-input-evdev
+xf86-input-fpit
+xf86-input-hyperpen
+xf86-input-jamstudio
+xf86-input-joystick
+xf86-input-keyboard
+xf86-input-magellan
+xf86-input-magictouch
+xf86-input-microtouch
+xf86-input-mouse
+xf86-input-mutouch
+xf86-input-palmax
+xf86-input-penmount
+xf86-input-spaceorb
+xf86-input-summa
+xf86-input-tek4957
+xf86-input-ur98
+xf86-input-vmmouse
+xf86-input-void
+xf86miscproto
+xf86rushproto
+xf86-video-amd
+xf86-video-apm
+xf86-video-ark
+xf86-video-ati
+xf86-video-chips
+xf86-video-cirrus
+xf86-video-cyrix
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-glint
+xf86-video-i128
+xf86-video-i740
+xf86-video-i810
+xf86-video-impact
+xf86-video-imstt
+xf86-video-mga
+xf86-video-neomagic
+xf86-video-newport
+xf86-video-nsc
+xf86-video-nv
+xf86-video-rendition
+xf86-video-s3
+xf86-video-s3virge
+xf86-video-savage
+xf86-video-siliconmotion
+xf86-video-sis
+xf86-video-sisusb
+xf86-video-sunbw2
+xf86-video-suncg14
+xf86-video-suncg3
+xf86-video-suncg6
+xf86-video-sunffb
+xf86-video-sunleo
+xf86-video-suntcx
+xf86-video-tdfx
+xf86-video-tga
+xf86-video-trident
+xf86-video-tseng
+xf86-video-v4l
+xf86-video-vermilion
+xf86-video-vesa
+xf86-video-vga
+xf86-video-via
+xf86-video-vmware
+xf86-video-voodoo
+xf86-video-xgi
+xf86vidmodeproto
+xfd
+xfindproxy
+xfontsel
+xfs
+xfsinfo
+xfwp
+xgamma
+xgc
+xhost
+Ximian-logos
+xineramaproto
+xinit
+xkbcomp
+xkbdata
+xkbevd
+xkbprint
+xkbutils
+xkill
+xload
+xlogo
+xlsatoms
+xlsclients
+xlsfonts
+xmag
+xmame
+xman
+xmessage
+xmh
+xmlformat
+xmodmap
+xmore
+xorg-cf-files
+xorg-docs
+xorg-server
+xorg-sgml-doctools
+xphelloworld
+xplsprinters
+xpr
+xprehashprinterlist
+xprop
+xproto
+xproxymanagementproto
+xrandr
+xrdb
+xref.lisp
+xrefresh
+xrx
+xset
+xsetmode
+xsetpointer
+xsetroot
+xshipwars
+xsm
+xstdcmap
+xtrans
+xtrap
+xvidtune
+xvinfo
+xwd
+xwininfo
+xwud
+YAZ
+ZBL
+ZendFramework-1.1
+zend-optimizer
+ZLIB
+zoo
+ZORK
+ZPL
+ZSH
--- a/conf/intel/repo/sabayon-hell/packages.db.system_mask
+++ b/conf/intel/repo/sabayon-hell/packages.db.system_mask
@@ -2,7 +2,7 @@ app-admin/equo
 app-misc/sabayon-version
 dev-db/sqlite
 sys-apps/entropy
-sys-devel/base-gcc:4.6
+sys-devel/base-gcc:4.8
 sys-libs/db:4.8
 virtual/cron   
 # virtual/linux-binary
--- a/conf/intel/repo/sabayon-limbo/packages.db.critical
+++ b/conf/intel/repo/sabayon-limbo/packages.db.critical
@@ -1,3 +1,4 @@
-sys-devel/base-gcc:4.6
->=sys-apps/portage-2.2_alpha13
->sys-libs/glibc-2.14.9999
+sys-devel/base-gcc:4.8
+>=sys-apps/portage-2.2.0_alpha142
+>sys-libs/glibc-2.16.9999
+>=sys-apps/entropy-205
--- a/conf/intel/repo/sabayon-limbo/packages.db.keywords
+++ b/conf/intel/repo/sabayon-limbo/packages.db.keywords
@@ -1,6 +1,7 @@
-media-sound/pulseaudio ~x86 ~amd64
 sys-apps/portage ~x86 ~amd64
+dev-lang/python:3.3 ~x86 ~amd64

-# GNOME 3.2 temp keywords
-gnome-extra/gnome-contacts ~x86 ~amd64
-net-libs/gnome-online-accounts ~x86 ~amd64
+# GNOME 3.12 mask
+>=sys-power/upower-0.99.0 ~x86 ~amd64
+# Allow systemd and upower 0.99 friendly version
+=xfce-extra/xfce4-power-manager-1.2.0_p20140527 ~amd64 ~x86 amd64 x86
--- a/conf/intel/repo/sabayon-limbo/packages.db.lic_whitelist
+++ b/conf/intel/repo/sabayon-limbo/packages.db.lic_whitelist
@@ -0,0 +1,770 @@
+3DFX
+3proxy
+3ware
+4F
+7plus
+9wm
+ACME
+ACML
+aczoom
+Adaptec
+adobe-ps
+AdobePS
+Adobe-SourceCode
+AECA
+aewm
+AFL-2.0
+AFL-2.1
+AFL-3.0
+AFTERSTEP
+AICCU
+Aladdin
+Allegro
+amiwm
+AMPAS
+AMS
+ANTL
+Apache-1.1
+Apache-2.0
+APL-1.0
+appres
+APSL-2
+aquafont
+arj
+Arphic
+Artistic
+Artistic-2
+as-is
+astrolog
+astromenace
+ATOK
+AURA
+BAEKMUK
+bass
+BCS
+bdftopcf
+BEER-WARE
+beforelight
+bigresproto
+bioapi
+bitmap
+BitstreamVera
+BitTorrent
+blackshades
+Blitz-Artistic
+bonnie
+Boost-1.0
+BSD
+BSD-2
+BSD-4
+BSD-4
+bungie-marathon
+BWidget
+BZIP2
+C3
+cadsoft
+Caldera
+canada-med
+CAOSL
+ccp4
+CCPL-Attribution-2.0
+CCPL-Attribution-3.0
+CCPL-Attribution-NoDerivs-2.5
+CCPL-Attribution-NonCommercial-NoDerivs-2.0
+CCPL-Attribution-NonCommercial-NoDerivs-2.5
+CCPL-Attribution-ShareAlike-2.0
+CCPL-Attribution-ShareAlike-2.5
+CCPL-Attribution-ShareAlike-3.0
+CCPL-Attribution-ShareAlike-NonCommercial-2.5
+CCPL-ShareAlike-1.0
+CDDL
+CDDL-Schily
+cdegroot
+CDF
+CeCILL-2
+Cenon
+CGL
+charm
+chasen
+circlemud
+cisco-vpn-client
+Clarified-Artistic
+clustalw
+CMake
+CMASS-M3
+cmigemo
+CNRI
+CNRI-QUIXOTE-2.4
+codehaus-classworlds
+codehaus-groovy
+colt
+compositeproto
+Conexant
+cos
+CPL-0.5
+CPL-1.0
+CRACKLIB
+crafty
+crazney
+cryptopp
+CS-1.0
+CyberNeko-1.0
+damageproto
+DB
+dbgphp
+DCC
+DEC-M3
+DES
+dgen-sdl
+dlj-1.1
+dmxproto
+dom4j
+DSL
+DSNIFF
+DUMB-0.9.2
+dvibook
+EAPL
+ECWPL
+EDB
+editres
+eGenixPublic
+eGenixPublic-1.1
+ElementTree
+Elm
+Emacs
+encodings
+EPL
+EPL-1.0
+EPSON
+eternal_lands
+evieext
+Exolab
+FastCGI
+FDL-1.1
+FDL-1.2
+FDL-1.3+
+FESTIVAL
+FIPL-1.0
+fixesproto
+FLEX
+FLTK
+FML-1
+fmod
+folding-at-home
+font-adobe-100dpi
+font-adobe-75dpi
+font-adobe-utopia-100dpi
+font-adobe-utopia-75dpi
+font-adobe-utopia-type1
+font-alias
+font-arabic-misc
+font-bh-100dpi
+font-bh-75dpi
+font-bh-lucidatypewriter-100dpi
+font-bh-lucidatypewriter-75dpi
+font-bh-ttf
+font-bh-type1
+font-bitstream-100dpi
+font-bitstream-75dpi
+font-bitstream-speedo
+font-bitstream-type1
+fontcacheproto
+fontconfig
+font-cronyx-cyrillic
+font-cursor-misc
+font-daewoo-misc
+font-dec-misc
+font-ibm-type1
+font-isas-misc
+font-jis-misc
+font-micro-misc
+font-misc-cyrillic
+font-misc-ethiopic
+font-misc-meltho
+font-misc-misc
+font-mutt-misc
+font-schumacher-misc
+font-screen-cyrillic
+font-sony-misc
+fontsproto
+font-sun-misc
+fonttosfnt
+font-util
+font-winitzki-cyrillic
+font-xfree86-type1
+fping
+FreeArt
+freedist
+freemarker
+freetts
+Frodo
+fslsfonts
+fstobdf
+FTL
+FVWM
+galaxyhack
+GAlib
+gamess
+gccmakedep
+gcc-runtime-library-exception-3.1
+GDLS
+gips_iLBClicense.pdf
+glest-data
+glimpse
+glproto
+glut
+GLX
+GMGPL
+gnuplot
+GPL-1
+GPL-2
+GPL-2+
+GPL-2-with-exceptions
+GPL-2-with-linking-exception
+GPL-2-with-MySQL-FLOSS-exception
+GPL-3
+GPL-3+
+grass-ipafonts
+guild
+HPL
+HYDRA
+hylafax
+hyperic
+HyperSpec
+iASL
+IBM
+IBM-J1.4
+IBM-J1.5
+ICE
+iceauth
+ico
+icu
+IDPL
+imagemagick
+imake
+immon-sflow
+Indir
+Inform
+Info-ZIP
+inputproto
+Interbase-1.0
+ipadic
+IPL-1
+IRPDL
+ISC
+isc-dhcp
+ITS4
+JamesClark
+jardinains
+JasPer
+jaxen
+jcraft
+jdepend
+JDOM
+jlex
+JNIC
+JPython
+jrockit
+kbproto
+KenMacLeod
+Kermit
+knights-demo
+kvirc
+lam-mpi
+LDP
+LDP-1a
+less
+levee
+LFS
+LGPL-2
+LGPL-2+
+LGPL-2.1
+LGPL-2.1+
+LGPL-2.1-linking-exception
+LGPL-2.1-UUST
+LGPL-3
+LGPL-3+
+lha
+libdmx
+libdomainkeys-1.1
+libdrm
+libf2c
+libffi
+libfontenc
+libFS
+libgcc
+LIBGLOSS
+libICE
+liblbxutil
+liboldX
+libSM
+libstdc++
+libX11
+libXau
+libXaw
+libXcomposite
+libXcursor
+libXdamage
+libXdmcp
+libXevie
+libXext
+libXfixes
+libXfont
+libXfontcache
+libXft
+libXi
+libXinerama
+libxkbfile
+libxkbui
+libXmu
+libXp
+libXpm
+libXprintAppUtil
+libXprintUtil
+libxproxy
+libXrandr
+libXrender
+libXres
+libXScrnSaver
+libXt
+libXTrap
+libXtst
+libXv
+libXvMC
+libXxf86dga
+libXxf86misc
+libXxf86vm
+LICENSE-BITSTREAM
+lisp2wish
+listres
+LLGPL-2.1
+LOKI-EULA
+LPPL-1.2
+LPPL-1.3
+LPPL-1.3b
+LPPL-1.3c
+lsof
+luit
+maestro
+MagickWand
+makedepend
+MakeIndex
+mapm
+marginalhacks
+mayadoc-5.0
+MBROLA
+mekanix
+meme
+Memonix
+metapackage
+MILO
+mindterm
+Mini-XML
+MIT
+mkfontdir
+mkfontscale
+mmix
+molmol
+molscript
+MonetDBPL-1.1
+mongrel
+mopac7
+Moria
+MOTIF
+Mozart
+MPEG4
+MPL-1.0
+MPL-1.1
+mplus-fonts
+mserv
+MSF-1.2
+Ms-PL
+mx4j
+myspell-en_CA-JRossBeresford
+myspell-en_CA-KevinAtkinson
+myspell-et_EE-IEL
+myspell-hyph_sk_SK-TiborBako
+myspell-ispell-GeoffKuenning
+myspell-lt_LT-AlbertasAgejevas
+myspell-ru_RU-ALexanderLebedev
+myspell-th_cs_CZ-PavelRychlySmrz
+namd
+NCSA-HDF
+nemerle
+nethack
+netlogo
+netperf
+NewArtisans
+NEWLIB
+newton
+nhc98
+No-Problem-Bugroff
+Norvig
+NPL-1.1
+oclock
+OFL
+OFL-1.1
+OGL-1.0a
+OGTSL
+openafs-krb5
+openafs-krb5-a
+openknights
+OPENLDAP
+openmarket
+openpbs
+OpenSoftware
+openspml
+openssl
+OpenSymphony-1.1
+OPERA-9
+OPL
+OracleDB
+OSI-Approved
+OSIRIS
+OSL-1.1
+OSL-2.0
+OTN
+otter
+Palm-SDK
+PAM
+Parallels
+paraview
+PathfinderPL-1.1
+PBZIP2
+PDB
+PDFLite
+PEL
+penguzzle
+perforce
+petrify
+pgasync
+PHP
+PHP-2.02
+PHP-3
+PHP-3.01
+phrack
+PICO
+PicoContainer
+pixman
+pkcrack
+PLAN9
+pmd
+POMPOM
+poster
+POSTGRESQL
+Princeton
+printproto
+proxymngr
+PSF-2
+PSF-2.2
+PSF-2.3
+PSF-2.4
+PSTT
+public-domain
+pymol
+pysqlite
+PYTHON
+qeradiant
+qlogic-fibre-channel-firmware
+qpage
+QPL
+QPL-1.0
+qpopper
+queen
+qwt
+randrproto
+RDist
+REALbasic
+recordproto
+renderproto
+Resounding
+resourceproto
+rgb
+RiceBSD
+richardson
+ringtonetools
+Roadrunner
+RSA-MD2
+RSA-MD4
+RSA-MD5
+RSA-PKCS11
+rstart
+Ruby
+ruby-debug
+satan
+saxpath
+scilab
+Scintilla
+scripts
+scrnsaverproto
+selfhtml
+Sendmail
+Sendmail-Open-Source
+sessreg
+setxkbmap
+SGI-B
+SGI-B-1.1
+SGMLUG
+showfont
+SIFT
+SIL-freeware
+singular
+sip
+SixXS
+Sleepycat
+Smart-Link
+smproxy
+SNNS-4.2
+SOPLA-2.3
+sparky
+Spice-1.1
+SPL
+Spread-1.0
+ssh
+sslwrap
+staden
+Stanford
+stardock-images
+stix
+Subversion
+Sudo
+sun-asis-javamake
+sun-bcla-j2ee
+sun-bcla-j2ee-deployment
+sun-bcla-j2me
+sun-bcla-jai
+sun-bcla-jimi
+sun-bcla-jmf
+sun-bcla-jmi
+sun-bcla-jms
+sun-bcla-jsapi
+sun-bcla-jsr101
+sun-bcla-jta
+sun-bcla-jvmstat
+sun-j2sl
+sun-j2sl-6
+sun-jrl
+sun-jsr67
+sun-jsr93
+sun-openlook
+sun-rpc
+SVFL
+tacc
+t-coffee
+tcp_wrappers_license
+TeX
+trac
+trapproto
+truecrypt-collective-1.0
+truecrypt-collective-1.3
+twm
+UCAR-Unidata
+unicode
+unRAR
+ut2003-demo
+util-macros
+ValveSDK
+ventrilo
+VGBA
+videoproto
+vienna-rna
+viewres
+VIGRA
+vim
+visual
+vlgothic
+Volano
+VOSTROM
+W3C
+W3C-document
+w3m
+WarpPipe
+WebMO
+Werken-1.1.1.1
+werken.xpath
+whitehead
+WordNet-1.6
+worldofpadman
+WTFPL-2
+wxWinFDL-3
+wxWinLL-3
+X11
+x11perf
+XAnim
+xauth
+xbacklight
+xbattle
+xbiff
+xbitmaps
+xboing
+xcalc
+XCIN
+xclipboard
+xcmiscproto
+xcmsdb
+xconsole
+xcursorgen
+xcursor-themes
+xdbedizzy
+Xdebug
+xditview
+xdm
+xdpyinfo
+xdriinfo
+xearth
+xedit
+XeTeX
+xev
+xextproto
+xeyes
+xf86bigfontproto
+xf86dga
+xf86dgaproto
+xf86driproto
+xf86-input-acecad
+xf86-input-aiptek
+xf86-input-calcomp
+xf86-input-citron
+xf86-input-digitaledge
+xf86-input-dmc
+xf86-input-dynapro
+xf86-input-elo2300
+xf86-input-elographics
+xf86-input-evdev
+xf86-input-fpit
+xf86-input-hyperpen
+xf86-input-jamstudio
+xf86-input-joystick
+xf86-input-keyboard
+xf86-input-magellan
+xf86-input-magictouch
+xf86-input-microtouch
+xf86-input-mouse
+xf86-input-mutouch
+xf86-input-palmax
+xf86-input-penmount
+xf86-input-spaceorb
+xf86-input-summa
+xf86-input-tek4957
+xf86-input-ur98
+xf86-input-vmmouse
+xf86-input-void
+xf86miscproto
+xf86rushproto
+xf86-video-amd
+xf86-video-apm
+xf86-video-ark
+xf86-video-ati
+xf86-video-chips
+xf86-video-cirrus
+xf86-video-cyrix
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-glint
+xf86-video-i128
+xf86-video-i740
+xf86-video-i810
+xf86-video-impact
+xf86-video-imstt
+xf86-video-mga
+xf86-video-neomagic
+xf86-video-newport
+xf86-video-nsc
+xf86-video-nv
+xf86-video-rendition
+xf86-video-s3
+xf86-video-s3virge
+xf86-video-savage
+xf86-video-siliconmotion
+xf86-video-sis
+xf86-video-sisusb
+xf86-video-sunbw2
+xf86-video-suncg14
+xf86-video-suncg3
+xf86-video-suncg6
+xf86-video-sunffb
+xf86-video-sunleo
+xf86-video-suntcx
+xf86-video-tdfx
+xf86-video-tga
+xf86-video-trident
+xf86-video-tseng
+xf86-video-v4l
+xf86-video-vermilion
+xf86-video-vesa
+xf86-video-vga
+xf86-video-via
+xf86-video-vmware
+xf86-video-voodoo
+xf86-video-xgi
+xf86vidmodeproto
+xfd
+xfindproxy
+xfontsel
+xfs
+xfsinfo
+xfwp
+xgamma
+xgc
+xhost
+Ximian-logos
+xineramaproto
+xinit
+xkbcomp
+xkbdata
+xkbevd
+xkbprint
+xkbutils
+xkill
+xload
+xlogo
+xlsatoms
+xlsclients
+xlsfonts
+xmag
+xmame
+xman
+xmessage
+xmh
+xmlformat
+xmodmap
+xmore
+xorg-cf-files
+xorg-docs
+xorg-server
+xorg-sgml-doctools
+xphelloworld
+xplsprinters
+xpr
+xprehashprinterlist
+xprop
+xproto
+xproxymanagementproto
+xrandr
+xrdb
+xref.lisp
+xrefresh
+xrx
+xset
+xsetmode
+xsetpointer
+xsetroot
+xshipwars
+xsm
+xstdcmap
+xtrans
+xtrap
+xvidtune
+xvinfo
+xwd
+xwininfo
+xwud
+YAZ
+ZBL
+ZendFramework-1.1
+zend-optimizer
+ZLIB
+zoo
+ZORK
+ZPL
+ZSH
--- a/conf/intel/repo/sabayon-limbo/packages.db.mirrors
+++ b/conf/intel/repo/sabayon-limbo/packages.db.mirrors
@@ -2,5 +2,7 @@
 http://dl.sabayon.org/entropy
 http://best.sabayon.org/entropy
 http://redir.sabayon.org/entropy
+# This will be used as last resort, and must stay here
+http://pkg.sabayon.org
 # this is in case our DNS goes down
 http://na.mirror.garr.it/mirrors/sabayonlinux/entropy
--- a/conf/intel/repo/sabayon-limbo/packages.db.system_mask
+++ b/conf/intel/repo/sabayon-limbo/packages.db.system_mask
@@ -2,7 +2,7 @@ app-admin/equo
 app-misc/sabayon-version
 dev-db/sqlite
 sys-apps/entropy
-sys-devel/base-gcc:4.6
+sys-devel/base-gcc:4.8
 sys-libs/db:4.8
 virtual/cron   
 # virtual/linux-binary
--- a/conf/intel/repo/sabayonlinux.org/packages.db.critical
+++ b/conf/intel/repo/sabayonlinux.org/packages.db.critical
@@ -1,3 +1,4 @@
-sys-devel/base-gcc:4.6
->=sys-apps/portage-2.2_alpha13
->sys-libs/glibc-2.14.9999
+sys-devel/base-gcc:4.8
+>=sys-apps/portage-2.2.0_alpha142
+>sys-libs/glibc-2.16.9999
+>=sys-apps/entropy-205
--- a/conf/intel/repo/sabayonlinux.org/packages.db.keywords
+++ b/conf/intel/repo/sabayonlinux.org/packages.db.keywords
@@ -1,7 +1,7 @@
-media-sound/pulseaudio ~x86 ~amd64
 sys-apps/portage ~x86 ~amd64
-media-plugins/gst-plugins-assrender ~x86 ~amd64
+dev-lang/python:3.3 ~x86 ~amd64

-# GNOME 3.2 temp keywords
-gnome-extra/gnome-contacts ~x86 ~amd64
-net-libs/gnome-online-accounts ~x86 ~amd64
+# GNOME 3.12 mask
+>=sys-power/upower-0.99.0 ~x86 ~amd64
+# Allow systemd and upower 0.99 friendly version
+=xfce-extra/xfce4-power-manager-1.2.0_p20140527 ~amd64 ~x86 amd64 x86
--- a/conf/intel/repo/sabayonlinux.org/packages.db.lic_whitelist
+++ b/conf/intel/repo/sabayonlinux.org/packages.db.lic_whitelist
@@ -142,6 +142,7 @@ Exolab
 FastCGI
 FDL-1.1
 FDL-1.2
+FDL-1.3+
 FESTIVAL
 FIPL-1.0
 fixesproto
@@ -217,10 +218,12 @@ GMGPL
 gnuplot
 GPL-1
 GPL-2
+GPL-2+
 GPL-2-with-exceptions
 GPL-2-with-linking-exception
 GPL-2-with-MySQL-FLOSS-exception
 GPL-3
+GPL-3+
 grass-ipafonts
 guild
 HPL
@@ -274,10 +277,13 @@ less
 levee
 LFS
 LGPL-2
+LGPL-2+
 LGPL-2.1
+LGPL-2.1+
 LGPL-2.1-linking-exception
 LGPL-2.1-UUST
 LGPL-3
+LGPL-3+
 lha
 libdmx
 libdomainkeys-1.1
@@ -350,6 +356,7 @@ MBROLA
 mekanix
 meme
 Memonix
+metapackage
 MILO
 mindterm
 Mini-XML
@@ -448,6 +455,7 @@ POSTGRESQL
 Princeton
 printproto
 proxymngr
+PSF-2
 PSF-2.2
 PSF-2.3
 PSF-2.4
@@ -551,6 +559,7 @@ truecrypt-collective-1.0
 truecrypt-collective-1.3
 twm
 UCAR-Unidata
+unicode
 unRAR
 ut2003-demo
 util-macros
--- a/conf/intel/repo/sabayonlinux.org/packages.db.mirrors
+++ b/conf/intel/repo/sabayonlinux.org/packages.db.mirrors
@@ -2,5 +2,7 @@
 http://dl.sabayon.org/entropy
 http://best.sabayon.org/entropy
 http://redir.sabayon.org/entropy
+# This will be used as last resort, and must stay here
+http://pkg.sabayon.org
 # this is in case our DNS goes down
 http://na.mirror.garr.it/mirrors/sabayonlinux/entropy
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`FEATURES="parallel-fetch protect-owned -debug -compressdebug -splitdebug -userpriv"`