Merge branch 'master' of git+ssh://git.sabayon.org/~git/projects/build

conf/armv7l/portage/make.conf.hardfp

@@ -1,4 +1,5 @@
-GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
+# 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} ${GRAPHITE}"
@@ -13,6 +14,7 @@ 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"
 

conf/armv7l/portage/make.conf.softfp

@@ -1,4 +1,5 @@
-GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
+# 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} ${GRAPHITE}"
@@ -13,6 +14,7 @@ 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"
 

conf/armv7l/repo/sabayonlinux.org/packages.db.keywords

@@ -89,12 +89,32 @@ media-video/gnome-video-effects ~arm
 app-admin/apg ~arm
 net-im/telepathy-connection-managers ~arm
 sys-apps/lsb-release ~arm
-<dev-libs/embryo-9999 ~arm
+gnome-base/gnome ~arm
-<dev-libs/eeze-9999 ~arm
+dev-libs/eeze ~arm
-<dev-libs/ecore-9999 ~arm
+net-libs/gnome-online-accounts ~arm
-<dev-libs/e_dbus-9999 ~arm
+gnome-base/gnome-core-apps ~arm
-<dev-libs/eina-9999 ~arm
+gnome-extra/gnome-tweak-tool ~arm
-<media-libs/edje-9999 ~arm
+gnome-extra/nm-applet ~arm
-<dev-libs/efreet-9999 ~arm
+dev-libs/efreet ~arm
-<media-libs/evas-9999 ~arm
+media-libs/evas ~arm
-<dev-libs/eet-9999 ~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

conf/intel/portage/make.conf.amd64

@@ -2,8 +2,9 @@
 # Please consult /etc/make.conf.example for a more detailed example
 
 # Compiler stuff
-GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
+# GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
-CFLAGS="-O2 -ftree-vectorize -march=x86-64 -pipe ${GRAPHITE}"
+# Temp disable Graphite and -ftree-vectorize due to x11-libs/qt-* instabilities
+CFLAGS="-O2 -march=x86-64 -pipe" # -ftree-vectorize ${GRAPHITE}"
 CHOST="x86_64-pc-linux-gnu"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
@@ -13,6 +14,7 @@ MAKEOPTS="-j16 -s"
 ACCEPT_KEYWORDS="~amd64"
 FEATURES="ccache parallel-fetch protect-owned splitdebug"
 CCACHE_SIZE="50G"
+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"
 

conf/intel/portage/make.conf.x86

@@ -2,8 +2,9 @@
 # Please consult /etc/make.conf.example for a more detailed example
 
 # Compiler stuff
-GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
+# GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
-CFLAGS="-O2 -ftree-vectorize -march=i686 -pipe ${GRAPHITE}"
+# Temp disable Graphite and -ftree-vectorize due to x11-libs/qt-* instabilities
+CFLAGS="-O2 -march=i686 -pipe" # -ftree-vectorize ${GRAPHITE}"
 CHOST="i686-pc-linux-gnu"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
@@ -13,6 +14,7 @@ MAKEOPTS="-j16 -s"
 FEATURES="ccache parallel-fetch protect-owned splitdebug"
 ACCEPT_KEYWORDS="~x86"
 CCACHE_SIZE="50G"
+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"
 

conf/intel/portage/package.license

@@ -34,6 +34,6 @@ games-action/heretic2-demo		LOKI-EULA
 net-im/skype				skype-eula 
 sci-electronics/eagle                   cadsoft
 sci-geosciences/googleearth             googleearth
-www-plugins/adobe-flash			AdobeFlash-10.1
+www-plugins/adobe-flash			AdobeFlash-10.3
 www-plugins/google-talkplugin           google-talkplugin
 dev-java/oracle-jdk-bin			Oracle-BCLA-JavaSE

conf/intel/portage/package.mask

@@ -5,16 +5,10 @@ app-i18n/anthy-ss
 app-i18n/atokx2
 app-vim/cvscommand
 app-vim/vcscommand
-app-shells/scsh
 sci-biology/mira
 media-fonts/acroread-asianfonts
 >dev-lang/erlang-13.2.4
 >=app-portage/portpeek-1.9.70
-sci-libs/hdf5
-
-# 2012-02-02 Joost Ruis: Current 3.5.x is RC not want yet
->app-office/libreoffice-3.4.5.2
->app-office/libreoffice-l10n-meta-3.4.5.2
 
 # Joost Ruis: Bumping this breaks Blender. Impossible to rebuild Blender unless Gentoo bug 384239 is fixed
 >media-libs/openjpeg-1.3-r3
@@ -238,14 +232,3 @@ gnustep-apps/terminal
 
 # 2012-02-15 Joost Ruis: Only use pymol from our overlay since it has depends on python-tk  
 sci-chemistry/pymol::gentoo
-
-# 2012-02-28 Migrating to versioned 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

conf/intel/portage/package.use

@@ -2,7 +2,7 @@
 
 app-accessibility/dasher gnome
 
-app-admin/conky audacious hddtemp imlib lua lua-imlib lua-cairo mpd thinkpad -ipv6
+app-admin/conky audacious hddtemp imlib iostats lua lua-imlib lua-cairo mpd thinkpad -ipv6
 
 app-arch/advancecomp mng
 app-arch/file-roller -nautilus
@@ -101,6 +101,7 @@ dev-libs/gdl gnome
 # 2010-04-6, trying to disable USE="mono" from gmime
 dev-libs/gmime -mono
 dev-libs/libmcs -kde
+dev-libs/pth static-libs
 dev-libs/soprano clucene redland -java
 dev-libs/xerces-c xqilla icu
 dev-libs/xmlrpc-c curl
@@ -133,6 +134,7 @@ virtual/mysql embedded
 dev-tcltk/tclxml expat
 
 dev-vcs/bzr bash-completion curl sftp
+dev-util/biew mmx sse
 dev-util/codeblocks contrib
 dev-util/eclipse-sdk java6
 dev-util/glade -gnome
@@ -170,6 +172,7 @@ gnome-extra/avant-window-navigator-extras gnome
 gnome-extra/evolution-data-server ldap kerberos
 gnome-extra/gnome-games -sudoku
 gnome-extra/libgsf gnome
+gnome-extra/zeitgeist-extensions fts
 
 kde-base/gwenview kipi semantic-desktop
 # move kde-base/kde-l10n-meta kde-base/kde-l10n
@@ -207,6 +210,7 @@ media-gfx/gimageview mng
 media-gfx/gimp aalib mng wmf smp
 media-gfx/gphoto2 aalib
 media-gfx/greycstoration fftw
+media-gfx/gthumb -cdr slideshow
 media-gfx/imagemagick fftw gs perl
 media-gfx/k3d 3ds
 media-gfx/kphotoalbum kipi
@@ -334,6 +338,9 @@ net-libs/libpcap -bluetooth
 net-mail/dbmail sqlite3
 net-mail/tpop3d mbox maildir
 
+# See bug 3118
+net-misc/dropbox librsync-bundled 
+
 net-misc/aria2 metalink bittorrent xmlrpc
 # bluetooth use flag is useless
 net-misc/networkmanager nss -dhclient modemmanager -bluetooth connection-sharing dhcpcd introspection -gnutls wimax
@@ -381,6 +388,9 @@ sci-libs/vtk tk mpi
 sci-mathematics/maxima latex
 sci-mathematics/octave fftw curl
 
+# We don't want rtai
+sci-misc/emc simulator
+
 sci-visualization/fityk gnuplot wxwindows
 sci-visualization/gnuplot gd wxwidgets
 sci-visualization/grace fftw
@@ -424,6 +434,7 @@ sys-libs/db -java
 
 virtual/opencl video_cards_nvidia
 
+www-apps/rt mysql
 www-apps/trac mysql postgres vhosts sqlite
 
 www-client/midori sqlite
@@ -550,7 +561,7 @@ app-cdr/brasero -css
 media-tv/mythtv -css
 
 # DO NOT FUCKING REMOVE THIS
-app-crypt/gnupg static
+app-crypt/gnupg static bzip2
 
 # Inflate lighttpd
 www-servers/lighttpd fastcgi lua memcache xattr
@@ -763,12 +774,12 @@ dev-util/geany-plugins enchant gtkspell
 kde-base/kdesdk-misc extras
 dev-java/antlr script
 app-misc/sphinx mysql
-x11-misc/shutter webphoto
+x11-misc/shutter drawing webphoto
 dev-games/physfs hog
 media-libs/svgalib -kernel-helper 
 app-misc/tuxcmd-modules gnome unrar
 media-sound/cmus mikmod
-sci-libs/hdf5 -mpi threads szip
+sci-libs/hdf5 -cxx -fortran -mpi threads szip
 virtual/mpi romio
 sys-cluster/openmpi romio
 media-libs/libpng apng
@@ -847,7 +858,7 @@ kde-base/kdepim-runtime -linguas_ar -linguas_ca -linguas_cs -linguas_da -linguas
 net-im/telepathy-connection-managers -icq -yahoo
 net-im/empathy gnome
 app-emulation/winetricks -gtk
-x11-misc/obconf lxde
+x11-misc/obconf -lxde
 media-plugins/gst-plugins-meta mms
 net-ftp/proftpd authfile
 dev-lang/parrot pcre
@@ -884,3 +895,6 @@ app-misc/recoll -fam inotify
 
 # dev-db/mongodb should use V8. Allows to fix bug 3069
 dev-db/mongodb v8
+
+# See bug 3138
+app-benchmarks/bootchart java

conf/intel/repo/sabayon-limbo/packages.db.mask

@@ -1,2 +1,7 @@
-# Notify OSD must die with GNOME3
+# Mask apache using MPM worker for now
-x11-misc/notify-osd
+www-servers/apache[threads]
+
+
+# 2012-02-29: mask Python 3, many packages are now
+# featuring dependencies like "dev-lang/python"
+>=dev-lang/python-3.0

conf/intel/repo/sabayon-limbo/packages.db.webservices

@@ -0,0 +1 @@
+https://packages.sabayon.org/service

conf/intel/repo/sabayonlinux.org/packages.db.mask

@@ -1,2 +1,7 @@
 # Mask apache using MPM worker for now
 www-servers/apache[threads]
+
+
+# 2012-02-29: mask Python 3, many packages are now
+# featuring dependencies like "dev-lang/python"
+>=dev-lang/python-3.0

conf/noarch/entropy/packages.server.dep_rewrite

@@ -43,6 +43,7 @@ dev-tex/pstplus (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
 app-text/kbibtex (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
 app-misc/recoll (.*)app-text/poppler(.*) \1app-text/poppler-base\2
 gnome-extra/gnome-commander (.*)app-text/poppler(.*) \1app-text/poppler-base\2
+dev-python/python-poppler-qt4 (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2
 
 # Fix enigmail deps, to point to our split pinentry packages
 x11-plugins/enigmail (.*)app-crypt/pinentry(.*)\[gtk\] \1app-crypt/pinentry-gtk2\2
@@ -146,6 +147,9 @@ kde-misc/quickaccess (.*)kde-base/kde-l10n(.*)
 kde-misc/steamcompanion (.*)kde-base/kde-l10n(.*)
 kde-misc/serverstatuswidget (.*)kde-base/kde-l10n(.*)
 media-sound/soundkonverter (.*)kde-base/kde-l10n(.*)
+sci-mathematics/rkward (.*)kde-base/kde-l10n(.*)
+media-gfx/kpovmodeler (.*)kde-base/kde-l10n(.*)
+dev-util/kdevelop-php (.*)kde-base/kde-l10n(.*)
 
 # net-dns/avahi dep rewrites
 app-crypt/seahorse (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2