Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

8 files changed, 18 insertions, 6 deletions

diff --git a/devel/cmake/DEPENDS b/devel/cmake/DEPENDS
index 81b42b243a..a804bc4716 100755
--- a/devel/cmake/DEPENDS
+++ b/devel/cmake/DEPENDS
@@ -1,6 +1,6 @@
 depends g++ &&
 depends ncurses &&
-
+optional_depends libidn '' '' 'internation domain name support' &&
 optional_depends qt4 \
 	"--qt-gui --qt-qmake=/usr/bin/qt4/qmake" \
 	"--no-qt-gui" \
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index 21325a9cb7..fe9879b743 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,6 @@
+2011-03-26 Treeve Jelbert <treeve@sourcemage.org>
+	* DEPENDS: add optional libidn
+
 2011-02-16 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 2.8.4
 
diff --git a/kde4-support/phonon-backend-vlc/DETAILS b/kde4-support/phonon-backend-vlc/DETAILS
index e094649e21..bf107cc04b 100755
--- a/kde4-support/phonon-backend-vlc/DETAILS
+++ b/kde4-support/phonon-backend-vlc/DETAILS
@@ -1,6 +1,6 @@
            SPELL=phonon-backend-vlc
-         VERSION=0.3.2
-     SOURCE_HASH=sha512:ad6a61917345ac10691bc513e1167e5e6838dc3988d4509e32c626b3a54f7e5dac13d72a994f934ec7bfaf6ae4b0c731afd829cf3fe90e8d09d12a7057e6f344
+         VERSION=0.4.0
+     SOURCE_HASH=sha512:d6c9a898ea7acba52834230287ad080770235a7dc6e70136e488e976bf6a5ad9f5f09860d2fe15234cace7504dbba63856faf6b9ef192b1b5d6560d411c5a402
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde4-support/phonon-backend-vlc/HISTORY b/kde4-support/phonon-backend-vlc/HISTORY
index 241f01ea2b..16c18df2ed 100644
--- a/kde4-support/phonon-backend-vlc/HISTORY
+++ b/kde4-support/phonon-backend-vlc/HISTORY
@@ -1,3 +1,6 @@
+2011-04-27 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 0.4.0
+
 2011-01-25 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS, DEPENDS, BUILD: spell created, version 0.3.2
 
diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index 14d3c86111..cfcc1a70a3 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,5 +1,5 @@
            SPELL=coreutils
-         VERSION=8.11
+         VERSION=8.12
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 71bcded7d6..976beb0668 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,6 @@
+2011-04-27 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 8.12
+
 2011-04-14 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 8.11
 
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 8999b81273..790ce6f269 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,10 +1,10 @@
            SPELL=ffmpeg
-         VERSION=0.6.2
+         VERSION=0.6.3
   SECURITY_PATCH=4
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE
-     SOURCE_HASH=sha512:76e01f0c2b89c4663cea4d1d01bfa65ca89e85535ccd9a3c568bb05b9478d98abdec1f04560da09ee185bcee6b0181ec0736b4ef67ee61f608d4beb442cc9fee
+     SOURCE_HASH=sha512:0d45ce4b08d6cf05ba349d23f326169c4ad98768603e5c33a6efe57f073470ef7481d6126e50a9437024f6fa2d362ae563fb56ac999e97d23353c04ddb2d6f08
 #case $FFAMR in 
 #      none);;
 #      *)
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 4538248d58..f5bfc3ec58 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2011-04-27 Julien "_kaze_" ROZO <julien@rozo.org>
+	* DETAILS: updated version to 0.6.3
+
 2011-03-24 Julien "_kaze_" ROZO <julien@rozo.org>
 	* DETAILS: updated version to 0.6.2, SECURITY_PATCH=4