Merge pull request #5 from V3n3RiX/master

stick to gentoo stable tree, keyword, mask and unmask only when needed, ...

5 files changed, 3 insertions, 838 deletions

diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64
index 9d11c79..d0d0ecd 100644
--- a/conf/intel/portage/make.conf.amd64
+++ b/conf/intel/portage/make.conf.amd64
@@ -11,7 +11,6 @@ LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 MAKEOPTS="-j16 -s"
 
 # Portage stuff
-ACCEPT_KEYWORDS="~amd64"
 FEATURES="parallel-fetch protect-owned compressdebug splitdebug"
 CCACHE_SIZE="2G"
 CCACHE_DIR="/var/ccache"
@@ -47,8 +46,6 @@ 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"
 # /lib/modules mask is useful for our internal tinderbox
 CONFIG_PROTECT_MASK="/etc/skel /lib/modules"
@@ -84,3 +81,4 @@ INSTALL_MASK="/etc/init.d
 	      /etc/conf.d
 	      /etc/runlevels"
 
+source /var/lib/layman/make.conf
diff --git a/conf/intel/portage/make.conf.x86 b/conf/intel/portage/make.conf.x86
index 701ffa5..33fd0fb 100644
--- a/conf/intel/portage/make.conf.x86
+++ b/conf/intel/portage/make.conf.x86
@@ -12,7 +12,6 @@ MAKEOPTS="-j16 -s"
 
 # Portage stuff
 FEATURES="parallel-fetch protect-owned compressdebug splitdebug"
-ACCEPT_KEYWORDS="~x86"
 CCACHE_SIZE="2G"
 CCACHE_DIR="/var/ccache"
 
@@ -51,8 +50,6 @@ 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"
 # /lib/modules mask is useful for our internal tinderbox
 CONFIG_PROTECT_MASK="/etc/skel /lib/modules"
@@ -83,3 +80,5 @@ DISTDIR="${PORTDIR}/distfiles"
 INSTALL_MASK="/etc/init.d
 	      /etc/conf.d
 	      /etc/runlevels"
+
+source /var/lib/layman/make.conf
diff --git a/conf/intel/portage/package.keywords/00-kogaion.package.keywords b/conf/intel/portage/package.keywords/00-kogaion.package.keywords
deleted file mode 100644
index d2bf279..0000000
--- a/conf/intel/portage/package.keywords/00-kogaion.package.keywords
+++ /dev/null
@@ -1,203 +0,0 @@
-# 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.rogentos.ro/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
-# and also multilib-minimal aware 1.2
-=media-libs/libpng-1.2.50-r1 ~amd64 ~x86
-# and also this support package
-=media-libs/libpng-1.5.17-r15 ~amd64 ~x86
-
-# force stable icu
-dev-libs/icu -~amd64 -~x86
-# Allow all icu-51 revisions due to ABI_X86 support
-=dev-libs/icu-51* ~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 Kogaion 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
-=media-video/libav-0.8* ~amd64 ~x86
-=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
-# but allow 2.5.0* which is fine
-=media-libs/freetype-2.5.0* ~amd64 ~x86 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
-
diff --git a/conf/intel/portage/package.mask/00-kogaion.package.mask b/conf/intel/portage/package.mask/00-kogaion.package.mask
deleted file mode 100644
index b30c735..0000000
--- a/conf/intel/portage/package.mask/00-kogaion.package.mask
+++ /dev/null
@@ -1,235 +0,0 @@
-# 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
-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: 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-06 Fabio Erculiani: not sure why this may be pulled in
-# but you know, gamerlay...
->=games-strategy/0ad-99999
-
-# 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 kogaion-desktop
-sys-apps/systemd::systemd-love
-sys-apps/systemd::gentoo
-
-# 2014-03-31 Fabio Erculiani: causes build errors of reverse deps
->=dev-lang/parrot-6.2
-
-# 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-01 Fabio Erculiani: broken reverse deps
-=razorqt-base/libqtxdg-0.5.3
-
-# 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-15 Joost Ruis: Temp. mask the new stable perl
->dev-lang/perl-5.16.3
-
-# 2014-08-31 Sławomir Nizio: we cannot support it properly, bug 3776
-app-portage/g-octave
diff --git a/conf/intel/portage/package.unmask/00-kogaion.package.unmask b/conf/intel/portage/package.unmask/00-kogaion.package.unmask
deleted file mode 100644
index 81d8862..0000000
--- a/conf/intel/portage/package.unmask/00-kogaion.package.unmask
+++ /dev/null
@@ -1,394 +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::kogaion-desktop
-
-# Needed for the >=games-action/teeworlds-0.6.1
->=dev-util/bam-0.4.0
-
-# Our version is fine
-media-video/nvidia-settings::kogaion-desktop
-
-# 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
-
-# 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
-
-# Unmask true multilib aware libav ebuild
-=media-video/libav-0.8.9-r1
-=media-video/libav-9.10*
-
-# 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-light-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::kogaion-desktop
-# 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::kogaion-desktop[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
-
-# MATE 1.8 is like zomg want
-<app-admin/mate-system-tools-1.9::mate-overlay
-<app-arch/engrampa-1.9::mate-overlay
-<app-arch/mate-file-archiver-1.9::mate-overlay
-<app-editors/mate-text-editor-1.9::mate-overlay
-<app-editors/pluma-1.9::mate-overlay
-<app-text/atril-1.9::mate-overlay
-<app-text/mate-doc-utils-1.9::mate-overlay
-<app-text/mate-document-viewer-1.9::mate-overlay
-<dev-libs/libmateweather-1.9::mate-overlay
-<dev-python/python-caja-1.9::mate-overlay
-<mate-base/caja-1.9::mate-overlay
-<mate-base/libmatekbd-1.9::mate-overlay
-<mate-base/libmatekeyring-1.9::mate-overlay
-<mate-base/mate-1.9::mate-overlay
-<mate-base/mate-applets-1.9::mate-overlay
-<mate-base/mate-common-1.9::mate-overlay
-<mate-base/mate-control-center-1.9::mate-overlay
-<mate-base/mate-desktop-1.9::mate-overlay
-<mate-base/mate-file-manager-1.9::mate-overlay
-<mate-base/mate-keyring-1.9::mate-overlay
-<mate-base/mate-menus-1.9::mate-overlay
-<mate-base/mate-panel-1.9::mate-overlay
-<mate-base/mate-session-manager-1.9::mate-overlay
-<mate-base/mate-settings-daemon-1.9::mate-overlay
-mate-extra/caja-dropbox::mate-overlay
-<mate-extra/mate-calc-1.9::mate-overlay
-<mate-extra/mate-character-map-1.9::mate-overlay
-<mate-extra/mate-dialogs-1.9::mate-overlay
-<mate-extra/mate-file-manager-image-converter-1.9::mate-overlay
-<mate-extra/mate-file-manager-open-terminal-1.9::mate-overlay
-<mate-extra/mate-file-manager-sendto-1.9::mate-overlay
-<mate-extra/mate-file-manager-share-1.9::mate-overlay
-<mate-extra/mate-media-1.9::mate-overlay
-<mate-extra/mate-polkit-1.9::mate-overlay
-<mate-extra/mate-power-manager-1.9::mate-overlay
-<mate-extra/mate-screensaver-1.9::mate-overlay
-<mate-extra/mate-sensors-applet-1.9::mate-overlay
-<mate-extra/mate-system-monitor-1.9::mate-overlay
-<mate-extra/mate-user-share-1.9::mate-overlay
-<mate-extra/mate-utils-1.9::mate-overlay
-<media-gfx/eom-1.9::mate-overlay
-<media-gfx/mate-image-viewer-1.9::mate-overlay
-<net-analyzer/mate-netspeed-1.9::mate-overlay
-<net-wireless/mate-bluetooth-1.9::mate-overlay
-virtual/notification-daemon::mate-overlay
-x11-apps/fusion-icon::mate-overlay
-<x11-libs/libmatewnck-1.9::mate-overlay
-<x11-misc/mate-menu-editor-1.9::mate-overlay
-<x11-misc/mate-notification-daemon-1.9::mate-overlay
-<x11-misc/mozo-1.9::mate-overlay
-<x11-terms/mate-terminal-1.9::mate-overlay
-<x11-themes/mate-backgrounds-1.9::mate-overlay
-<x11-themes/mate-icon-theme-1.9::mate-overlay
-<x11-themes/mate-icon-theme-faenza-1.9::mate-overlay
-<x11-themes/mate-themes-1.9::mate-overlay
-<x11-wm/marco-1.9::mate-overlay
-<x11-wm/mate-window-manager-1.9::mate-overlay
-
-# We want LXC 1.0.x
-=app-emulation/lxc-1.0*