Merge branch '3.0' into 3.1

gvim/.md5sum

@@ -1,2 +1,2 @@
 8e16af6325c8f479717e1ce4121d5bf6  gvim.desktop
-ae53392a1842f23a4adb3730204ac0f5  vim-7.4.94.tar.xz
+b4db9434d6dd4d7c55cc2f9cac8af5e3  vim-7.4.205.tar.xz

gvim/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  vim, gtk, xorg-libxt
 
 name=gvim
-version=7.4.94
+version=7.4.205
 release=1
 source=(http://crux.nu/files/distfiles/vim-$version.tar.xz
         gvim.desktop)

lcms2/.footprint

@@ -11,9 +11,9 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/liblcms2.a
 -rwxr-xr-x	root/root	usr/lib/liblcms2.la
-lrwxrwxrwx	root/root	usr/lib/liblcms2.so -> liblcms2.so.2.0.5
-lrwxrwxrwx	root/root	usr/lib/liblcms2.so.2 -> liblcms2.so.2.0.5
--rwxr-xr-x	root/root	usr/lib/liblcms2.so.2.0.5
+lrwxrwxrwx	root/root	usr/lib/liblcms2.so -> liblcms2.so.2.0.6
+lrwxrwxrwx	root/root	usr/lib/liblcms2.so.2 -> liblcms2.so.2.0.6
+-rwxr-xr-x	root/root	usr/lib/liblcms2.so.2.0.6
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/lcms2.pc
 drwxr-xr-x	root/root	usr/man/

lcms2/.md5sum

@@ -1 +1 @@
-396d106600251441ff195fcaa277d10b  lcms2-2.5.tar.gz
+6c5bb5f3a253124715764dae16fe8367  lcms2-2.6.tar.gz

lcms2/Pkgfile

@@ -1,10 +1,10 @@
 # Description: Little CMS intends to be an small-footprint color management engine
 # URL:         http://www.littlecms.com/
 # Maintainer:  Juergen Daubert, jue at crux dot nu
-# Depends on:  zlib, libtiff, libjpeg
+# Depends on:  zlib, xz, libtiff, libjpeg
 
 name=lcms2
-version=2.5
+version=2.6
 release=1
 source=(http://downloads.sourceforge.net/project/lcms/lcms/$version/$name-$version.tar.gz)