Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert 
<treeve AT sourcemage.org>:

 ChangeLog                                                                    
  |    7 
 FUNCTIONS                                                                    
  |   37 
 dev/null                                                                     
  |binary
 devel/bmake/DETAILS                                                          
  |    4 
 devel/bmake/HISTORY                                                          
  |    3 
 devel/git/DETAILS                                                            
  |    2 
 devel/git/HISTORY                                                            
  |    3 
 devel/python/DETAILS                                                         
  |    3 
 devel/python/HISTORY                                                         
  |    3 
 disk/hoz/BUILD                                                               
  |    1 
 disk/hoz/DEPENDS                                                             
  |    1 
 disk/hoz/DETAILS                                                             
  |   20 
 disk/hoz/HISTORY                                                             
  |    2 
 disk/hoz/INSTALL                                                             
  |    5 
 doc/evince/DETAILS                                                           
  |    4 
 doc/evince/HISTORY                                                           
  |    3 
 gnome2-libs/at-spi2-atk/DETAILS                                              
  |    5 
 gnome2-libs/at-spi2-atk/HISTORY                                              
  |    3 
 gnome2-libs/at-spi2-core/DETAILS                                             
  |    5 
 gnome2-libs/at-spi2-core/HISTORY                                             
  |    3 
 gnome2-libs/atk/DETAILS                                                      
  |    7 
 gnome2-libs/atk/HISTORY                                                      
  |    3 
 gnome2-libs/gdk-pixbuf2/DEPENDS                                              
  |    4 
 gnome2-libs/gdk-pixbuf2/DETAILS                                              
  |    5 
 gnome2-libs/gdk-pixbuf2/HISTORY                                              
  |    4 
 gnome2-libs/glib2/DETAILS                                                    
  |    8 
 gnome2-libs/glib2/HISTORY                                                    
  |    3 
 gnu/gcc/DETAILS                                                              
  |    3 
 gnu/gcc/HISTORY                                                              
  |    4 
 graphics-libs/mesalib/DEPENDS                                                
  |   16 
 graphics-libs/mesalib/HISTORY                                                
  |    3 
 graphics-libs/opencolorio/DETAILS                                            
  |    6 
 graphics-libs/opencolorio/HISTORY                                            
  |    3 
 
graphics-libs/openimageio/0001-fix-compile-errors-due-to-missing-headers.patch
 |   53 -
 graphics-libs/openimageio/BUILD                                              
  |    2 
 graphics-libs/openimageio/DETAILS                                            
  |    6 
 graphics-libs/openimageio/HISTORY                                            
  |    5 
 graphics-libs/openimageio/PRE_BUILD                                          
  |    3 
 graphics/blender/BUILD                                                       
  |   56 -
 graphics/blender/CONFIGURE                                                   
  |   17 
 graphics/blender/DEPENDS                                                     
  |   90 -
 graphics/blender/DETAILS                                                     
  |    4 
 graphics/blender/HISTORY                                                     
  |   13 
 graphics/blender/INSTALL                                                     
  |  106 --
 graphics/blender/PRE_BUILD                                                   
  |   45 
 graphics/blender/blender-2.60-bmake.patch                                    
  |  114 --
 graphics/blender/blender-2.60-openjpeg.patch                                 
  |   37 
 graphics/blender/blender-2.60a-libav-0.7.patch                               
  |   30 
 graphics/blender/blender-2.61-CVE-2009-3850.patch                            
  |  152 --
 graphics/blender/blender-2.61-desktop.patch                                  
  |   20 
 graphics/blender/blender-2.61-eigen.patch                                    
  |  521 ----------
 graphics/blender/blender-2.61-enable_site_module.patch                       
  |   34 
 graphics/blender/blender-2.61-glew.patch                                     
  |   49 
 graphics/openexr/CONFLICTS                                                   
  |    3 
 graphics/openexr/HISTORY                                                     
  |    5 
 graphics/openexr/UP_TRIGGERS                                                 
  |    4 
 libs/glibc/DETAILS                                                           
  |   63 -
 libs/glibc/HISTORY                                                           
  |    3 
 libs/glibc/PREPARE                                                           
  |    4 
 libs/glibc/PRE_BUILD                                                         
  |   12 
 python-pypi/numpy/DETAILS                                                    
  |    4 
 python-pypi/numpy/HISTORY                                                    
  |    3 
 shell-term-fm/tcsh/BUILD                                                     
  |    2 
 shell-term-fm/tcsh/HISTORY                                                   
  |    3 
 utils/kbd/DEPENDS                                                            
  |    7 
 utils/kbd/HISTORY                                                            
  |    4 
 utils/kbd/PRE_BUILD                                                          
  |    5 
 utils/kbd/kbd-2.0.0-tests.patch                                              
  |   31 
 x11-toolkits/gtk+2/DETAILS                                                   
  |    4 
 x11-toolkits/gtk+2/HISTORY                                                   
  |    6 
 x11-toolkits/gtk+2/PRE_BUILD                                                 
  |    4 
 x11-toolkits/gtk+3/DETAILS                                                   
  |    8 
 x11-toolkits/gtk+3/HISTORY                                                   
  |    3 
 73 files changed, 355 insertions(+), 1363 deletions(-)

New commits:
commit 7b36ca6270c126d28152f467bf3f69f9af3deb22
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    x11-toolkits/gtk+2: removed fix for gtk-doc

commit 5cd15a4217779449dd4e3bf38c022f59b8c1affa
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    doc/evince: version 3.17.1

commit 47bd7bdd421421d3204c831cd684cf621d949354
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    x11-toolkits/gtk+3: version 3.17.1

commit ae0efe8585a2c09f2f81c833a72047430ed87f1e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gnome2-libs/at-spi2-atk: version 2.16.0

commit c65da01a2241053f596b0382d08e28829787267b
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gnome2-libs/at-spi2-core: version 2.16.0

commit 63a1af4308cf5b3c45dd2276340010ba195ff68d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    x11-toolkits/gtk+2: version 2.24.28

commit 85995ffe0375ffe3f649c9df4c1e5c943117fb36
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gnome2-libs/gdk-pixbuf2: version 2.31.4

commit 2f5caa2e7f82ac9862d6b8dd5d0ee885d688024c
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gnome2-libs/atk: version 2.16.0

commit cea805a64ac6fd71b77fe1a52a51d9e56a259d62
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gnome2-libs/glib2: version 2.44.1

commit adb4f85113647d11156af843275a29200435dfd6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    graphics/blender: version 2.74

commit 60092346b706ed065e3b521a8b2541a6fa2a31db
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    graphics-libs/openimageio: version 1.5.15

commit bc5bba7875b16ad6337f24f7fac18b91cab43ce9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    python-pypi/numpy: version 1.9.2

commit 7cca86f09b38369c8e6cfec644d98cbcfb7e3163
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    graphics-libs/opencolorio: version 1.0.9

commit a9b6aea90818947e7dcd7d07459e37a684c876ac
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    glibc: support kernel headers 4.x

commit db5ae9d2dca152a73bc7385f54d60ec3d5bf6436
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    tcsh: fix build with gcc5 (-fno-builtin-malloc)

commit b92e1a71abab7c19690e6272129e58201cd1ccfb
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    devel/python: version 2.7.10

commit 724c0aedd61973134a9da059d2e131b19f796c92
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    devel/git: fix hash of html docs

commit cf0b7a16a940736bc3cfa0a9fdd22ab40309b8ee
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    mesalib: clean up overzealous dependencies

commit a9f98a6796d95c45b17dae17d372d4524fdd777e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    hoz: new spell, Hacha Open Zource file splitter

commit c12c2b54417e140b32a3c5f512aeee3b9b151e5b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    bmake 20150505

commit 5566f04275f032d30f4a768c37abeafe6871aaa0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    gcc: use ecj-4.9 as that exists

commit 2d79a69ba438f3acd96da296c7345e67ca07fda4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    openexr: self-conflicting build and incompatible upgrade (making the 
former visible)

commit 74e2401667207a74e72fccf34a394b3d7e8ed7e0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    FUNCTIONS: added check_dependees_on_update()

commit c695505fb03286fa0f9c8b982ad8b3312383c941
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    kbd: make check dependency optional

commit 945b37f4c9f19fe4540db7e6b4020d5905dc0276
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    x11-toolkits/gtk+2: removed fix for gtk-doc

commit bbb471213627c7f6bea0682c8259d3fb493e3a52
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    doc/evince: version 3.17.1

commit 5ce4775753b2f152758a908659557cf304bbf4e8
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    x11-toolkits/gtk+3: version 3.17.1

commit baca56c11b94120549d83622ece2c307c25c08c3
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    gnome2-libs/at-spi2-atk: version 2.16.0

commit a477bc7005450a79eb0ba195223d86d74a86cc1e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    gnome2-libs/at-spi2-core: version 2.16.0

commit cf5b8074c666b85daded4ba10dabba33ab8c489f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    x11-toolkits/gtk+2: version 2.24.28

commit bce5ab061d9d8995c6d6a41adea086205aba88aa
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    gnome2-libs/gdk-pixbuf2: version 2.31.4

commit 45a998007cd622c4d312229d69470c5d63f1820c
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    gnome2-libs/atk: version 2.16.0

commit 15e91a2baad35aaa357622a5a229e5fb0fcdd9ac
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    gnome2-libs/glib2: version 2.44.1

commit 7c96e574ae6e53ef0e4ae86a9fa3e923465e32b7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/blender: version 2.74

commit 2c7b59297470b3f2e75fc0ad272a37f1ab9305f6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/openimageio: version 1.5.15

commit b62064995d36112069cc74d1cfb384964c1a9399
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    python-pypi/numpy: version 1.9.2

commit 9e73490463856a856d76946f41f0c268790b0c0c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/opencolorio: version 1.0.9

commit f6353fc305dab7815e7754f3e212d1b203e43223
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    glibc: support kernel headers 4.x

commit 0a42e0ad1d9e2b5cf825c6e0ee3844336f06ae46
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    tcsh: fix build with gcc5 (-fno-builtin-malloc)

commit 01fba1c168b1651d7ad35fd2cafcfda600898b3f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    devel/python: version 2.7.10

commit 5b142380e3df2967304fc94836820cb9dca77dd8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/git: fix hash of html docs

commit 62b0659d3bba8a651b02f6217aee685dce00a8f7
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    mesalib: clean up overzealous dependencies

diff --git a/ChangeLog b/ChangeLog
index fa474cc..01ff8ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-25 Ismael Luceno <ismael AT sourcemage.org>
+       * disk/hoz: new spell, Hacha Open Zource file splitter
+
+2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+       * FUNCTIONS: added check_dependees_on_update() for use in
+         UP_TRIGGERS
+
 2015-05-23 Treeve Jelbert <treeve AT sourcemage.org>
        * KDE4_DEPENDS, KDE4_FUNCTIONS: add missing files
 
diff --git a/FUNCTIONS b/FUNCTIONS
index b1cb7fb..fa42d23 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -791,6 +791,43 @@ function get_spell_provider_file(){
   | grep "$3" | sort | head -n 1
 }
 
+#---
+## Trigger check_self on spells depending on the one at hand if it
+## is being updated from an old version.
+## Purpose of the optional version filter  parameters is to limit the
+## triggering to cases of significant difference, like 1.2.x -> 1.3.y 
instead of
+## the smaller difference 1.2.x -> 1.2.y .
+## @params $1 - spell at hand
+## @params $2 - new version
+## @params $3 - command to filter versions with
+## @params $4 - and following: arguments to the filter command
+##
+## Example: check_dependees_on_update $SPELL $VERSION cut -d . -f 1,2
+## This will compare only x.y out of version x.y.z-betaY.
+#---
+function check_dependees_on_update()
+{
+  local   spell=$1; shift;
+  local version=$1; shift;
+  if spell_ok $spell; then
+    local old_version=$(installed_version $spell)
+    local new_version=$version
+    if [[ $# -gt 0 ]]; then
+      old_version=$(echo "$old_version" | "$@")
+      new_version=$(echo "$new_version" | "$@")
+    fi &&
+    if [[ "$new_version" != "$old_version" ]]; then
+      message "${MESSAGE_COLOR}This is a possibly incompatible update of 
$SPELL." &&
+      message "Figuring out what spells need to be checked for 
sanity...${DEFAULT_COLOR}" &&
+
+      for each in $(show_up_depends $SPELL 1); do
+          up_trigger $each check_self
+      done
+    fi
+  fi
+}
+
+#---
 
 . $GRIMOIRE/glselect.function
 . $GRIMOIRE/bzr_download.function
diff --git a/devel/bmake/DETAILS b/devel/bmake/DETAILS
index 8f0d94f..1793189 100755
--- a/devel/bmake/DETAILS
+++ b/devel/bmake/DETAILS
@@ -1,8 +1,8 @@
            SPELL=bmake
-         VERSION=20140620
+         VERSION=20150505
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://ftp.netbsd.org/pub/NetBSD/misc/sjg/${SOURCE}
-     
SOURCE_HASH=sha512:c25ff8e0296599c558f88abd6619db361fefff3e560e8aa31bdd169ad6dcb780b4faf7867ed392f319af189fd2b8e833a6e345785f801c823279f90ce625dc8c
+     
SOURCE_HASH=sha512:186a9d7cb48042d41c39bd811521ed9ec7791c5de0f7d3098d3c30e4d683b36c92bf3710ab78e7f7ed8316f0f0d22766df36c2d541530e19d4ce99b2963a9b7a
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
         WEB_SITE="http://crufty.net/help/sjg/bmake.html";
       LICENSE[0]="BSD"
diff --git a/devel/bmake/HISTORY b/devel/bmake/HISTORY
index 771e9bb..6cde0da 100644
--- a/devel/bmake/HISTORY
+++ b/devel/bmake/HISTORY
@@ -1,3 +1,6 @@
+2015-05-25 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 20150505
+
 2014-09-10 Ismael Luceno <ismael AT sourcemage.org>
        * BUILD: Fix system search path
 
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index e22aa42..cfa9cc0 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
          SOURCE5=$SPELL-htmldocs-$VERSION.tar.xz
 #         SOURCE6=$SOURCE5.sign
 #     SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-    
SOURCE5_HASH=sha512:158bff66b9f73fc72d3ac6ac3246bebf831551c0ff1e9571913b952f5b891407ab4408ca2daa247869e50d43bb2e951eed6fdb3c39708c769630bbfc618f0efb
+    
SOURCE5_HASH=sha512:cc9ba76560fb50761698cf3204f3a9ede2efa543f4465ce39f2015664b52037f79156d7c4519599edd3206411b0b8d2b74d3970fde07d8a5e5ae8e791d64882e
      SOURCE5_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE5
 #     SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
 #  SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 3d434d2..3370b16 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: fix hash of html docs
+
 2015-05-21 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: updated spell to 2.4.1
 
diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index 17cffec..346e91e 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,7 +1,6 @@
            SPELL=python
-         VERSION=2.7.9
+         VERSION=2.7.10
   SECURITY_PATCH=4
-      PATCHLEVEL=1
           SOURCE=Python-$VERSION.tar.xz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 3ca10da..ec835b8 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 2.7.10
+
 2015-04-23 Thomas Orgis <sobukus AT sourcemage.org>
        * CONFIGURE: add warning about not using python 2 as primary
 
diff --git a/disk/hoz/BUILD b/disk/hoz/BUILD
new file mode 100755
index 0000000..83463f6
--- /dev/null
+++ b/disk/hoz/BUILD
@@ -0,0 +1 @@
+make LANG=-DHOZ_LANG_EN BIN=hoz GBIN=ghoz $OPTS
diff --git a/disk/hoz/DEPENDS b/disk/hoz/DEPENDS
new file mode 100755
index 0000000..bf633fd
--- /dev/null
+++ b/disk/hoz/DEPENDS
@@ -0,0 +1 @@
+optional_depends gtk+2 all cli "for GTK+2 UI"
diff --git a/disk/hoz/DETAILS b/disk/hoz/DETAILS
new file mode 100755
index 0000000..7a5943a
--- /dev/null
+++ b/disk/hoz/DETAILS
@@ -0,0 +1,20 @@
+           SPELL=hoz
+         VERSION=1.65
+          SOURCE="$SPELL-${VERSION/.}.tar.gz"
+   SOURCE_URL[0]=http://$SPELL.sourceforge.net/download/$SOURCE
+     
SOURCE_HASH=sha512:03f3383b168ef0fad76c1ad1ecfc43bd4785194da85f6c704204765446be4c1b71e1a395308af714e814965fd8a0fb06dc1cc6a8326b135be3006fffb3d39d18
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION/.}"
+        WEB_SITE="http://hoz.sourceforge.net/";
+      LICENSE[0]="GPL"
+         ENTERED=20150525
+        KEYWORDS=""
+           SHORT="Hacha Open Zource file splitter"
+cat << EOF
+HOZ is what you would call a "file splitter". It's file format is the same
+as the one used by the Hacha software, a well known splitter, specially
+popular Spain and Latin America. HOZ is an fully compatible, faster, and
+portable implementation of the Hacha format.
+
+The name replaces the "S" in "Source" with a "Z" because "hoz" is "sickle"
+in spanish, while "hacha" is the word for "axe".
+EOF
diff --git a/disk/hoz/HISTORY b/disk/hoz/HISTORY
new file mode 100644
index 0000000..72b1a47
--- /dev/null
+++ b/disk/hoz/HISTORY
@@ -0,0 +1,2 @@
+2015-05-25 Ismael Luceno <ismael AT sourcemage.org>
+       * BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/disk/hoz/INSTALL b/disk/hoz/INSTALL
new file mode 100755
index 0000000..5d38b2c
--- /dev/null
+++ b/disk/hoz/INSTALL
@@ -0,0 +1,5 @@
+cd "$SOURCE_DIRECTORY" &&
+install hoz "$INSTALL_ROOT/usr/bin" &&
+if [ -e ghoz ]; then
+    install ghoz "$INSTALL_ROOT/usr/bin"
+fi
diff --git a/doc/evince/DETAILS b/doc/evince/DETAILS
index 13ebf6e..b5ef5b4 100755
--- a/doc/evince/DETAILS
+++ b/doc/evince/DETAILS
@@ -1,11 +1,11 @@
            SPELL=evince
-         VERSION=3.14.2
+         VERSION=3.17.1
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
         WEB_SITE=http://www.gnome.org/projects/evince
-     
SOURCE_HASH=sha512:f6a2b4037a055997316f2820b2ec6d171f51b0005b16070a2f990d5738ad39a14cc6e4662ad785da528d5e8d8ac48bba3a628c0b728578b00f09859d08b79aa6
+     
SOURCE_HASH=sha512:759677f62a049ccb3194808bdb49bbd05d486ff7d7ad371901fe91b1c82029fb2540425c13e35adfee031c0abf0621920519c63fa5c99eea22d4e602cb7213f3
       LICENSE[0]=GPL
          ENTERED=20050502
         KEYWORDS="doc"
diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index f7e11d7..ae9b555 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 3.17.1
+
 2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.14.2; reverted to proper branch 
selection
        * BUILD: disable broken browser plugin
diff --git a/gnome2-libs/at-spi2-atk/DETAILS b/gnome2-libs/at-spi2-atk/DETAILS
index 4a147bb..25385a9 100755
--- a/gnome2-libs/at-spi2-atk/DETAILS
+++ b/gnome2-libs/at-spi2-atk/DETAILS
@@ -1,7 +1,6 @@
            SPELL=at-spi2-atk
-         VERSION=2.14.1
-     
SOURCE_HASH=sha512:1daee942d3c477444aaa42fb6ede6d821ff9b613f0686dd4a545406c97ceb819a3544419e0cb5d2e661f3a1b6fc92af9394801f3c51377db0ab77620e5c3d437
-     PATCHLEVEL=0
+         VERSION=2.16.0
+     
SOURCE_HASH=sha512:fcd40693e5ef55c640a52158996dc8bc66f53ef211c343cd5401c4bcd1669110ea836e0550eb41caee9c9f3a4f9670095a7dd8252600af943ddcb374bf50f011
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/at-spi2-atk/HISTORY b/gnome2-libs/at-spi2-atk/HISTORY
index 3fb4795..cdc75a9 100644
--- a/gnome2-libs/at-spi2-atk/HISTORY
+++ b/gnome2-libs/at-spi2-atk/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 2.16.0
+
 2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: removed libffi -- it's not a direct dependency
 
diff --git a/gnome2-libs/at-spi2-core/DETAILS 
b/gnome2-libs/at-spi2-core/DETAILS
index cd852bd..fb1d825 100755
--- a/gnome2-libs/at-spi2-core/DETAILS
+++ b/gnome2-libs/at-spi2-core/DETAILS
@@ -1,8 +1,7 @@
            SPELL=at-spi2-core
-         VERSION=2.14.1
-     
SOURCE_HASH=sha512:263f2353961787b510a22ede6243ebd6f9eba7fe00740b252ba372e78a2b4a20bd6ed1a9f509b2e33342fc5516d1e8b95f886573d51962755e51584771ac86b9
+         VERSION=2.16.0
+     
SOURCE_HASH=sha512:b61cb6dad15e2a6f6cd4788e6b63fed37d0098a56d1417b43aed2ba111a7dd7fccbe7c393f0be794bcaf900f38decbd3974c36e395548000d429086f8717df57
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-      PATCHLEVEL=0
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/at-spi2-core/HISTORY 
b/gnome2-libs/at-spi2-core/HISTORY
index 41617cc..2496448 100644
--- a/gnome2-libs/at-spi2-core/HISTORY
+++ b/gnome2-libs/at-spi2-core/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 2.16.0
+
 2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: removed libffi -- it's not a direct dependency
 
diff --git a/gnome2-libs/atk/DETAILS b/gnome2-libs/atk/DETAILS
index 91fb666..583b1a4 100755
--- a/gnome2-libs/atk/DETAILS
+++ b/gnome2-libs/atk/DETAILS
@@ -1,11 +1,10 @@
            SPELL=atk
 if [[ $ATK_DEVEL == y ]]; then
-         VERSION=2.14.0
+         VERSION=2.16.0
 else
-         VERSION=2.14.0
+         VERSION=2.16.0
 fi
-   
SOURCE_HASH=sha512:3aa5155086d607a2779be1e96ae77798192f93161c855b194f15c49d968bb88535e16ee6114911857f31aeedfc0930f3f828d225f71a7b2f48e85919ab7d057b
-      PATCHLEVEL=1
+     
SOURCE_HASH=sha512:dc8827779d14fe7212733464f8775f67d60ab3027fcd935245d57c5899e8fc8acc6ceb88ee58f7bfbf259b89447868b3c93726ac56f46bf30a722b47b7bbd7da
           BRANCH=`echo $VERSION|cut -d . -f 1,2` 
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/atk/HISTORY b/gnome2-libs/atk/HISTORY
index fc5788e..e6f1ba2 100644
--- a/gnome2-libs/atk/HISTORY
+++ b/gnome2-libs/atk/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 2.16.0
+
 2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: removed libffi -- it's not a direct dependency
 
diff --git a/gnome2-libs/gdk-pixbuf2/DEPENDS b/gnome2-libs/gdk-pixbuf2/DEPENDS
index 696ccf2..b037318 100755
--- a/gnome2-libs/gdk-pixbuf2/DEPENDS
+++ b/gnome2-libs/gdk-pixbuf2/DEPENDS
@@ -23,7 +23,7 @@ optional_depends gobject-introspection \
                  "enable gobject-introspection" &&
 
 optional_depends jasper \
-                 --enable-jasper \
-                 --disable-jasper \
+                 --with-libjasper \
+                 --without-libjasper \
                  "enable JPEG2000 loader"
 
diff --git a/gnome2-libs/gdk-pixbuf2/DETAILS b/gnome2-libs/gdk-pixbuf2/DETAILS
index 27b0913..41a593b 100755
--- a/gnome2-libs/gdk-pixbuf2/DETAILS
+++ b/gnome2-libs/gdk-pixbuf2/DETAILS
@@ -1,8 +1,7 @@
            SPELL=gdk-pixbuf2
-         VERSION=2.30.8
-     
SOURCE_HASH=sha512:2888cf035b70330e8d3ac87af54b69b2c990440fd59922464088d2a685e90022ad39c83d1ce1ccccfac3872b55ce9445ec4a3e9c7ab6371e20b19e20df7f261d
+         VERSION=2.31.4
+     
SOURCE_HASH=sha512:872283cb012d5e695446ddb39bbdeeeb9054293535a19e9d913b5b72904159067668e2ff61fda45648db15bced2e76b68fadfc38256da7c488ed2dbeda6f9523
   SECURITY_PATCH=1
-      PATCHLEVEL=0
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=gdk-pixbuf-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gdk-pixbuf-$VERSION
diff --git a/gnome2-libs/gdk-pixbuf2/HISTORY b/gnome2-libs/gdk-pixbuf2/HISTORY
index 0db7cdc..05094b6 100644
--- a/gnome2-libs/gdk-pixbuf2/HISTORY
+++ b/gnome2-libs/gdk-pixbuf2/HISTORY
@@ -1,3 +1,7 @@
+2015-05-24 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 2.31.4
+       * DEPENDS: fixed flags for jasper
+
 2015-05-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: LZMA -> xz-utils
 
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index 3a40a91..91705ff 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,12 +1,12 @@
            SPELL=glib2
 if [[ $GLIB_VER == devel ]];then
-         VERSION=2.44.0
-     
SOURCE_HASH=sha512:479ecc27e7af1e540f780e192b1613603245f4a9baed71fb2f152376a0ce71d5f5d4c530202e1f276e448383a73728b9406bdc6dd8082585506d3be9a8f7ee0c
+         VERSION=2.44.1
+     
SOURCE_HASH=sha512:c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888
           SOURCE=glib-$VERSION.tar.xz
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 else
-         VERSION=2.44.0
-     
SOURCE_HASH=sha512:479ecc27e7af1e540f780e192b1613603245f4a9baed71fb2f152376a0ce71d5f5d4c530202e1f276e448383a73728b9406bdc6dd8082585506d3be9a8f7ee0c
+         VERSION=2.44.1
+     
SOURCE_HASH=sha512:c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888
   SECURITY_PATCH=1
           SOURCE=glib-$VERSION.tar.xz
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index b6f59c3..6cf542c 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 2.44.1
+
 2015-04-07 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: updated spell to 2.44.0, removed trailing space in SPELL
 
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 2614a22..162f78f 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -19,7 +19,8 @@ if [[ "$GCC_CLOOG" == "y" ]]; then
 fi
 
 if list_find "$GCC_COMPILER" "java"; then
-         SOURCE5=ecj-$(echo $VERSION|cut -f1,2 -d.).jar
+#         SOURCE5=ecj-$(echo $VERSION|cut -f1,2 -d.).jar
+         SOURCE5=ecj-4.9.jar
   SOURCE5_URL[0]=ftp://sourceware.org/pub/java/${SOURCE5}
     
SOURCE5_HASH=sha512:28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226
 fi
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index c588a02..686d8be 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,7 @@
+2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: There is no ecj-5.1, trying ecj-4.9.
+         I can compile a hello world example at least.
+
 2015-05-03 Pavel Vinogradov <public AT sourcemage.org>
        * UP_TRIGGERS: improved the major release change check, fixed
          syntax error
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index daf26eb..5719e0d 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -23,23 +23,25 @@ case $MESALIB_BUILD in
   depends dri3proto &&
   depends presentproto &&
   depends libdrm &&
-  depends DEVICE-MANAGER   &&
   depends libxext &&
   depends libxxf86vm &&
   depends libxdamage &&
   depends libxfixes &&
   depends libxcb &&
-  depends expat
+  depends expat &&
+  optional_depends DEVICE-MANAGER \
+    '' \
+    '--enable-sysfs' \
+    'Use a device manager instead of sysfs'
   ;;
  *)
   ;;
 esac &&
 
-depends mako    &&
-depends python  &&
-
-if [[ "$MESALIB_GALLIUM" != "none" ]]; then
-  depends llvm
+if [[ -n $MESALIB_GALLIUM ]] && [[ "$MESALIB_GALLIUM" != "none" ]]; then
+  depends llvm    &&
+  depends mako    &&
+  depends python  &&
   if list_find  "$MESA_EGL" wayland;then
     depends wayland
   fi &&
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index bd84d3c..d6a92b2 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
+       * DEPENDS: clean up overzealous dependencies
+
 2015-05-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 10.5.5
 
diff --git a/graphics-libs/opencolorio/DETAILS 
b/graphics-libs/opencolorio/DETAILS
index 8168611..d700950 100755
--- a/graphics-libs/opencolorio/DETAILS
+++ b/graphics-libs/opencolorio/DETAILS
@@ -1,9 +1,9 @@
            SPELL=opencolorio
-         VERSION=1.0.8
-        XVERSION=8883824
+         VERSION=1.0.9
+        XVERSION=2b12063
           SOURCE="opencolorio-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://github.com/imageworks/OpenColorIO/tarball/v${VERSION}
-     
SOURCE_HASH=sha512:16c0deab84013d96c9741a58ddc44a90be6a6eac317b8ceb87afad914aa9b0e1d5880dc11ae3c40d22e4a87b553e3b5a1a8a66c064f71c2203b4b605a97851a1
+     
SOURCE_HASH=sha512:a3b33949061d16a0e3648c9206291771b9e7532ce56727fe9d323ca15d88e24baf649657286139e1568d5c3564d2b8258d4c3442b3350245f8d2556dc2f1f5d2
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/imageworks-OpenColorIO-${XVERSION}"
         WEB_SITE="http://opencolorio.org/index.html";
       LICENSE[0]=BSD
diff --git a/graphics-libs/opencolorio/HISTORY 
b/graphics-libs/opencolorio/HISTORY
index 2886632..b469bf9 100644
--- a/graphics-libs/opencolorio/HISTORY
+++ b/graphics-libs/opencolorio/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 1.0.9
+
 2013-01-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS: spell created
 
diff --git 
a/graphics-libs/openimageio/0001-fix-compile-errors-due-to-missing-headers.patch
 
b/graphics-libs/openimageio/0001-fix-compile-errors-due-to-missing-headers.patch
deleted file mode 100644
index 1fb5416..0000000
--- 
a/graphics-libs/openimageio/0001-fix-compile-errors-due-to-missing-headers.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 1d4925c5a87cb23c6bc3487b49e3981480b6d36f Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Fri, 11 Jan 2013 22:57:04 +0100
-Subject: [PATCH] fix compile errors due to missing headers
-
----
- src/libtexture/texturesys.cpp | 1 +
- src/libutil/SHA1.cpp          | 2 +-
- src/testtex/testtex.cpp       | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/libtexture/texturesys.cpp b/src/libtexture/texturesys.cpp
-index c5fdd90..ff69213 100644
---- a/src/libtexture/texturesys.cpp
-+++ b/src/libtexture/texturesys.cpp
-@@ -31,6 +31,7 @@
- 
- #include <math.h>
- #include <string>
-+#include <cstring>
- #include <sstream>
- #include <list>
- #include <boost/tr1/memory.hpp>
-diff --git a/src/libutil/SHA1.cpp b/src/libutil/SHA1.cpp
-index b9e6c8b..c761185 100644
---- a/src/libutil/SHA1.cpp
-+++ b/src/libutil/SHA1.cpp
-@@ -8,9 +8,9 @@
- 
- // If compiling with MFC, you might want to add #include "StdAfx.h"
- 
-+#include "SHA1.h"
- #include "hash.h"
- #include "dassert.h"
--#include "SHA1.h"
- 
- #ifdef SHA1_UTILITY_FUNCTIONS
- #define SHA1_MAX_FILE_BUFFER 8000
-diff --git a/src/testtex/testtex.cpp b/src/testtex/testtex.cpp
-index 6361593..6b7a27c 100644
---- a/src/testtex/testtex.cpp
-+++ b/src/testtex/testtex.cpp
-@@ -29,6 +29,7 @@
- */
- 
- 
-+#include <cstring>
- #include <cstdio>
- #include <cstdlib>
- #include <cmath>
--- 
-1.8.1
-
diff --git a/graphics-libs/openimageio/BUILD b/graphics-libs/openimageio/BUILD
index ccaba29..84c710a 100755
--- a/graphics-libs/openimageio/BUILD
+++ b/graphics-libs/openimageio/BUILD
@@ -1,5 +1,5 @@
 mkdir -p ${SOURCE_DIRECTORY}/build &&
 cd ${SOURCE_DIRECTORY}/build       &&
 prepare_cmake_flags                &&
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr 
-DSYSCONFDIR=$INSTALL_ROOT/etc $OPTS ../src &&
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr 
-DSYSCONFDIR=$INSTALL_ROOT/etc $OPTS .. &&
 default_build_make
diff --git a/graphics-libs/openimageio/DETAILS 
b/graphics-libs/openimageio/DETAILS
index d7e59bf..89baabe 100755
--- a/graphics-libs/openimageio/DETAILS
+++ b/graphics-libs/openimageio/DETAILS
@@ -1,9 +1,9 @@
            SPELL=openimageio
-         VERSION=1.1.3
-        XVERSION=77be26d
+         VERSION=1.5.15
+        XVERSION=374ea98
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://github.com/OpenImageIO/oiio/tarball/Release-${VERSION}
-     
SOURCE_HASH=sha512:88afa95e0ee7e05b78f4fb75edca9b3fd2cd4b460b75a4a7f11c61b561d822080e7727de8900b7595c75bd81e47bd3473f74b3df8f095888442b250a109c57f8
+     
SOURCE_HASH=sha512:34f479f73683c6420f73e664d1dcaa9a18234d45cea2e046ac54418ddf7e52a87be783ab311f662c522b581f1c754639ef399ba74c8e91f0b08c157cb998a93e
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/OpenImageIO-oiio-${XVERSION}"
         WEB_SITE="https://sites.google.com/site/openimageio/";
       LICENSE[0]=BSD
diff --git a/graphics-libs/openimageio/HISTORY 
b/graphics-libs/openimageio/HISTORY
index b634ca9..eff9742 100644
--- a/graphics-libs/openimageio/HISTORY
+++ b/graphics-libs/openimageio/HISTORY
@@ -1,3 +1,8 @@
+2015-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS, BUILD: version 1.5.15
+       * 0001-fix-compile-errors-due-to-missing-headers.patch, PRE_BUILD:
+         removed
+
 2013-01-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * 0001-fix-compile-errors-due-to-missing-headers.patch, BUILD,
          DEPENDS, DETAILS, PRE_BUILD: spell created
diff --git a/graphics-libs/openimageio/PRE_BUILD 
b/graphics-libs/openimageio/PRE_BUILD
deleted file mode 100755
index 6aee1de..0000000
--- a/graphics-libs/openimageio/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < 
${SPELL_DIRECTORY}/0001-fix-compile-errors-due-to-missing-headers.patch
diff --git a/graphics/blender/BUILD b/graphics/blender/BUILD
index 04c5616..b3da1ee 100755
--- a/graphics/blender/BUILD
+++ b/graphics/blender/BUILD
@@ -1,53 +1,3 @@
-if [ "$BLENDER_PLAYER" == "WITH_BF_PLAYER=True" ]; then
-   BLENDER_GAMEENGINE="WITH_BF_GAMEENGINE=True"
-fi  &&
-
-if is_depends_enabled $SPELL openjpeg; then
-
-cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-BF_OPENJPEG="/usr"
-BF_OPENJPEG_INC="/usr/include"
-BF_OPENJPEG_LIB="openjpeg"
-EOF
-
-fi  &&
-
-#if is_depends_enabled $SPELL openexr; then
-#
-#cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-#BF_OPENEXR="/usr"
-#BF_OPENJPEG_INC="/usr/include"
-#BF_OPENEXR_INC="${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include"
-#BF_OPENEXR_LIBPATH="${BF_OPENEXR}/lib"
-#EOF
-#
-#fi  &&
-
-if is_depends_enabled $SPELL lcms; then
-
-cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-BF_LCMS_INC="/usr/include/"
-BF_LCMS_LIB="lcms"
-BF_LCMS_LIBPATH="/usr/lib/"
-EOF
-
-fi  &&
-
-echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
-     | sed -e "s:,]: ]:" >> "${SOURCE_DIRECTORY}"/user-config.py
-
-local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; 
done`"
-echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> 
"${SOURCE_DIRECTORY}"/user-config.py
-echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> 
"${SOURCE_DIRECTORY}"/user-config.py
-
-echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', 
'-D_FILE_OFFSET_BITS=64']" >> "${SOURCE_DIRECTORY}"/user-config.py
-
-local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; 
done`"
-echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> 
"${SOURCE_DIRECTORY}"/user-config.py
-echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> 
"${SOURCE_DIRECTORY}"/user-config.py
-
-OPTS="WITHOUT_BF_PYTHON_INSTALL=True WITH_BF_3DMOUSE=False $BLENDER_PLAYER 
$BLENDER_GAMEENGINE $BLENDER_OCEANSIM $BLENDER_OGG $OPTS"
-
-python ./scons/scons.py $OPTS
-
-make CFLAGS="${CFLAGS} -fPIC" LDFLAGS="-Bshareable" -C release/plugins
+OPTS="$OPTS $BLENDER_PLAYER $BLENDER_GAMEENGINE $BLENDER_OCEANSIM" &&
+OPTS="$OPTS -DWITH_INSTALL_PORTABLE=OFF"                           &&
+cmake_build
diff --git a/graphics/blender/CONFIGURE b/graphics/blender/CONFIGURE
index c61bebb..95f94f7 100755
--- a/graphics/blender/CONFIGURE
+++ b/graphics/blender/CONFIGURE
@@ -1,16 +1,11 @@
 config_query_option BLENDER_PLAYER "Build blender player" n           \
-                    "WITH_BF_PLAYER=True"                             \
-                    "WITH_BF_PLAYER=False"                            &&
+                    "-DWITH_PLAYER=on"                                \
+                    "-DWITH_PLAYER=off"                               &&
 
 config_query_option BLENDER_GAMEENGINE "Build GameEngine?" y          \
-                    "WITH_BF_GAMEENGINE=True"                         \
-                    "WITH_BF_GAMEENGINE=False"                        &&
+                    "-DWITH_GAMEENGINE=on"                            \
+                    "-DWITH_GAMEENGINE=off"                           &&
 
 config_query_option BLENDER_OCEANSIM "Build OceanSim?" y              \
-                    "WITH_BF_OCEANSIM=True"                           \
-                    "WITH_BF_OCEANSIM=False"                          &&
-
-config_query_option BLENDER_OGG "Build ogg,vorbis,theora support?" n  \
-                    "WITH_BF_OGG=True"                                \
-                    "WITH_BF_OGG=False"                               
-
+                    "-DWITH_MOD_OCEANSIM=on"                          \
+                    "-DWITH_MOD_OCEANSIM=off"
diff --git a/graphics/blender/DEPENDS b/graphics/blender/DEPENDS
index dfca6c6..7d383fb 100755
--- a/graphics/blender/DEPENDS
+++ b/graphics/blender/DEPENDS
@@ -1,7 +1,9 @@
-depends gcc            &&
+depends boost          &&
 depends -sub CXX gcc   &&
 depends python3        &&
-depends scons          &&
+depends numpy          &&
+depends openimageio    &&
+depends cmake          &&
 depends OPENGL         &&
 depends glew           &&
 depends libsamplerate  &&
@@ -28,6 +30,9 @@ depends libxinerama    &&
 depends freetype2      &&
 depends eigen3         &&
 depends bullet "" "" games  &&
+depends gettext        &&
+depends zlib           &&
+depends libpng         &&
 
 if [ "$BLENDER_OGG" == "WITH_BF_OGG=True" ]; then
    depends libogg     &&
@@ -35,73 +40,68 @@ if [ "$BLENDER_OGG" == "WITH_BF_OGG=True" ]; then
    depends libtheora
 fi  &&
 
-optional_depends gettext                                             \
-                 "WITH_BF_INTERNATIONAL=True"                        \
-                 "WITH_BF_INTERNATIONAL=False"                       \
-                 "Enable international?"                             &&
-
-optional_depends JPEG                                                \
-                 "WITH_BF_JPEG=True"                                 \
-                 "WITH_BF_JPEG=False"                                \
+optional_depends openjpeg                                            \
+                 "-DWITH_IMAGE_JPEG=on -DWITH_SYSTEM_JPEG=on"        \
+                 "-DWITH_IMAGE_JPEG=off"                             \
                  "Enable JPEG support?"                              &&
 
-optional_depends libpng                                              \
-                 "WITH_BF_PNG=True"                                  \
-                 "WITH_BF_PNG=False"                                 \
-                 "Enable PNG support?"                               &&
-
 optional_depends tiff                                                \
-                 "WITH_BF_TIFF=True"                                 \
-                 "WITH_BF_TIFF=False"                                \
+                 "-DWITH_IMAGE_TIFF=on"                              \
+                 "-DWITH_IMAGE_TIFF=off"                             \
                  "Enable TIFF support?"                              &&
 
-optional_depends openjpeg                                            \
-                 "WITH_BF_OPENJPEG=True"                             \
-                 "WITH_BF_OPENJPEG=False"                            \
+optional_depends openjpeg                                             \
+                 "-DWITH_IMAGE_OPENJPEG=on -DWITH_SYSTEM_OPENJPEG=on" \
+                 "-DWITH_IMAGE_OPENJPEG=off"                          \
                  "Enable openjpeg support?"                          &&
 
 optional_depends freealut                                            \
-                 "WITH_BF_OPENAL=True"                               \
-                 "WITH_BF_OPENAL=False"                              \
+                 "-DWITH_OPENAL=on"                                  \
+                 "-DWITH_OPENAL=off"                                 \
                  "Enable OpenAL support?"                            &&
 
 optional_depends libsndfile                                          \
-                 "WITH_BF_SNDFILE=True BF_SNDFILE_INC=/usr/include"  \
-                 "WITH_BF_SNDFILE=False"                             \
+                 "-DWITH_CODEC_SNDFILE=on"                           \
+                 "-DWITH_CODEC_SNDFILE=off"                          \
                  "Enable libsndfile support?"                        &&
 
 optional_depends sdl                                                 \
-                 "WITH_BF_SDL=True"                                  \
-                 "WITH_BF_SDL=False"                                 \
+                 "-DWITH_SDL=on"                                     \
+                 "-DWITH_SDL=off"                                    \
                  "Enable SDL support?"                               &&
 
 optional_depends openexr                                             \
-                 "WITH_BF_OPENEXR=True"                              \
-                 "WITH_BF_OPENEXR=False"                             \
+                 "-DWITH_IMAGE_OPENEXR=on"                           \
+                 "-DWITH_IMAGE_OPENEXR=off"                          \
                  "Enable openexr support?"                           &&
 
 optional_depends LIBAVCODEC                                          \
-                 "WITH_BF_FFMPEG=True"                               \
-                 "WITH_BF_FFMPEG=False"                              \
+                 "-DWITH_FFMPEG=on"                                  \
+                 "-DWITH_FFMPEG=off"                                 \
                  "Enable FFMPEG support?"                            &&
 
 optional_depends fftw                                                \
-                 "WITH_BF_FFTW3=True"                                \
-                 "WITH_BF_FFTW3=False"                               \
+                 "-DWITH_FFTW3=on"                                   \
+                 "-DWITH_FFTW3=off"                                  \
                  "Enable fftw support?"                              &&
 
-optional_depends zlib                                                \
-                 "WITH_BF_ZLIB=True"                                 \
-                 "WITH_BF_ZLIB=False"                                \
-                 "Enable zlib support?"                              &&
-
 optional_depends JACK-DRIVER                                         \
-                 "WITH_BF_JACK=True"                                 \
-                 "WITH_BF_JACK=False"                                \
-                 "Enable jack support?"                              
-
-#optional_depends glibc                                               \
-#                 "WITH_BF_ICONV = True"                              \
-#                 "WITH_BF_ICONV = False"                             \
-#                 "Enable iconv support/"                             
+                 "-DWITH_JACK=on"                                    \
+                 "-DWITH_JACK=off"                                   \
+                 "Enable jack support?"                              &&
+
+optional_depends xinput                                              \
+                 "-DWITH_X11_INPUT=on"                               \
+                 "-DWITH_X11_INPUT=off"                              \
+                 "Enable X11 xinput?"                                &&
+
+optional_depends xf86vidmodeproto                                    \
+                 "-DWITH_X11_XF86VMODE=on"                           \
+                 "-DWITH_X11_XF86VMODE=off"                          \
+                 "Enable X11 mode switching?"                        &&
+
+optional_depends opencolorio                                         \
+                 "-DWITH_OPENCOLORIO=on"                             \
+                 "-DWITH_OPENCOLORIO=off"                            \
+                 "Enable color managment?"
 
diff --git a/graphics/blender/DETAILS b/graphics/blender/DETAILS
index 7b93235..1b8d20b 100755
--- a/graphics/blender/DETAILS
+++ b/graphics/blender/DETAILS
@@ -7,13 +7,13 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
    
SOURCE_URL[0]=svn_https://svn.blender.org/svnroot/bf-blender/trunk/blender:$SPELL-svn
    SOURCE_IGNORE=volatile
 else
-         VERSION=2.62
+         VERSION=2.74
           SOURCE=$SPELL-${VERSION}.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION}"
    SOURCE_URL[0]=http://download.blender.org/source/$SOURCE
    SOURCE_URL[1]=http://mirror.cs.umn.edu/blender.org/source/$SOURCE
    SOURCE_URL[2]=http://public.planetmirror.com/pub/blender/source/$SOURCE
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+  
SOURCE_HASH[0]=sha512:080ca06cf3532ba62746a404d994f2887472155d916415ab8467fb70bd3e0fc678dc617f9d0290e261768990387dd2d22998ba190dafe2782eaa11392d6ceb8c
 fi
       LICENSE[0]=GPL
         KEYWORDS="graphics"
diff --git a/graphics/blender/HISTORY b/graphics/blender/HISTORY
index d71524a..a6dc7e6 100644
--- a/graphics/blender/HISTORY
+++ b/graphics/blender/HISTORY
@@ -1,3 +1,16 @@
+2015-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS, BUILD, CONFIGURE, DEPENDS, INSTALL, PRE_BUILD:
+         version 2.74
+       * blender-2.60-bmake.patch,
+         blender-2.60-openjpeg.patch,
+         blender-2.60a-libav-0.7.patch,
+         blender-2.61-CVE-2009-3850.patch,
+         blender-2.61-desktop.patch,
+         blender-2.61-eigen.patch,
+         blender-2.61-enable_site_module.patch,
+         blender-2.61-glew.patch,
+         blender-2.62.tar.gz.sig: removed
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/graphics/blender/INSTALL b/graphics/blender/INSTALL
deleted file mode 100755
index 80a8b25..0000000
--- a/graphics/blender/INSTALL
+++ /dev/null
@@ -1,106 +0,0 @@
-cat <<- EOF >> "${BUILD_DIRECTORY}/install/$SPELL-${VERSION}"
-#!/bin/sh
-
-# stop this script if the local blender path is a symlink
-if [ -L \${HOME}/.blender ]; then
-   echo "Detected a symbolic link for \${HOME}/.blender"
-   echo "Sorry, to avoid dangerous situations, the Blender binary can"
-   echo "not be started until you have removed the symbolic link:"
-   echo "  # rm -i \${HOME}/.blender"
-   exit 1
-fi
-
-export BLENDER_SYSTEM_BASE="/usr/share/${SPELL}/${VERSION}"
-export BLENDER_SYSTEM_SCRIPTS="/usr/share/$SPELL/${VERSION}/scripts"
-export BLENDER_SYSTEM_DATAFILES="/usr/share/$SPELL/${VERSION}/datafiles"
-export BLENDER_SYSTEM_PLUGINS="/usr/lib/$SPELL/${VERSION}/plugins"
-exec /usr/bin/$SPELL-bin-${VERSION} \$*
-EOF
-
-cp $BUILD_DIRECTORY/install/$SPELL  
$BUILD_DIRECTORY/install/$SPELL-bin-$VERSION  &&
-
-if [ "$BLENDER_PLAYER" == "WITH_BF_PLAYER=True" ]; then
-   cp $BUILD_DIRECTORY/install/${SPELL}player  
$BUILD_DIRECTORY/install/${SPELL}player-bin-$VERSION
-fi  &&
-
-# install binaries
-install -vm 755 -d $INSTALL_ROOT/usr/bin                                     
           &&
-install -vm 755 -D $BUILD_DIRECTORY/install/${SPELL}*${VERSION}  
$INSTALL_ROOT/usr/bin  &&
-#install -vm 755 $BUILD_DIRECTORY/install/blender{,player}-bin-$VERSION 
$INSTALL_ROOT/usr/bin  &&
-
-# install plugins
-install -vm 755 -d $INSTALL_ROOT/usr/lib/$SPELL/${VERSION}/plugins/texture  
&&
-install -vm 755 -D $SOURCE_DIRECTORY/release/plugins/texture/*.so           \
-                   $INSTALL_ROOT/usr/lib/$SPELL/${VERSION}/plugins/texture  
&&
-install -vm 755 -d $INSTALL_ROOT/usr/lib/$SPELL/$VERSION/plugins/sequences  
&&
-install -vm 755 -D $SOURCE_DIRECTORY/release/plugins/sequence/*.so          \
-                   $INSTALL_ROOT/usr/lib/$SPELL/$VERSION/plugins/sequences  
&&
-install -vm 755 -d $INSTALL_ROOT/usr/include/$SPELL/$VERSION                
&&
-install -vm 644 -D $SOURCE_DIRECTORY/source/blender/blenpluginapi/*.h       \
-                   $INSTALL_ROOT/usr/include/$SPELL/$VERSION                
&&
-
-# installing blender
-install -vm 755 -d $INSTALL_ROOT/usr/share/${SPELL}/${VERSION}  &&
-#install -v -D $BUILD_DIRECTORY/install/$VERSION/*               \
-#              $INSTALL_ROOT/usr/share/${SPELL}/${VERSION}       &&
-cp -Rvf $BUILD_DIRECTORY/install/$VERSION/*                     \
-        $INSTALL_ROOT/usr/share/$SPELL/$VERSION                 && 
-
-
-#install desktop file
-cp release/freedesktop/blender.desktop             \
-   release/freedesktop/blender-${VERSION}.desktop  &&
-
-install -vm 755 -d $INSTALL_ROOT/usr/share/applications                      
        &&
-install -vm 644 -D 
$SOURCE_DIRECTORY/release/freedesktop/blender-${VERSION}.desktop  \
-                   $INSTALL_ROOT/usr/share/applications                      
        &&
-
-#install icons
-cp $BUILD_DIRECTORY/install/icons/16x16/apps/blender.png                 \
-   $BUILD_DIRECTORY/install/icons/16x16/apps/blender-$VERSION.png        &&
-cp $BUILD_DIRECTORY/install/icons/22x22/apps/blender.png                 \
-   $BUILD_DIRECTORY/install/icons/22x22/apps/blender-$VERSION.png        &&
-cp $BUILD_DIRECTORY/install/icons/24x24/apps/blender.png                 \
-   $BUILD_DIRECTORY/install/icons/24x24/apps/blender-$VERSION.png        &&
-cp $BUILD_DIRECTORY/install/icons/32x32/apps/blender.png                 \
-   $BUILD_DIRECTORY/install/icons/32x32/apps/blender-$VERSION.png        &&
-cp $BUILD_DIRECTORY/install/icons/48x48/apps/blender.png                 \
-   $BUILD_DIRECTORY/install/icons/48x48/apps/blender-$VERSION.png        &&
-cp $BUILD_DIRECTORY/install/icons/256x256/apps/blender.png               \
-   $BUILD_DIRECTORY/install/icons/256x256/apps/blender-$VERSION.png      &&
-cp $BUILD_DIRECTORY/install/icons/scalable/apps/blender.svg              \
-   $BUILD_DIRECTORY/install/icons/scalable/apps/blender-${VERSION}.svg   &&
-
-install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/16x16/apps      &&
-install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/22x22/apps      &&
-install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/24x24/apps      &&
-install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/32x32/apps      &&
-install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/48x48/apps      &&
-install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/256x256/apps    &&
-install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/scalable/apps   &&
-
-install -vm 644 -D $BUILD_DIRECTORY/install/icons/16x16/apps/*         \
-                   $INTALL_ROOT/usr/share/icons/hicolor/16x16/apps     &&
-install -vm 644 -D $BUILD_DIRECTORY/install/icons/22x22/apps/*         \
-                   $INTALL_ROOT/usr/share/icons/hicolor/22x22/apps     &&
-install -vm 644 -D $BUILD_DIRECTORY/install/icons/24x24/apps/*         \
-                   $INTALL_ROOT/usr/share/icons/hicolor/24x24/apps     &&
-install -vm 644 -D $BUILD_DIRECTORY/install/icons/32x32/apps/*         \
-                   $INTALL_ROOT/usr/share/icons/hicolor/32x32/apps     &&
-install -vm 644 -D $BUILD_DIRECTORY/install/icons/48x48/apps/*         \
-                   $INTALL_ROOT/usr/share/icons/hicolor/48x48/apps     &&
-install -vm 644 -D $BUILD_DIRECTORY/install/icons/256x256/apps/*       \
-                   $INTALL_ROOT/usr/share/icons/hicolor/256x256/apps   &&
-install -vm 644 -D $BUILD_DIRECTORY/install/icons/scalable/apps/*      \
-                   $INTALL_ROOT/usr/share/icons/hicolor/scalable/apps  &&
-
-ln -sfn $INSTALL_ROOT/usr/share/icons/hicolor/256x256/apps/blender-2.60.png  
\
-        $INSTALL_ROOT/usr/share/pixmaps                                      
&&
-
-# install docs
-install -vm 755 -d $INSTALL_ROOT/usr/share/doc/$SPELL/$VERSION  &&
-install -vm 644 -D $BUILD_DIRECTORY/install/*.txt               \
-                   $INSTALL_ROOT/usr/share/doc/$SPELL/$VERSION  &&
-install -vm 644 -D $BUILD_DIRECTORY/install/*.html              \
-                   $INSTALL_ROOT/usr/share/doc/$SPELL/$VERSION  
-
diff --git a/graphics/blender/PRE_BUILD b/graphics/blender/PRE_BUILD
deleted file mode 100755
index d6532ef..0000000
--- a/graphics/blender/PRE_BUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-default_pre_build       &&
-cd "$SOURCE_DIRECTORY"  &&
-
-patch -p0 < $SCRIPT_DIRECTORY/blender-2.61-desktop.patch              &&
-patch -p0 < $SCRIPT_DIRECTORY/blender-2.60-bmake.patch                &&
-chmod 755 release/plugins/bmake                                       &&
-rm -r extern/libopenjpeg                                              &&
-patch -p1 < $SCRIPT_DIRECTORY/blender-2.60-openjpeg.patch             &&
-rm -r extern/glew                                                     &&
-patch -p1 < $SCRIPT_DIRECTORY/blender-2.61-glew.patch                 &&
-rm -r extern/Eigen3                                                   &&
-patch -p1 < $SCRIPT_DIRECTORY/blender-2.61-eigen.patch                &&
-patch -p1 < $SCRIPT_DIRECTORY/blender-2.60a-libav-0.7.patch           &&
-patch -p1 < $SCRIPT_DIRECTORY/blender-2.61-CVE-2009-3850.patch        &&
-patch -p1 < $SCRIPT_DIRECTORY/blender-2.61-enable_site_module.patch   &&  
-
-cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-REL_CFLAGS=[]
-REL_CXXFLAGS=[]
-REL_CCFLAGS=[]
-EOF
-
-cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-C_WARN  =[ '-w', '-g0' ]
-CC_WARN =[ '-w', '-g0' ]
-CXX_WARN=[ '-w', '-g0' ]
-EOF
-
-cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
-BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
-BF_INSTALLDIR="../install"
-WITH_PYTHON_SECURITY=1
-WITHOUT_BF_PYTHON_INSTALL=1
-BF_PYTHON="/usr"
-BF_PYTHON_VERSION="3.2"
-BF_PYTHON_ABI_FLAGS="m"
-BF_BUILDINFO=0
-BF_QUIET=1
-BF_NUMJOBS=${MAKE_NJOBS}
-BF_LINE_OVERWRITE=0
-WITH_BF_FHS=1
-WITH_BF_STATICOPENGL=0
-EOF
-#        WITH_BF_BINRELOC=0
-#        WITH_BF_OPENMP=${enable_openmp}
diff --git a/graphics/blender/blender-2.60-bmake.patch 
b/graphics/blender/blender-2.60-bmake.patch
deleted file mode 100644
index 0ce8fa7..0000000
--- a/graphics/blender/blender-2.60-bmake.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -Npur release/plugins.orig/bmake release/plugins/bmake
---- release/plugins.orig/bmake 2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/bmake      2011-11-11 15:01:40.637923565 +0100
-@@ -57,10 +57,10 @@
-       LDFLAGS="-Bshareable";
- elif ( test $UNAME = "Linux" ) then
-       CC="gcc";
--      CFLAGS="-fPIC -funsigned-char -O2";
-+#     CFLAGS="-fPIC -funsigned-char -O2";
-
-       LD="ld";
--      LDFLAGS="-Bshareable";
-+#     LDFLAGS="-Bshareable";
- elif ( test $UNAME = "SunOS" ) then
-       CC="cc";
-       CFLAGS="-O";
-@@ -109,22 +109,20 @@ elif ( test -f "../plugin.h" ) then
-       INCLUDES=-I..;
- elif ( test -f "../include/plugin.h" ) then
-       INCLUDES=-I../include
-+elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then
-+      INCLUDES=-I../../../source/blender/blenpluginapi
- else 
-       echo "Couldn't find plugin.h";
-       exit;
- fi
- 
- LIBM=`fgrep "#include <math.h>" $CFILE`
--LIBC=`fgrep "#include <std" $CFILE`
- 
--LIBS=
-+LIBS="-lc"
- 
- if ( test -n "$LIBM" ) then
-       LIBS="$LIBS -lm"; 
- fi
--if ( test -n "$LIBC" ) then 
--      LIBS="$LIBS -lc"; 
--fi
- 
- echo "$CC $CFLAGS -c $CFILE $INCLUDES"
- $CC $CFLAGS -c $CFILE $INCLUDES
-diff -Npur release/plugins.orig/sequence/color-correction-hsv.c 
release/plugins/sequence/color-correction-hsv.c
---- release/plugins.orig/sequence/color-correction-hsv.c       2011-11-11 
15:00:26.339924887 +0100
-+++ release/plugins/sequence/color-correction-hsv.c    2011-11-11 
15:03:47.233921332 +0100
-@@ -15,7 +15,7 @@
-  *
-  */
- 
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include <stdio.h>
- 
-diff -Npur release/plugins.orig/sequence/color-correction-yuv.c 
release/plugins/sequence/color-correction-yuv.c
---- release/plugins.orig/sequence/color-correction-yuv.c       2011-11-11 
15:00:26.339924887 +0100
-+++ release/plugins/sequence/color-correction-yuv.c    2011-11-11 
15:02:10.446923031 +0100
-@@ -15,7 +15,7 @@
-  *
-  */
- 
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include <stdio.h>
- 
-diff -Npur release/plugins.orig/sequence/dnr.c release/plugins/sequence/dnr.c
---- release/plugins.orig/sequence/dnr.c        2011-11-11 15:00:26.339924887 
+0100
-+++ release/plugins/sequence/dnr.c     2011-11-11 15:03:30.049921648 +0100
-@@ -15,7 +15,7 @@
-  *
-  */
- 
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include <stdio.h>
- 
-diff -Npur release/plugins.orig/sequence/gamma.c 
release/plugins/sequence/gamma.c
---- release/plugins.orig/sequence/gamma.c      2011-11-11 15:00:26.339924887 
+0100
-+++ release/plugins/sequence/gamma.c   2011-11-11 15:01:58.982923268 +0100
-@@ -15,7 +15,7 @@
-  *
-  */
- 
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include "util.h"
- #include <stdio.h>
-diff -Npur release/plugins.orig/texture/clouds2.c 
release/plugins/texture/clouds2.c
---- release/plugins.orig/texture/clouds2.c     2011-11-11 15:00:26.339924887 
+0100
-+++ release/plugins/texture/clouds2.c  2011-11-11 15:02:23.104922789 +0100
-@@ -27,7 +27,7 @@
-  * ***** END GPL LICENSE BLOCK *****
-  */
-  
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- 
- /* ******************** GLOBAL VARIABLES ***************** */
-diff -Npur release/plugins.orig/texture/tiles.c 
release/plugins/texture/tiles.c
---- release/plugins.orig/texture/tiles.c       2011-11-11 15:00:26.339924887 
+0100
-+++ release/plugins/texture/tiles.c    2011-11-11 15:04:05.749921038 +0100
-@@ -27,7 +27,7 @@
-  * ***** END GPL LICENSE BLOCK *****
-  */
- 
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- 
- /* ******************** GLOBAL VARIABLES ***************** */
diff --git a/graphics/blender/blender-2.60-openjpeg.patch 
b/graphics/blender/blender-2.60-openjpeg.patch
deleted file mode 100644
index 74f6441..0000000
--- a/graphics/blender/blender-2.60-openjpeg.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Npur blender-2.60a.orig/extern/libredcode/SConscript 
blender-2.60a/extern/libredcode/SConscript
---- blender-2.60a.orig/extern/libredcode/SConscript    2011-11-09 
23:05:16.241465491 +0100
-+++ blender-2.60a/extern/libredcode/SConscript 2011-11-09 23:06:24.188464236 
+0100
-@@ -7,7 +7,8 @@
- Import('env')
-
- sources = env.Glob('*.c')
--incs = '. ../libopenjpeg'
-+#incs = '. ../libopenjpeg'
-+incs = '. /usr/include'
-
- env.BlenderLib ( libname='extern_redcode', 
-                  sources=sources, includes=Split(incs),
-diff -Npur blender-2.60a.orig/extern/SConscript 
blender-2.60a/extern/SConscript
---- blender-2.60a.orig/extern/SConscript       2011-11-09 23:05:16.241465491 
+0100
-+++ blender-2.60a/extern/SConscript    2011-11-09 23:06:24.188464236 +0100
-@@ -11,8 +11,5 @@
- if env['WITH_BF_BULLET']:
-     SConscript(['bullet2/src/SConscript'])
-
--if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '':
--    SConscript(['libopenjpeg/SConscript'])
--
- if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
-     SConscript(['libredcode/SConscript'])
-diff -Npur blender-2.60a.orig/build_files/scons/tools/Blender.py 
blender-2.60a/build_files/scons/tools/Blender.py
---- blender-2.60a.orig/build_files/scons/tools/Blender.py      2011-11-09 
23:05:16.241465491 +0100
-+++ blender-2.60a/build_files/scons/tools/Blender.py   2011-11-09 
23:06:24.188464236 +0100
-@@ -246,6 +246,8 @@
-         syslibs += Split(lenv['BF_FFMPEG_LIB'])
-         if lenv['WITH_BF_OGG']:
-             syslibs += Split(lenv['BF_OGG_LIB'])
-+    if lenv['WITH_BF_OPENJPEG']:
-+        syslibs += Split(lenv['BF_OPENJPEG_LIB'])
-     if lenv['WITH_BF_JACK']:
-             syslibs += Split(lenv['BF_JACK_LIB'])
-     if lenv['WITH_BF_SNDFILE'] and not lenv['WITH_BF_STATICSNDFILE']:
diff --git a/graphics/blender/blender-2.60a-libav-0.7.patch 
b/graphics/blender/blender-2.60a-libav-0.7.patch
deleted file mode 100644
index 3bae020..0000000
--- a/graphics/blender/blender-2.60a-libav-0.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- blender-2.60a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp    
2011-10-24 20:09:01.000000000 +0200
-+++ blender-2.60a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-11-13 
12:34:01.000000000 +0100
-@@ -40,6 +40,8 @@
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
-+#include <libavutil/mathematics.h>
-+#include <libavutil/avstring.h>
- #include "ffmpeg_compat.h"
- }
- 
-@@ -57,10 +58,15 @@
- {
-       static const char* formats[] = { NULL, "ac3", "flac", "matroska", 
"mp2", "mp3", "ogg", "wav" };
- 
--      if(avformat_alloc_output_context2(&m_formatCtx, NULL, 
formats[format], filename.c_str()))
--              AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-+      m_formatCtx = avformat_alloc_context();
-+        if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error);
- 
--      m_outputFmt = m_formatCtx->oformat;
-+      av_strlcpy(m_formatCtx->filename, filename.c_str(), 
sizeof(m_formatCtx->filename));
-+      m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], 
filename.c_str(), NULL);
-+      if (!m_outputFmt) {
-+            avformat_free_context(m_formatCtx);
-+            AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-+        }
- 
-       switch(codec)
-       {
diff --git a/graphics/blender/blender-2.61-CVE-2009-3850.patch 
b/graphics/blender/blender-2.61-CVE-2009-3850.patch
deleted file mode 100644
index 06011bc..0000000
--- a/graphics/blender/blender-2.61-CVE-2009-3850.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff -ur blender-orig/source/blender/blenkernel/intern/blender.c 
blender-mod/source/blender/blenkernel/intern/blender.c
---- blender-orig/source/blender/blenkernel/intern/blender.c    2011-12-15 
17:30:08.668883213 -0600
-+++ blender-mod/source/blender/blenkernel/intern/blender.c     2011-12-15 
17:47:04.626925437 -0600
-@@ -144,6 +144,7 @@
-       G.f |= G_SCRIPT_AUTOEXEC;
- #else
-       G.f &= ~G_SCRIPT_AUTOEXEC;
-+      G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC 
on from user prefs */
- #endif
- }
- 
-Only in blender-mod/source/blender/blenkernel/intern: blender.c.orig
-diff -ur blender-orig/source/blender/makesrna/intern/rna_userdef.c 
blender-mod/source/blender/makesrna/intern/rna_userdef.c
---- blender-orig/source/blender/makesrna/intern/rna_userdef.c  2011-12-15 
17:30:08.246883195 -0600
-+++ blender-mod/source/blender/makesrna/intern/rna_userdef.c   2011-12-15 
17:47:04.626925437 -0600
-@@ -114,9 +114,17 @@
- 
- static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene 
*UNUSED(scene), PointerRNA *ptr)
- {
--      UserDef *userdef = (UserDef*)ptr->data;
--      if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)       G.f &= 
~G_SCRIPT_AUTOEXEC;
--      else                                                                  
                          G.f |=  G_SCRIPT_AUTOEXEC;
-+      if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+              /* Blender run with --enable-autoexec */
-+              UserDef *userdef = (UserDef*)ptr->data;
-+              if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)       G.f 
&= ~G_SCRIPT_AUTOEXEC;
-+              else                                                          
                                  G.f |=  G_SCRIPT_AUTOEXEC;
-+      }
-+}
-+
-+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, 
PointerRNA *ptr) {
-+      /* Disable "Auto Run Python Scripts" checkbox unless Blender run with 
--enable-autoexec */
-+      return !(G.f & G_SCRIPT_OVERRIDE_PREF);
- }
- 
- static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA 
*ptr)
-@@ -2729,6 +2737,8 @@
-                                "Allow any .blend file to run scripts 
automatically "
-                                "(unsafe with blend files from an untrusted 
source)");
-       RNA_def_property_update(prop, 0, 
"rna_userdef_script_autoexec_update");
-+      /* Disable "Auto Run Python Scripts" checkbox unless Blender run with 
--enable-autoexec */
-+      RNA_def_property_editable_func(prop, 
"rna_userdef_script_autoexec_editable");
- 
-       prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, 
PROP_NONE);
-       RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", 
USER_TXT_TABSTOSPACES_DISABLE);
-Only in blender-mod/source/blender/makesrna/intern: rna_userdef.c.orig
-diff -ur blender-orig/source/blender/windowmanager/intern/wm_files.c 
blender-mod/source/blender/windowmanager/intern/wm_files.c
---- blender-orig/source/blender/windowmanager/intern/wm_files.c        
2011-12-15 17:30:08.275883196 -0600
-+++ blender-mod/source/blender/windowmanager/intern/wm_files.c 2011-12-15 
17:49:09.061930590 -0600
-@@ -286,13 +286,18 @@
- 
-       /* set the python auto-execute setting from user prefs */
-       /* enabled by default, unless explicitly enabled in the command line 
which overrides */
--      if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+      if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) {
-+              /* Blender run with --enable-autoexec */
-               if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |=  
G_SCRIPT_AUTOEXEC;
-               else                                                          
                            G.f &= ~G_SCRIPT_AUTOEXEC;
-       }
- 
-       /* update tempdir from user preferences */
-       BLI_init_temporary_dir(U.tempdir);
-+
-+      /* Workaround to fix default of "Auto Run Python Scripts" checkbox */
-+      if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC))
-+              U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE;
- }
- 
- 
-Only in blender-mod/source/blender/windowmanager/intern: wm_files.c.orig
-Only in blender-mod/source/blender/windowmanager/intern: wm_files.c.rej
-diff -ur blender-orig/source/blender/windowmanager/intern/wm_operators.c 
blender-mod/source/blender/windowmanager/intern/wm_operators.c
---- blender-orig/source/blender/windowmanager/intern/wm_operators.c    
2011-12-15 17:30:08.275883196 -0600
-+++ blender-mod/source/blender/windowmanager/intern/wm_operators.c     
2011-12-15 17:47:04.627925429 -0600
-@@ -1601,12 +1601,13 @@
-               G.fileflags &= ~G_FILE_NO_UI;
-       else
-               G.fileflags |= G_FILE_NO_UI;
--              
--      if(RNA_boolean_get(op->ptr, "use_scripts"))
-+
-+      /* Restrict "Trusted Source" mode to Blender in --enable-autoexec 
mode */
-+      if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & 
G_SCRIPT_OVERRIDE_PREF)))
-               G.f |= G_SCRIPT_AUTOEXEC;
-       else
-               G.f &= ~G_SCRIPT_AUTOEXEC;
--      
-+
-       // XXX wm in context is not set correctly after WM_read_file -> crash
-       // do it before for now, but is this correct with multiple windows?
-       WM_event_add_notifier(C, NC_WINDOW, NULL);
-@@ -1618,6 +1619,8 @@
- 
- static void WM_OT_open_mainfile(wmOperatorType *ot)
- {
-+      PropertyRNA * use_scripts_checkbox = NULL;
-+
-       ot->name= "Open Blender File";
-       ot->idname= "WM_OT_open_mainfile";
-       ot->description="Open a Blender file";
-@@ -1629,7 +1632,12 @@
-       WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, 
FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH);
- 
-       RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user 
interface setup in the .blend file");
--      RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow 
blend file execute scripts automatically, default available from system 
preferences");
-+      use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts",
-+                      !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source",
-+                      "Allow blend file execute scripts automatically, 
default available from system preferences");
-+      /* Disable "Trusted Source" checkbox unless Blender run with 
--enable-autoexec */
-+      if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF))
-+              RNA_def_property_clear_flag(use_scripts_checkbox, 
PROP_EDITABLE);
- }
- 
- /* **************** link/append *************** */
-Only in blender-mod/source/blender/windowmanager/intern: wm_operators.c.orig
-diff -ur blender-orig/source/creator/creator.c 
blender-mod/source/creator/creator.c
---- blender-orig/source/creator/creator.c      2011-12-15 17:30:08.076883188 
-0600
-+++ blender-mod/source/creator/creator.c       2011-12-15 17:47:04.628925424 
-0600
-@@ -262,6 +262,7 @@
- 
-       printf("\n");
- 
-+      BLI_argsPrintArgDoc(ba, "-666");
-       BLI_argsPrintArgDoc(ba, "--enable-autoexec");
-       BLI_argsPrintArgDoc(ba, "--disable-autoexec");
- 
-@@ -330,14 +331,14 @@
- static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void 
*UNUSED(data))
- {
-       G.f |= G_SCRIPT_AUTOEXEC;
--      G.f |= G_SCRIPT_OVERRIDE_PREF;
-+      G.f &= ~G_SCRIPT_OVERRIDE_PREF;  /* Enables turning G_SCRIPT_AUTOEXEC 
off from user prefs */
-       return 0;
- }
- 
- static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void 
*UNUSED(data))
- {
-       G.f &= ~G_SCRIPT_AUTOEXEC;
--      G.f |= G_SCRIPT_OVERRIDE_PREF;
-+      G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC 
on from user prefs */
-       return 0;
- }
- 
-@@ -1042,6 +1043,7 @@
- #  define     PY_DISABLE_AUTO ", (compiled as non-standard default)"
- #endif
- 
-+      BLI_argsAdd(ba, 1, NULL, "-666", "\n\tEnable automatic python script 
execution (port from CVE-2009-3850 patch to Blender 2.60a)" PY_ENABLE_AUTO, 
enable_python, NULL);
-       BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic 
python script execution" PY_ENABLE_AUTO, enable_python, NULL);
-       BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic 
python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, 
disable_python, NULL);
- 
-Only in blender-mod/source/creator: creator.c.orig
diff --git a/graphics/blender/blender-2.61-desktop.patch 
b/graphics/blender/blender-2.61-desktop.patch
deleted file mode 100644
index dc89ae6..0000000
--- a/graphics/blender/blender-2.61-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- release/freedesktop/blender.desktop   2010-09-12 00:05:51.000000000 -0700
-+++ release/freedesktop/blender.desktop   2010-09-12 00:07:32.000000000 -0700
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Blender
-+Name=Blender-2.61
- GenericName=3D modeller
- GenericName[es]=modelador 3D
- GenericName[de]=3D Modellierer
-@@ -7,8 +7,8 @@
- GenericName[ru]=Редактор 3D-моделей
- Comment=3D modeling, animation, rendering and post-production
- Comment[es]=modelado 3D, animación, renderizado y post-producción
--Exec=blender
--Icon=blender
-+Exec=blender-2.61
-+Icon=blender-2.61
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/graphics/blender/blender-2.61-eigen.patch 
b/graphics/blender/blender-2.61-eigen.patch
deleted file mode 100644
index 538cac4..0000000
--- a/graphics/blender/blender-2.61-eigen.patch
+++ /dev/null
@@ -1,521 +0,0 @@
-diff -ur blender-orig/extern/libmv/bundle.sh 
blender-mod/extern/libmv/bundle.sh
---- blender-orig/extern/libmv/bundle.sh        2011-12-15 17:30:07.558883167 
-0600
-+++ blender-mod/extern/libmv/bundle.sh 2011-12-15 18:32:09.990037815 -0600
-@@ -116,7 +116,7 @@
- 
- set(INC
-       .
--      ../Eigen3
-+      /usr/include/eigen3
-       ./third_party/ssba
-       ./third_party/ldl/Include
-       ../colamd/Include
-@@ -224,7 +224,7 @@
- src = env.Glob("*.cpp")
- $src
- 
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
- 
-diff -ur blender-orig/extern/libmv/CMakeLists.txt 
blender-mod/extern/libmv/CMakeLists.txt
---- blender-orig/extern/libmv/CMakeLists.txt   2011-12-15 17:30:07.536883165 
-0600
-+++ blender-mod/extern/libmv/CMakeLists.txt    2011-12-15 18:31:09.944035320 
-0600
-@@ -24,7 +24,7 @@
- 
- set(INC
-       .
--      ../Eigen3
-+      /usr/include/eigen3
-       third_party/ssba
-       third_party/ldl/Include
-       ../colamd/Include
-diff -ur blender-orig/extern/libmv/SConscript 
blender-mod/extern/libmv/SConscript
---- blender-orig/extern/libmv/SConscript       2011-12-15 17:30:07.536883165 
-0600
-+++ blender-mod/extern/libmv/SConscript        2011-12-15 18:30:39.513034068 
-0600
-@@ -25,7 +25,7 @@
- src += env.Glob('third_party/ssba/Geometry/*.cpp')
- src += env.Glob('third_party/ssba/Math/*.cpp')
- 
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
- 
-diff -ur blender-orig/intern/itasc/CMakeLists.txt 
blender-mod/intern/itasc/CMakeLists.txt
---- blender-orig/intern/itasc/CMakeLists.txt   2011-12-15 17:30:09.145883233 
-0600
-+++ blender-mod/intern/itasc/CMakeLists.txt    2011-12-15 18:29:27.484031046 
-0600
-@@ -24,11 +24,11 @@
- # ***** END GPL LICENSE BLOCK *****
- 
- set(INC
--      ../../extern/Eigen3
-+      /usr/include/eigen3
- )
- 
- set(INC_SYS
--      
-+      /usr/include/eigen3
- )
- 
- set(SRC
-@@ -121,201 +121,201 @@
-       kdl/framevel.inl
- 
-       # until we have another user...
--      ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
--      ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
--      ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
--      ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h
--      ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
--      ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
--      ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
--      ../../extern/Eigen3/Eigen/src/misc/Kernel.h
--      ../../extern/Eigen3/Eigen/src/misc/Image.h
--      ../../extern/Eigen3/Eigen/src/misc/Solve.h
--      ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h
--      ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
--      ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
--      ../../extern/Eigen3/Eigen/src/StlSupport/details.h
--      ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h
--      ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
--      ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h
--      ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
--      ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
--      ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
--      ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
--      ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
--      ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
--      
../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
--      ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
--      ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
--      ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
--      ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
--      ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
--      ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
--      ../../extern/Eigen3/Eigen/src/Householder/Householder.h
--      ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
--      ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
--      ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h
--      ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
--      ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
--      ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
--      ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
--      ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
--      ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
--      ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
--      ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
--      ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h
--      ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h
--      ../../extern/Eigen3/Eigen/src/Geometry/Translation.h
--      ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
--      ../../extern/Eigen3/Eigen/src/Geometry/Transform.h
--      ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h
--      ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h
--      ../../extern/Eigen3/Eigen/src/LU/Determinant.h
--      ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
--      ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
--      ../../extern/Eigen3/Eigen/src/LU/Inverse.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrixBase.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseVector.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
--      ../../extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h
--      ../../extern/Eigen3/Eigen/src/Sparse/AmbiVector.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseDenseProduct.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseBlock.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseTriangularView.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
--      ../../extern/Eigen3/Eigen/src/Sparse/CoreIterators.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrix.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseAssign.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseSparseProduct.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseDot.h
--      ../../extern/Eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseRedux.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseFuzzy.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseView.h
--      ../../extern/Eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseUtil.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseTranspose.h
--      ../../extern/Eigen3/Eigen/src/Sparse/SparseProduct.h
--      ../../extern/Eigen3/Eigen/src/Sparse/CompressedStorage.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
--      
../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
--      ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
--      ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
--      ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h
--      ../../extern/Eigen3/Eigen/src/Core/Swap.h
--      ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
--      ../../extern/Eigen3/Eigen/src/Core/DenseBase.h
--      ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
--      ../../extern/Eigen3/Eigen/src/Core/ProductBase.h
--      ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
--      ../../extern/Eigen3/Eigen/src/Core/Stride.h
--      ../../extern/Eigen3/Eigen/src/Core/Matrix.h
--      ../../extern/Eigen3/Eigen/src/Core/Visitor.h
--      ../../extern/Eigen3/Eigen/src/Core/Array.h
--      ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h
--      ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
--      ../../extern/Eigen3/Eigen/src/Core/EigenBase.h
--      ../../extern/Eigen3/Eigen/src/Core/Random.h
--      ../../extern/Eigen3/Eigen/src/Core/Redux.h
--      ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
--      ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
--      ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
--      ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
--      ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
--      ../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
--      ../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h
--      ../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
--      ../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h
--      ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
--      ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
--      ../../extern/Eigen3/Eigen/src/Core/util/Memory.h
--      ../../extern/Eigen3/Eigen/src/Core/util/Meta.h
--      ../../extern/Eigen3/Eigen/src/Core/util/Constants.h
--      ../../extern/Eigen3/Eigen/src/Core/util/Macros.h
--      ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
--      ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
--      ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
--      ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h
--      ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
--      ../../extern/Eigen3/Eigen/src/Core/Transpositions.h
--      ../../extern/Eigen3/Eigen/src/Core/Select.h
--      ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h
--      ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
--      ../../extern/Eigen3/Eigen/src/Core/Dot.h
--      ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
--      ../../extern/Eigen3/Eigen/src/Core/Product.h
--      ../../extern/Eigen3/Eigen/src/Core/Transpose.h
--      ../../extern/Eigen3/Eigen/src/Core/Block.h
--      ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
--      ../../extern/Eigen3/Eigen/src/Core/MapBase.h
--      ../../extern/Eigen3/Eigen/src/Core/NoAlias.h
--      ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
--      ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
--      ../../extern/Eigen3/Eigen/src/Core/IO.h
--      ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
--      ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
--      ../../extern/Eigen3/Eigen/src/Core/Reverse.h
--      ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h
--      ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h
--      ../../extern/Eigen3/Eigen/src/Core/StableNorm.h
--      ../../extern/Eigen3/Eigen/src/Core/NumTraits.h
--      ../../extern/Eigen3/Eigen/src/Core/Map.h
--      ../../extern/Eigen3/Eigen/src/Core/Functors.h
--      ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
--      ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
--      ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
--      ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h
--      ../../extern/Eigen3/Eigen/src/Core/NestByValue.h
--      ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
--      ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h
--      ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h
--      ../../extern/Eigen3/Eigen/src/Core/Diagonal.h
--      ../../extern/Eigen3/Eigen/src/Core/Replicate.h
--      ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
--      ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
--      ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
--      ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
--      ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
--      ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
--      
../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
--      ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
--      ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
--      ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
--      ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
--      ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
--      ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
--      ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
--      ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
--      ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
--      ../../extern/Eigen3/Eigen/src/Core/Assign.h
--      ../../extern/Eigen3/Eigen/src/Core/Flagged.h
--      ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h
--      ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
-+      /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
-+      /usr/include/eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
-+      /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
-+      /usr/include/eigen3/Eigen/src/plugins/BlockMethods.h
-+      /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
-+      /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
-+      /usr/include/eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
-+      /usr/include/eigen3/Eigen/src/misc/Kernel.h
-+      /usr/include/eigen3/Eigen/src/misc/Image.h
-+      /usr/include/eigen3/Eigen/src/misc/Solve.h
-+      /usr/include/eigen3/Eigen/src/QR/HouseholderQR.h
-+      /usr/include/eigen3/Eigen/src/QR/ColPivHouseholderQR.h
-+      /usr/include/eigen3/Eigen/src/QR/FullPivHouseholderQR.h
-+      /usr/include/eigen3/Eigen/src/StlSupport/details.h
-+      /usr/include/eigen3/Eigen/src/StlSupport/StdList.h
-+      /usr/include/eigen3/Eigen/src/StlSupport/StdDeque.h
-+      /usr/include/eigen3/Eigen/src/StlSupport/StdVector.h
-+      /usr/include/eigen3/Eigen/src/SVD/UpperBidiagonalization.h
-+      /usr/include/eigen3/Eigen/src/SVD/JacobiSVD.h
-+      /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
-+      /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
-+      /usr/include/eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
-+      /usr/include/eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
-+      
/usr/include/eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
-+      /usr/include/eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
-+      /usr/include/eigen3/Eigen/src/Eigenvalues/RealSchur.h
-+      /usr/include/eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
-+      /usr/include/eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
-+      /usr/include/eigen3/Eigen/src/Eigenvalues/EigenSolver.h
-+      /usr/include/eigen3/Eigen/src/Jacobi/Jacobi.h
-+      /usr/include/eigen3/Eigen/src/Householder/Householder.h
-+      /usr/include/eigen3/Eigen/src/Householder/BlockHouseholder.h
-+      /usr/include/eigen3/Eigen/src/Householder/HouseholderSequence.h
-+      /usr/include/eigen3/Eigen/src/Geometry/RotationBase.h
-+      /usr/include/eigen3/Eigen/src/Geometry/Rotation2D.h
-+      /usr/include/eigen3/Eigen/src/Geometry/Homogeneous.h
-+      /usr/include/eigen3/Eigen/src/Geometry/Hyperplane.h
-+      /usr/include/eigen3/Eigen/src/Geometry/EulerAngles.h
-+      /usr/include/eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
-+      /usr/include/eigen3/Eigen/src/Geometry/ParametrizedLine.h
-+      /usr/include/eigen3/Eigen/src/Geometry/OrthoMethods.h
-+      /usr/include/eigen3/Eigen/src/Geometry/AngleAxis.h
-+      /usr/include/eigen3/Eigen/src/Geometry/Umeyama.h
-+      /usr/include/eigen3/Eigen/src/Geometry/Scaling.h
-+      /usr/include/eigen3/Eigen/src/Geometry/Translation.h
-+      /usr/include/eigen3/Eigen/src/Geometry/AlignedBox.h
-+      /usr/include/eigen3/Eigen/src/Geometry/Transform.h
-+      /usr/include/eigen3/Eigen/src/Geometry/Quaternion.h
-+      /usr/include/eigen3/Eigen/src/LU/PartialPivLU.h
-+      /usr/include/eigen3/Eigen/src/LU/Determinant.h
-+      /usr/include/eigen3/Eigen/src/LU/arch/Inverse_SSE.h
-+      /usr/include/eigen3/Eigen/src/LU/FullPivLU.h
-+      /usr/include/eigen3/Eigen/src/LU/Inverse.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseMatrixBase.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseVector.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
-+      /usr/include/eigen3/Eigen/src/Sparse/TriangularSolver.h
-+      /usr/include/eigen3/Eigen/src/Sparse/AmbiVector.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseDenseProduct.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseBlock.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseTriangularView.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-+      /usr/include/eigen3/Eigen/src/Sparse/CoreIterators.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseMatrix.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseAssign.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseSparseProduct.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseDot.h
-+      /usr/include/eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseRedux.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseFuzzy.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseView.h
-+      /usr/include/eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseUtil.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseTranspose.h
-+      /usr/include/eigen3/Eigen/src/Sparse/SparseProduct.h
-+      /usr/include/eigen3/Eigen/src/Sparse/CompressedStorage.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Cwise.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/QR.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Lazy.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Memory.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/SVD.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/VectorBlock.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Meta.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Macros.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/LeastSquares.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/LU.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Block.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
-+      
/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/All.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/Minor.h
-+      /usr/include/eigen3/Eigen/src/Eigen2Support/MathFunctions.h
-+      /usr/include/eigen3/Eigen/src/Core/SelfAdjointView.h
-+      /usr/include/eigen3/Eigen/src/Core/MatrixBase.h
-+      /usr/include/eigen3/Eigen/src/Core/Swap.h
-+      /usr/include/eigen3/Eigen/src/Core/DenseCoeffsBase.h
-+      /usr/include/eigen3/Eigen/src/Core/DenseBase.h
-+      /usr/include/eigen3/Eigen/src/Core/GlobalFunctions.h
-+      /usr/include/eigen3/Eigen/src/Core/ProductBase.h
-+      /usr/include/eigen3/Eigen/src/Core/CwiseBinaryOp.h
-+      /usr/include/eigen3/Eigen/src/Core/Stride.h
-+      /usr/include/eigen3/Eigen/src/Core/Matrix.h
-+      /usr/include/eigen3/Eigen/src/Core/Visitor.h
-+      /usr/include/eigen3/Eigen/src/Core/Array.h
-+      /usr/include/eigen3/Eigen/src/Core/ReturnByValue.h
-+      /usr/include/eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
-+      /usr/include/eigen3/Eigen/src/Core/EigenBase.h
-+      /usr/include/eigen3/Eigen/src/Core/Random.h
-+      /usr/include/eigen3/Eigen/src/Core/Redux.h
-+      /usr/include/eigen3/Eigen/src/Core/arch/Default/Settings.h
-+      /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
-+      /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
-+      /usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
-+      /usr/include/eigen3/Eigen/src/Core/arch/NEON/Complex.h
-+      /usr/include/eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
-+      /usr/include/eigen3/Eigen/src/Core/arch/SSE/Complex.h
-+      /usr/include/eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
-+      /usr/include/eigen3/Eigen/src/Core/BooleanRedux.h
-+      /usr/include/eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
-+      /usr/include/eigen3/Eigen/src/Core/util/BlasUtil.h
-+      /usr/include/eigen3/Eigen/src/Core/util/Memory.h
-+      /usr/include/eigen3/Eigen/src/Core/util/Meta.h
-+      /usr/include/eigen3/Eigen/src/Core/util/Constants.h
-+      /usr/include/eigen3/Eigen/src/Core/util/Macros.h
-+      /usr/include/eigen3/Eigen/src/Core/util/ForwardDeclarations.h
-+      /usr/include/eigen3/Eigen/src/Core/util/StaticAssert.h
-+      /usr/include/eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
-+      /usr/include/eigen3/Eigen/src/Core/util/XprHelper.h
-+      /usr/include/eigen3/Eigen/src/Core/VectorBlock.h
-+      /usr/include/eigen3/Eigen/src/Core/Transpositions.h
-+      /usr/include/eigen3/Eigen/src/Core/Select.h
-+      /usr/include/eigen3/Eigen/src/Core/BandMatrix.h
-+      /usr/include/eigen3/Eigen/src/Core/CwiseUnaryView.h
-+      /usr/include/eigen3/Eigen/src/Core/Dot.h
-+      /usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h
-+      /usr/include/eigen3/Eigen/src/Core/Product.h
-+      /usr/include/eigen3/Eigen/src/Core/Transpose.h
-+      /usr/include/eigen3/Eigen/src/Core/Block.h
-+      /usr/include/eigen3/Eigen/src/Core/ArrayWrapper.h
-+      /usr/include/eigen3/Eigen/src/Core/MapBase.h
-+      /usr/include/eigen3/Eigen/src/Core/NoAlias.h
-+      /usr/include/eigen3/Eigen/src/Core/ForceAlignedAccess.h
-+      /usr/include/eigen3/Eigen/src/Core/PlainObjectBase.h
-+      /usr/include/eigen3/Eigen/src/Core/IO.h
-+      /usr/include/eigen3/Eigen/src/Core/DiagonalMatrix.h
-+      /usr/include/eigen3/Eigen/src/Core/CwiseUnaryOp.h
-+      /usr/include/eigen3/Eigen/src/Core/Reverse.h
-+      /usr/include/eigen3/Eigen/src/Core/Fuzzy.h
-+      /usr/include/eigen3/Eigen/src/Core/DenseStorage.h
-+      /usr/include/eigen3/Eigen/src/Core/StableNorm.h
-+      /usr/include/eigen3/Eigen/src/Core/NumTraits.h
-+      /usr/include/eigen3/Eigen/src/Core/Map.h
-+      /usr/include/eigen3/Eigen/src/Core/Functors.h
-+      /usr/include/eigen3/Eigen/src/Core/PermutationMatrix.h
-+      /usr/include/eigen3/Eigen/src/Core/ArrayBase.h
-+      /usr/include/eigen3/Eigen/src/Core/CwiseNullaryOp.h
-+      /usr/include/eigen3/Eigen/src/Core/SolveTriangular.h
-+      /usr/include/eigen3/Eigen/src/Core/NestByValue.h
-+      /usr/include/eigen3/Eigen/src/Core/DiagonalProduct.h
-+      /usr/include/eigen3/Eigen/src/Core/CommaInitializer.h
-+      /usr/include/eigen3/Eigen/src/Core/MathFunctions.h
-+      /usr/include/eigen3/Eigen/src/Core/Diagonal.h
-+      /usr/include/eigen3/Eigen/src/Core/Replicate.h
-+      /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
-+      /usr/include/eigen3/Eigen/src/Core/products/SelfadjointProduct.h
-+      /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
-+      /usr/include/eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
-+      /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
-+      /usr/include/eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
-+      
/usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
-+      /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
-+      /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
-+      /usr/include/eigen3/Eigen/src/Core/products/Parallelizer.h
-+      /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
-+      /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverVector.h
-+      /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
-+      /usr/include/eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
-+      /usr/include/eigen3/Eigen/src/Core/TriangularMatrix.h
-+      /usr/include/eigen3/Eigen/src/Core/VectorwiseOp.h
-+      /usr/include/eigen3/Eigen/src/Core/Assign.h
-+      /usr/include/eigen3/Eigen/src/Core/Flagged.h
-+      /usr/include/eigen3/Eigen/src/Cholesky/LDLT.h
-+      /usr/include/eigen3/Eigen/src/Cholesky/LLT.h
- )
- 
- if(WIN32)
-diff -ur blender-orig/intern/itasc/SConscript 
blender-mod/intern/itasc/SConscript
---- blender-orig/intern/itasc/SConscript       2011-12-15 17:30:09.145883233 
-0600
-+++ blender-mod/intern/itasc/SConscript        2011-12-15 18:29:27.484031046 
-0600
-@@ -5,7 +5,8 @@
- sources += env.Glob('kdl/*.cpp')
- sources += env.Glob('kdl/utilities/*.cpp')
- 
--incs = '. ../../extern/Eigen3'
-+#incs = '. ../../extern/Eigen3'
-+incs = '. /usr/include/eigen3'
- 
- defs = []
- 
-diff -ur blender-orig/source/blender/ikplugin/CMakeLists.txt 
blender-mod/source/blender/ikplugin/CMakeLists.txt
---- blender-orig/source/blender/ikplugin/CMakeLists.txt        2011-12-15 
17:30:08.276883196 -0600
-+++ blender-mod/source/blender/ikplugin/CMakeLists.txt 2011-12-15 
18:29:27.484031046 -0600
-@@ -49,7 +49,7 @@
- if(WITH_IK_ITASC)
-       add_definitions(-DWITH_IK_ITASC)
-       list(APPEND INC
--              ../../../extern/Eigen3
-+              /usr/include/eigen3
-               ../../../intern/itasc
-       )
-       list(APPEND SRC
-diff -ur blender-orig/source/blender/ikplugin/SConscript 
blender-mod/source/blender/ikplugin/SConscript
---- blender-orig/source/blender/ikplugin/SConscript    2011-12-15 
17:30:08.276883196 -0600
-+++ blender-mod/source/blender/ikplugin/SConscript     2011-12-15 
18:29:27.484031046 -0600
-@@ -4,7 +4,7 @@
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
- 
- incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna 
../blenlib'
--incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc 
#/extern/Eigen3'
-+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc 
/usr/include/eigen3'
- 
- defs.append('WITH_IK_ITASC')
- 
-diff -ur blender-orig/source/gameengine/Converter/CMakeLists.txt 
blender-mod/source/gameengine/Converter/CMakeLists.txt
---- blender-orig/source/gameengine/Converter/CMakeLists.txt    2011-12-15 
17:30:08.812883219 -0600
-+++ blender-mod/source/gameengine/Converter/CMakeLists.txt     2011-12-15 
18:29:27.484031046 -0600
-@@ -50,7 +50,7 @@
-       ../../blender/makesrna
-       ../../blender/windowmanager
-       ../../../extern/bullet2/src
--      ../../../extern/Eigen3
-+      /usr/include/eigen3
-       ../../../intern/container
-       ../../../intern/guardedalloc
-       ../../../intern/moto/include
-diff -ur blender-orig/source/gameengine/Converter/SConscript 
blender-mod/source/gameengine/Converter/SConscript
---- blender-orig/source/gameengine/Converter/SConscript        2011-12-15 
17:30:08.825883219 -0600
-+++ blender-mod/source/gameengine/Converter/SConscript 2011-12-15 
18:29:27.485031053 -0600
-@@ -21,7 +21,8 @@
- incs += ' #source/blender/makesrna'
- incs += ' #source/blender/ikplugin'
- incs += ' #extern/recastnavigation/Detour/Include'
--incs += ' #extern/Eigen3'
-+#incs += ' #extern/Eigen3'
-+incs += ' /usr/include/eigen3'
- 
- incs += ' ' + env['BF_BULLET_INC']
- 
diff --git a/graphics/blender/blender-2.61-enable_site_module.patch 
b/graphics/blender/blender-2.61-enable_site_module.patch
deleted file mode 100644
index d791257..0000000
--- a/graphics/blender/blender-2.61-enable_site_module.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur blender-2.61/source/blender/python/intern/bpy_interface.c 
blender-mod/source/blender/python/intern/bpy_interface.c
---- blender-2.61/source/blender/python/intern/bpy_interface.c  2011-12-13 
13:48:28.000000000 -0600
-+++ blender-mod/source/blender/python/intern/bpy_interface.c   2011-12-15 
17:26:50.986874961 -0600
-@@ -219,11 +219,6 @@
-        * blender is utf-8 too - campbell */
-       BLI_setenv("PYTHONIOENCODING", "utf-8:surrogateescape");
- 
--      /* Python 3.2 now looks for 
'2.xx/python/include/python3.2d/pyconfig.h' to
--       * parse from the 'sysconfig' module which is used by 'site',
--       * so for now disable site. alternatively we could copy the file. */
--      Py_NoSiteFlag= 1;
--
-       Py_Initialize();
- 
-       // PySys_SetArgv(argc, argv); // broken in py3, not a huge deal
-diff -ur blender-2.61/source/gameengine/Ketsji/KX_PythonInit.cpp 
blender-mod/source/gameengine/Ketsji/KX_PythonInit.cpp
---- blender-2.61/source/gameengine/Ketsji/KX_PythonInit.cpp    2011-12-13 
13:47:26.000000000 -0600
-+++ blender-mod/source/gameengine/Ketsji/KX_PythonInit.cpp     2011-12-15 
17:27:41.464877092 -0600
-@@ -1823,7 +1823,6 @@
-       STR_String pname = progname;
-       Py_SetProgramName(pname.Ptr());
- #endif
--      Py_NoSiteFlag=1;
-       Py_FrozenFlag=1;
- 
-       /* must run before python initializes */
-@@ -1896,7 +1895,6 @@
-       STR_String pname = progname;
-       Py_SetProgramName(pname.Ptr());
- #endif
--      Py_NoSiteFlag=1;
-       Py_FrozenFlag=1;
- 
-       initPyTypes();
diff --git a/graphics/blender/blender-2.61-glew.patch 
b/graphics/blender/blender-2.61-glew.patch
deleted file mode 100644
index 1e31b52..0000000
--- a/graphics/blender/blender-2.61-glew.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur blender-2.61/CMakeLists.txt blender-mod/CMakeLists.txt
---- blender-2.61/CMakeLists.txt        2011-12-13 13:57:52.000000000 -0600
-+++ blender-mod/CMakeLists.txt 2011-12-15 16:43:02.083765807 -0600
-@@ -156,7 +156,7 @@
- 
- if(UNIX AND NOT APPLE)
-       option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode 
input)"   ON)
--      option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled 
with blender" ON)
-+      option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled 
with blender" OFF)     
-       option(WITH_XDG_USER_DIRS    "Build with XDG Base Directory 
Specification (only config and documents for now)" OFF)
-       mark_as_advanced(WITH_XDG_USER_DIRS)
- else()
-diff -ur blender-2.61/extern/CMakeLists.txt blender-mod/extern/CMakeLists.txt
---- blender-2.61/extern/CMakeLists.txt 2011-12-13 13:57:20.000000000 -0600
-+++ blender-mod/extern/CMakeLists.txt  2011-12-15 16:40:53.775760453 -0600
-@@ -40,10 +40,6 @@
-       add_subdirectory(binreloc)
- endif()
- 
--if(WITH_BUILTIN_GLEW)
--      add_subdirectory(glew)
--endif()
--
- if(WITH_GAMEENGINE)
-    add_subdirectory(recastnavigation)
- endif()
-diff -ur blender-2.61/extern/SConscript blender-mod/extern/SConscript
---- blender-2.61/extern/SConscript     2011-12-13 13:57:20.000000000 -0600
-+++ blender-mod/extern/SConscript      2011-12-15 16:39:52.497757875 -0600
-@@ -2,7 +2,6 @@
- 
- Import('env')
- 
--SConscript(['glew/SConscript'])
- SConscript(['colamd/SConscript'])
- 
- if env['WITH_BF_GAMEENGINE']:
-diff -ur blender-2.61/source/blender/editors/include/BIF_gl.h 
blender-mod/source/blender/editors/include/BIF_gl.h
---- blender-2.61/source/blender/editors/include/BIF_gl.h       2011-12-13 
13:52:45.000000000 -0600
-+++ blender-mod/source/blender/editors/include/BIF_gl.h        2011-12-15 
16:41:59.989763237 -0600
-@@ -33,7 +33,7 @@
- #ifndef BIF_GL_H
- #define BIF_GL_H
- 
--#include "GL/glew.h"
-+#include <GL/glew.h>
- 
-       /*
-        * these should be phased out. cpack should be replaced in
diff --git a/graphics/blender/blender-2.62.tar.gz.sig 
b/graphics/blender/blender-2.62.tar.gz.sig
deleted file mode 100644
index 992a0c7..0000000
Binary files a/graphics/blender/blender-2.62.tar.gz.sig and /dev/null differ
diff --git a/graphics/openexr/CONFLICTS b/graphics/openexr/CONFLICTS
new file mode 100755
index 0000000..39a7966
--- /dev/null
+++ b/graphics/openexr/CONFLICTS
@@ -0,0 +1,3 @@
+# Uses installed headers in build, breaking on version updates.
+# Stupid.
+conflicts $SPELL y
diff --git a/graphics/openexr/HISTORY b/graphics/openexr/HISTORY
index aad91ee..84129b5 100644
--- a/graphics/openexr/HISTORY
+++ b/graphics/openexr/HISTORY
@@ -1,3 +1,8 @@
+2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+       * UP_TRIGGERS: binary incompatible update, check dependees
+       * CONFLICTS: 2.2 build fails if 2.1 installed, so add this
+         to the list of braindead builds
+
 2015-04-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.2.0
        * DEPENDS: depend on gcc with CXX
diff --git a/graphics/openexr/UP_TRIGGERS b/graphics/openexr/UP_TRIGGERS
new file mode 100755
index 0000000..a977652
--- /dev/null
+++ b/graphics/openexr/UP_TRIGGERS
@@ -0,0 +1,4 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+# 2.1.x -> 2.2.0 changes ABI
+# Be prepared for that on any non-bugfix change.
+check_dependees_on_update $SPELL $VERSION cut -d . -f 1,2
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 164a0c1..16a7833 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -52,45 +52,56 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
  LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
     . $LINUX_DIRECTORY/latest.defaults
 
-    if  [[  $(uname -r)  =  3.*  ]];  then
+    case $(uname -r) in
+       2.*)
+ HEADERS_VERSION=$(echo $LATEST_maintenance_patches | sed "s/patch-//")
+ HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_2_6}
+         SOURCE3=linux-${LATEST_2_6}.tar.bz2
+         SOURCE6="${SOURCE3}.sign"
+    HEADERS_VDIR=v2.6
+         ;;
+       3.*)
  HEADERS_VERSION=$(echo $LATEST_maintenance_patches_3 | sed "s/patch-//")
  HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_3}
          SOURCE3=linux-${LATEST_3}.tar.xz
-     SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE3}"
-      case $HEADERS_VERSION in
-        3.[1-9]*)
-         SOURCE6="linux-${LATEST_3}.tar.sign"
-     SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE6}"
-                ;;
-               *)
+      if [[ $HEADERS_VERSION = 3.0* ]]; then
          SOURCE6="${SOURCE3}.sign"
-     SOURCE6_URL="${SOURCE3_URL}.sign"
-                ;;
-      esac
-  SOURCE6_IGNORE=signature
-     SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
+      else
+         SOURCE6="linux-${LATEST_3}.tar.sign"
+      fi
+    HEADERS_VDIR=v3.x
       if [[ ${HEADERS_VERSION} != $LATEST_3 ]]; then
          SOURCE7=patch-${HEADERS_VERSION}.xz
-     SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE7}"
         if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
          SOURCE8="patch-${HEADERS_VERSION}.sign"
-     SOURCE8_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE8}"
         else
          SOURCE8="${SOURCE7}.sign"
-     SOURCE8_URL="${SOURCE7_URL}.sign"
         fi
-  SOURCE8_IGNORE=signature
-     SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
       fi
-    else
- HEADERS_VERSION=$(echo $LATEST_maintenance_patches | sed "s/patch-//")
- HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_2_6}
-         SOURCE3=linux-${LATEST_2_6}.tar.bz2
-         SOURCE6="${SOURCE3}.sign"
-  SOURCE6_IGNORE=signature
+         ;;
+       4.*)
+ HEADERS_VERSION=$(echo $LATEST_maintenance_patches_4 | sed "s/patch-//")
+ HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_4}
+         SOURCE3=linux-${LATEST_4}.tar.xz
+         SOURCE6="linux-${LATEST_4}.tar.sign"
+    HEADERS_VDIR=v4.x
+      if [[ ${HEADERS_VERSION} != $LATEST_4 ]]; then
+         SOURCE7=patch-${HEADERS_VERSION}.xz
+         SOURCE8="patch-${HEADERS_VERSION}.sign"
+      fi
+         ;;
+    esac
+
      SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
-     SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE3}"
-     SOURCE6_URL="${SOURCE3_URL}.sign"
+     SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE3}"
+  SOURCE6_IGNORE=signature
+     SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE6}"
+
+    if [[ -n $SOURCE7 ]]; then
+     SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
+     SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE7}"
+  SOURCE8_IGNORE=signature
+     SOURCE8_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE8}"
     fi
   fi
 fi
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index ecc62d0..9353c50 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
+       * DETAILS, PREPARE, PRE_BUILD: support kernel headers 4.x
+
 2015-02-06 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 2.21, SECURITY_PATCH++, (CVE-2015-1472),
          (CVE-2014-7817). (CVE-2012-3406). (CVE-2014-9402)
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 3b664ef..b92b081 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -1,5 +1,7 @@
 . ${GRIMOIRE}/FUNCTIONS &&
-if  [[  $(uname -r)  =  2.6.*  ]] || [[  $(uname -r)  =  3.*  ]];  then
+if     [[  $(uname -r)  =  2.6.*  ]] \
+    || [[  $(uname -r)  =  3.*  ]] \
+    || [[  $(uname -r)  =  4.*  ]];  then
   if  test  "$HOST" == "i386-pc-linux-gnu"; then
     message "[[ ${QUERY_COLOR}Not building with NPTL as that's unsupported 
on i386; use i486 or higher.${DEFAULT} ]]" &&
     config_set_option GLIBC_NPTL n
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index da03e83..16973e0 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -14,7 +14,11 @@ if  [  "$GLIBC_NPTL"  =  "y"  ];  then
   persistent_add  GLIBC_HEADERS_DIR                        &&
 
   case ${HEADERS_VERSION} in
-    3.[1-9]*)
+    2.*|3.0*)
+            GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2}
+            unpack_file 3 || return 1
+            ;;
+           *)
             GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.xz}
             message "${MESSAGE_COLOR}xz -d 
$SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
             xz -d -k $SOURCE_CACHE/$SOURCE3
@@ -25,13 +29,9 @@ if  [  "$GLIBC_NPTL"  =  "y"  ];  then
             rm $SOURCE_CACHE/$SOURCE3
             SOURCE3=$SOURCE3_ORI
             ;;
-           *)
-            GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2}
-            unpack_file 3 || return 1
-            ;;
   esac
     cd  $GLIBC_HEADERS_DIR &&
-    if [ ! -z $SOURCE7 ]; then
+    if [[ -n $SOURCE7 ]]; then
       if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
         message "${MESSAGE_COLOR}xz -d 
$SOURCE_CACHE/$SOURCE7${DEFAULT_COLOR}"
         xz -d -k ${SOURCE_CACHE}/$SOURCE7 &&
diff --git a/python-pypi/numpy/DETAILS b/python-pypi/numpy/DETAILS
index 83c4810..3b78ab2 100755
--- a/python-pypi/numpy/DETAILS
+++ b/python-pypi/numpy/DETAILS
@@ -1,6 +1,6 @@
            SPELL=numpy
-         VERSION=1.8.1
-     
SOURCE_HASH=sha512:2dfe7c114c304a4bd5c050738852fb5b13c54d3cfa04b39d72af96bac356182e3ea7f9979ebe370bdbc7108770c65c848275ff6b7ab11924da7d139e197f81da
+         VERSION=1.9.2
+     
SOURCE_HASH=sha512:bb100a75370d251df8e20b6470f0791d4137197dca34633fae4f40689721a39614b42ee2db2728b050c0b35d4f2746e6495d5614f82dd998c24ee5f43465b1bb
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=https://github.com/numpy/numpy/archive/v${VERSION}.tar.gz
diff --git a/python-pypi/numpy/HISTORY b/python-pypi/numpy/HISTORY
index b290b97..7c4d677 100644
--- a/python-pypi/numpy/HISTORY
+++ b/python-pypi/numpy/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: verison 1.9.2
+
 2014-05-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: verison 1.8.1, fix SOURCE_URL
 
diff --git a/shell-term-fm/tcsh/BUILD b/shell-term-fm/tcsh/BUILD
index 2b9ad5e..8363de3 100755
--- a/shell-term-fm/tcsh/BUILD
+++ b/shell-term-fm/tcsh/BUILD
@@ -1,4 +1,6 @@
 OPTS="--bindir=$INSTALL_ROOT/bin  \
       $OPTS"                      &&
 
+CFLAGS+=" -fno-builtin-malloc" &&
+
 default_build
diff --git a/shell-term-fm/tcsh/HISTORY b/shell-term-fm/tcsh/HISTORY
index b40a80c..15d4ee4 100644
--- a/shell-term-fm/tcsh/HISTORY
+++ b/shell-term-fm/tcsh/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
+       * BUILD: -fno-builtin-malloc prevents infinite loop with gcc5
+
 2015-01-12 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: updated spell to 6.18.01
 
diff --git a/utils/kbd/DEPENDS b/utils/kbd/DEPENDS
index 3861054..df928af 100755
--- a/utils/kbd/DEPENDS
+++ b/utils/kbd/DEPENDS
@@ -2,10 +2,13 @@ depends gnupg &&
 depends smgl-fhs &&
 depends autoconf &&
 depends automake &&
-depends check    &&
 
 optional_depends linux-pam "" "--disable-vlock"  "build vlock" &&
 optional_depends gettext \
                  "--enable-nls" \
                  "--disable-nls" \
-                 "for Native Language Support"
+                 "for Native Language Support" &&
+optional_depends check \
+                 "--enable-tests" \
+                 "--disable-tests" \
+                 "to build unit tests"
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index 1b32178..068489b 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,7 @@
+2015-04-25 Remko van der Vossen <wich AT sourcemage.org>
+       * PRE_BUILD, DEPENDS, kbd-2.0.0-tests.patch:
+         make check dependency optional, patch from Gentoo
+
 2014-09-03 Treeve Jelbert <treeve AT sourcemage.org
        * DETAILS: version 2.0.2
          download from KERNEL_URL
diff --git a/utils/kbd/PRE_BUILD b/utils/kbd/PRE_BUILD
new file mode 100755
index 0000000..d3aa27d
--- /dev/null
+++ b/utils/kbd/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch < "$SPELL_DIRECTORY"/kbd-2.0.0-tests.patch &&
+autoreconf -fi
diff --git a/utils/kbd/kbd-2.0.0-tests.patch b/utils/kbd/kbd-2.0.0-tests.patch
new file mode 100644
index 0000000..7a4e186
--- /dev/null
+++ b/utils/kbd/kbd-2.0.0-tests.patch
@@ -0,0 +1,31 @@
+--- configure.ac
++++ configure.ac
+@@ -11,7 +11,13 @@
+ AC_CONFIG_SRCDIR([src/loadkeys.c])
+ AC_CONFIG_HEADERS(config.h)
+ 
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++AC_ARG_ENABLE(tests,
++      AS_HELP_STRING(--enable-tests, [build tests]),
++      [BUILD_TESTS=$enableval],[BUILD_TESTS=no])
++AM_CONDITIONAL(BUILD_TESTS, test "$BUILD_TESTS" = "yes")
++if test "$BUILD_TESTS" = "yes"; then
++      PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++fi
+ 
+ m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+ AM_SILENT_RULES([yes])
+--- Makefile.am
++++ Makefile.am
+@@ -8,7 +8,10 @@
+       CREDITS \
+       contrib docs rc
+ 
+-SUBDIRS = src data po tests docs
++SUBDIRS = src data po docs
++if BUILD_TESTS
++SUBDIRS += tests
++endif
+ 
+ kbd-$(VERSION).tar.xz:
+       make distcheck
diff --git a/x11-toolkits/gtk+2/DETAILS b/x11-toolkits/gtk+2/DETAILS
index f61f13b..c451197 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gtk+2
-         VERSION=2.24.25
-     
SOURCE_HASH=sha512:e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d
+         VERSION=2.24.28
+     
SOURCE_HASH=sha512:86d563645ca70c1e14afd4b38d925f496e596cbf6181f2e95310f58c2f4152aaecc559e3c513e6d405fcf48d8d413d59a9d72782216529c1280bd8e1947d7760
           SOURCE=gtk+-$VERSION.tar.xz
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/gtk+-$VERSION"
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index e0e0bf4..45983a6 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,9 @@
+2015-05-25 Pavel Vinogradov <public AT sourcemage.org>
+       * PRE_BUILD: removed, now causes a breakage
+
+2015-05-24 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 2.24.28
+
 2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: removed libffi -- it's not a direct dependency
 
diff --git a/x11-toolkits/gtk+2/PRE_BUILD b/x11-toolkits/gtk+2/PRE_BUILD
deleted file mode 100755
index 6bce629..0000000
--- a/x11-toolkits/gtk+2/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build      &&
-cd ${SOURCE_DIRECTORY} &&
-sed -i 's#l \(gtk-.*\).sgml#& -o \1#' docs/{faq,tutorial}/Makefile.in &&
-sed -i 's#.*@man_#man_#' docs/reference/gtk/Makefile.in 
diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
index 5e0a2f3..9028c5d 100755
--- a/x11-toolkits/gtk+3/DETAILS
+++ b/x11-toolkits/gtk+3/DETAILS
@@ -1,10 +1,10 @@
            SPELL=gtk+3
 if [[ $GTK_VER == devel ]];then
-         VERSION=3.14.6
-     
SOURCE_HASH=sha512:7ebe517d0141a8d3302729b2b1f0f7ae64b715582d5c092f56a6632d12124b11d9fc519e18a242bab02a8c8e77208dc9569af98c0d377b0246f6ad4dd0c9f774
+         VERSION=3.17.1
+     
SOURCE_HASH=sha512:4a3b4d9e11e1b320856468f2e25c60eeb9159939de09a82a4a30f99a39e795a5af44023646f6eb18a70bbb8f3880753846a3a9142cfc97a8efa5f32294cb1206
 else
-         VERSION=3.14.6
-     
SOURCE_HASH=sha512:7ebe517d0141a8d3302729b2b1f0f7ae64b715582d5c092f56a6632d12124b11d9fc519e18a242bab02a8c8e77208dc9569af98c0d377b0246f6ad4dd0c9f774
+         VERSION=3.17.1
+     
SOURCE_HASH=sha512:4a3b4d9e11e1b320856468f2e25c60eeb9159939de09a82a4a30f99a39e795a5af44023646f6eb18a70bbb8f3880753846a3a9142cfc97a8efa5f32294cb1206
 fi
           SOURCE=gtk+-$VERSION.tar.xz
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index daf4a84..6ae6e91 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 3.17.1
+
 2015-01-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.14.6