Merge branch 'master' into docker

15 files changed, 18 insertions, 120 deletions

diff --git a/ChangeLog b/ChangeLog
index 91a1c48bc7..746f6495a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-23 Treeve Jelbert <treeve@sourcemage.org>
+	* kde4-edu/libkdeedu: delete unneed spell
+	* kde4-edu/pairs: delete spell, no tarballs available
+
 2016-03-23 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* security/afl: new spell, a security-oriented fuzzer
 
diff --git a/kde4-edu/kalzium/DEPENDS b/kde4-edu/kalzium/DEPENDS
index 3fe6d26610..bbfff63f10 100755
--- a/kde4-edu/kalzium/DEPENDS
+++ b/kde4-edu/kalzium/DEPENDS
@@ -1,8 +1,7 @@
 source  $GRIMOIRE/KDE4_DEPENDS  &&
-depends libkdeedu &&
 depends openbabel &&
 depends avogadro  &&
 depends glew      &&
-depends eigen2    &&
+depends eigen3    &&
 depends ocaml
 
diff --git a/kde4-edu/kalzium/DETAILS b/kde4-edu/kalzium/DETAILS
index 899a59915b..fc43aa5c36 100755
--- a/kde4-edu/kalzium/DETAILS
+++ b/kde4-edu/kalzium/DETAILS
@@ -1,6 +1,6 @@
            SPELL=kalzium
-         VERSION=14.12.0
-     SOURCE_HASH=sha512:9c258bd316347df3344fa877d5fd6428e8168577a031a00bf73d3488f475db5f980b7b151d1f3e4407966e48297573fb7c201d44d0f8ec8259034293397d4aac
+         VERSION=15.12.3
+     SOURCE_HASH=sha512:70808cd3df8b15941146444410f75c955dc925417a89e4b77612680d2a0bda53124e3c44e2b632c095408287db5481c32535a608b48e938d22a43b624073a271
           SOURCE=$SPELL-$VERSION.tar.xz
       SOURCE_URL=http://download.kde.org/stable/applications/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde4-edu/kalzium/HISTORY b/kde4-edu/kalzium/HISTORY
index 8fed520886..2eabe53cba 100644
--- a/kde4-edu/kalzium/HISTORY
+++ b/kde4-edu/kalzium/HISTORY
@@ -1,3 +1,7 @@
+2016-03-23  Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 15.12.3
+	* DEPENDS: delete libkdeedu, add eigen3
+
 2014-12-18  Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 14.12.0
 
diff --git a/kde4-edu/libkdeedu/CONFIGURE b/kde4-edu/libkdeedu/CONFIGURE
deleted file mode 100755
index b2f02c3032..0000000000
--- a/kde4-edu/libkdeedu/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/kde4-edu/libkdeedu/CONFLICTS b/kde4-edu/libkdeedu/CONFLICTS
deleted file mode 100755
index 4627d17843..0000000000
--- a/kde4-edu/libkdeedu/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts kdeedu4 y &&
-conflicts libkdeedu y
diff --git a/kde4-edu/libkdeedu/DEPENDS b/kde4-edu/libkdeedu/DEPENDS
deleted file mode 100755
index b479530fb9..0000000000
--- a/kde4-edu/libkdeedu/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-source  $GRIMOIRE/KDE4_DEPENDS &&
-depends automoc
diff --git a/kde4-edu/libkdeedu/DETAILS b/kde4-edu/libkdeedu/DETAILS
deleted file mode 100755
index 1feeff4641..0000000000
--- a/kde4-edu/libkdeedu/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-           SPELL=libkdeedu
-         VERSION=14.12.0
-     SOURCE_HASH=sha512:60ae7fa4e152995000ded8b0adf1d43c0f9ea9b49bc5ed7c4010c3ddc899f1a6c45af88933a821b7285804bbb9a259cff4e5e4619fe484f70e2560b4bea7c26c
-          SOURCE=$SPELL-$VERSION.tar.xz
-      SOURCE_URL=http://download.kde.org/stable/applications/$VERSION/src/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//libkdeedu
-         ENTERED=20110211
-#  SECURITY_PATCH=1
-      LICENSE[0]=GPL
-        KEYWORDS="kde4 games"
-           SHORT="common library for educational apps for KDE"
-cat << EOF
-common library for educational apps for KDE
-EOF
diff --git a/kde4-edu/libkdeedu/HISTORY b/kde4-edu/libkdeedu/HISTORY
deleted file mode 100644
index 05252b505e..0000000000
--- a/kde4-edu/libkdeedu/HISTORY
+++ /dev/null
@@ -1,61 +0,0 @@
-2014-12-18  Treeve Jelbert <treeve@sourcemage.org>
-	* DETAILS: version 14.12.0
-
-2014-08-21 Treeve Jelbert <treeve@sourcemage.org> 
-	* DETAILS: version 4.14.0
-
-2014-05-17 Treeve Jelbert <treeve@sourcemage.org>
-	* DETAILS: version 4.13.1
-
-2013-03-06 Ladislav Hagara <hgr@vabo.cz>
-	* DETAILS: 4.10.1
-
-2013-02-07 Ladislav Hagara <hgr@vabo.cz>
-	* DETAILS: 4.10.0
-
-2013-01-14 Ladislav Hagara <hgr@vabo.cz>
-	* DETAILS: 4.9.5
-
-2012-09-10 Tommy Boatman <tboatman@sourcemage.org>
-	* DETAILS: 4.9.1
-
-2012-08-16 Ladislav Hagara <hgr@vabo.cz>
-	* DETAILS: 4.9.0
-
-2012-05-07 Ladislav Hagara <hgr@vabo.cz>
-	* DETAILS: 4.8.3, bz2 -> xz
-
-2012-02-01 Bor Kraljič <pyrobor@ver.si>
-	* DETAILS: updated spell to 4.8.0
-
-2011-12-10 Bor Kraljič <pyrobor@ver.si>
-	* DETAILS: updated spell to 4.7.4
-
-2011-11-02 Bor Kraljič <pyrobor@ver.si>
-	* DETAILS: updated spell to 4.7.3
-
-2011-10-06 Bor Kraljič <pyrobor@ver.si>
-	* DETAILS: updated spell to 4.7.2
-
-2011-09-07 Bor Kraljič <pyrobor@ver.si>
-	* DETAILS: updated spell to 4.7.1
-
-2011-09-04 Bor Kraljič <pyrobor@ver.si>
-	* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change
-
-2011-08-15 Bor Kraljič <pyrobor@ver.si>
-	* CONFLICTS: it conflicts with kdeedu4
-
-2011-08-02 Bor Kraljič <pyrobor@ver.si>
-	* DETAILS: changed SOURCE_URL to stable
-	  updated spell to 4.7.0
-
-2011-05-26  Treeve Jelbert <treeve@sourcemage.org>
-	* DETAILS: version 4.6.80
-
-2011-04-30 Treeve Jelbert <treeve@sourcemage.org> 
-	* CONFLICTS: added, conflcits self
-
-2010-12-17 Treeve Jelbert <treeve@sourcemage.org> 
-	* DETAILS: version master(git)
-	  spell created
diff --git a/kde4-edu/pairs/CONFIGURE b/kde4-edu/pairs/CONFIGURE
deleted file mode 100755
index b2f02c3032..0000000000
--- a/kde4-edu/pairs/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/kde4-edu/pairs/DEPENDS b/kde4-edu/pairs/DEPENDS
deleted file mode 100755
index 168c85ed3d..0000000000
--- a/kde4-edu/pairs/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-source  $GRIMOIRE/KDE4_DEPENDS
diff --git a/kde4-edu/pairs/DETAILS b/kde4-edu/pairs/DETAILS
deleted file mode 100755
index b35fa2bafa..0000000000
--- a/kde4-edu/pairs/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-           SPELL=pairs
-         VERSION=14.12.0
-     SOURCE_HASH=sha512:fd93106caaeb3f5682322b44e31ea8862fab34cce7d56fe1aa8b32c050fcdf5e4ddf2465fe39ed474e9187fbdc75265e4cfab758eb94516d192200bf44f5086c
-          SOURCE=$SPELL-$VERSION.tar.xz
-      SOURCE_URL=http://download.kde.org/stable/applications/$VERSION/src/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//pairs
-      LICENSE[0]="GPL"
-         ENTERED=20120208
-        KEYWORDS=""
-           SHORT="Memory matching game for KDE"
-cat << EOF
-A memory matching game for KDE in the spirit of Concentration
-EOF
diff --git a/kde4-edu/pairs/HISTORY b/kde4-edu/pairs/HISTORY
deleted file mode 100644
index 1e57a22c0d..0000000000
--- a/kde4-edu/pairs/HISTORY
+++ /dev/null
@@ -1,15 +0,0 @@
-2014-12-18  Treeve Jelbert <treeve@sourcemage.org>
-	* DETAILS: version 14.12.0
-
-2014-08-21 Treeve Jelbert <treeve@sourcemage.org> 
-	* DETAILS: version 4.14.0
-
-2014-05-17 Treeve Jelbert <treeve@sourcemage.org>
-	* DETAILS: version 4.13.1
-
-2013-01-08 Ladislav Hagara <hgr@vabo.cz>
-	* DETAILS: 4.9.5
-
-2012-09-10 Tommy Boatman <tboatman@sourcemage.org>
-	* DETAILS, DEPENDS: new spell
-
diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index 7681660364..196f1a06bc 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,11 +1,11 @@
            SPELL=icu
 if [[ "$ICU_DEV" == 'y' ]]; then
-         VERSION=56.1
-     SOURCE_HASH=sha512:297fd91ce6c478309ac3d18813f1b3ff39a992584e3bafb79e2e816a516e903af6b86c6318e1104cda0bb29ba7c0414b65c1e83c0ed0e848ce897a06d7678d9a
+         VERSION=57.1
+     SOURCE_HASH=sha512:a3c701e9c81622db545bcf93f315c7b13159750f43f009d0aec59ceae3a8e1ccb751826d4b8a7387aca47f38bff2a85816b1a123b07d2bf731558c7b66e47b8a
               VX=${VERSION//.r/r}
 else
-         VERSION=56.1
-     SOURCE_HASH=sha512:297fd91ce6c478309ac3d18813f1b3ff39a992584e3bafb79e2e816a516e903af6b86c6318e1104cda0bb29ba7c0414b65c1e83c0ed0e848ce897a06d7678d9a
+         VERSION=57.1
+     SOURCE_HASH=sha512:a3c701e9c81622db545bcf93f315c7b13159750f43f009d0aec59ceae3a8e1ccb751826d4b8a7387aca47f38bff2a85816b1a123b07d2bf731558c7b66e47b8a
 fi
      VX=$VERSION
           SPELLX=icu4c
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 98660ecc24..231af24d21 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,6 @@
+2016-03-24 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 57.1 (both)
+
 2016-01-10 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: remove incorrect variable PATCH_LEVEL, this should be PATCHLEVEL