Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev 
<stealth AT sourcemage.org>:

 education/klavaro/DETAILS    |    4 ++--
 education/klavaro/HISTORY    |    3 +++
 python-pypi/psycopg2/DETAILS |    5 +++--
 python-pypi/psycopg2/HISTORY |    3 +++
 video/mlt/HISTORY            |    4 ++++
 video/mlt/INSTALL            |    7 ++++---
 video/mlt/PRE_SUB_DEPENDS    |    5 +++++
 video/mlt/SUB_DEPENDS        |    6 ++++++
 video/openshot/DEPENDS       |    2 +-
 video/openshot/HISTORY       |    3 +++
 10 files changed, 34 insertions(+), 8 deletions(-)

New commits:
commit d3ff97483fd7c03dc6a3294b5d6d266d0ec63075
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    psycopg2: => 2.4

commit 1c60d638c63022bb64078abdad5eb60d996ed077
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

    mlt: fixed INSTALL to also work with other versions of python (not only 
2.7*)

commit 250aef1decff72435b4425ce045a514b811964c5
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

    openshot: request mlt with python bindings

commit 89091c45d7ffbcfacad378b13759a86b155b3a01
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

    mlt: added, now we can request python bindings

commit e0ccf4e9b44f60a3e082a5deb4d8fecea210a755
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    klavaro: => 1.8.1

diff --git a/education/klavaro/DETAILS b/education/klavaro/DETAILS
index 331bc46..67e81a6 100755
--- a/education/klavaro/DETAILS
+++ b/education/klavaro/DETAILS
@@ -1,9 +1,9 @@
            SPELL=klavaro
-         VERSION=1.7.4
+         VERSION=1.8.1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:56ffe966bc3181bf5ec0fa34caded4fc158a94c96b587e1512ff906cf8d86c6b28385d374788d0c98c58c94ebb476538236943ccd646d677510ddf004e1d1391
+     
SOURCE_HASH=sha512:676ef2bd96c2e6e4c2fa7a97d68542386587b9c06c4d64dc318c944fb83e6f02a84189e8c93fe57fe540561402621dfd1193a1d1caea5679054910a67387f9e2
       LICENSE[0]=GPL
         WEB_SITE=http://klavaro.sourceforge.net/
          ENTERED=20110123
diff --git a/education/klavaro/HISTORY b/education/klavaro/HISTORY
index 4a8125a..18a02ee 100644
--- a/education/klavaro/HISTORY
+++ b/education/klavaro/HISTORY
@@ -1,2 +1,5 @@
+2011-02-27 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.8.1
+
 2011-01-23 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS, DEPENDS: created spell
diff --git a/python-pypi/psycopg2/DETAILS b/python-pypi/psycopg2/DETAILS
index 41ca664..0641cb3 100755
--- a/python-pypi/psycopg2/DETAILS
+++ b/python-pypi/psycopg2/DETAILS
@@ -1,8 +1,9 @@
            SPELL=psycopg2
-         VERSION=2.3.2
+         VERSION=2.4
+          BRANCH=`echo $VERSION|cut -d . -f 1,2|tr . -`
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
-   SOURCE_URL[0]=http://initd.org/psycopg/tarballs/$SOURCE
+   SOURCE_URL[0]=http://initd.org/psycopg/tarballs/PSYCOPG-$BRANCH/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       SOURCE_GPG=fog.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/python-pypi/psycopg2/HISTORY b/python-pypi/psycopg2/HISTORY
index cefc4b5..2bb377d 100644
--- a/python-pypi/psycopg2/HISTORY
+++ b/python-pypi/psycopg2/HISTORY
@@ -1,3 +1,6 @@
+2011-02-27 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.4.0; use BRANCH definition
+
 2010-12-21 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.3.2
 
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index e405178..85694fc 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,7 @@
+2011-02-27 Bor Kraljič <pyrobor AT ver.si>
+       * INSTALL: fixed to also work with other versions of python (not only 
2.7*)
+       * SUB_DEPENDS,PRE_SUB_DEPENDS: added, now we can request python 
bindings
+
 2011-02-24 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS, INSTALL: python bindings installed optionally
 
diff --git a/video/mlt/INSTALL b/video/mlt/INSTALL
index bdc4f31..1e686db 100755
--- a/video/mlt/INSTALL
+++ b/video/mlt/INSTALL
@@ -2,8 +2,9 @@ default_install &&
 
 if is_depends_enabled $SPELL python; then
   message "${MESSAGE_COLOR}Installing python bindings...${DEFAULT_COLOR}" &&
+  PYTHON_VER=$(installed_version python) &&
   cd src/swig/python &&
-  install -vm 755 mlt.py $INSTALL_ROOT/usr/lib/python2.7/ &&
-  install -vm 755 _mlt.so $INSTALL_ROO/usr/lib/python2.7/ &&
-  install -vm 755 mlt_wrap.o $INSTALL_ROOT/usr/lib/python2.7/
+  install -vm 755 mlt.py $INSTALL_ROOT/usr/lib/python${PYTHON_VER:0:3}/ &&
+  install -vm 755 _mlt.so $INSTALL_ROO/usr/lib/python${PYTHON_VER:0:3}/ &&
+  install -vm 755 mlt_wrap.o $INSTALL_ROOT/usr/lib/python${PYTHON_VER:0:3}/
 fi
diff --git a/video/mlt/PRE_SUB_DEPENDS b/video/mlt/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..b250742
--- /dev/null
+++ b/video/mlt/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+  PYTHON) is_depends_enabled $SPELL python;;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1;;
+esac
diff --git a/video/mlt/SUB_DEPENDS b/video/mlt/SUB_DEPENDS
new file mode 100755
index 0000000..85c4a38
--- /dev/null
+++ b/video/mlt/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+  PYTHON) message "Python bindings requested, forcing python dependency" &&
+          depends python '--swig-languages=python';;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1;;
+esac
diff --git a/video/openshot/DEPENDS b/video/openshot/DEPENDS
index 052ba1b..ddaa3ef 100755
--- a/video/openshot/DEPENDS
+++ b/video/openshot/DEPENDS
@@ -1,5 +1,5 @@
 depends python &&
 depends pygtk2 &&
 depends pygoocanvas &&
-depends mlt &&
+depends -sub PYTHON mlt &&
 depends httplib2
diff --git a/video/openshot/HISTORY b/video/openshot/HISTORY
index e5cb2f6..7107bf7 100644
--- a/video/openshot/HISTORY
+++ b/video/openshot/HISTORY
@@ -1,2 +1,5 @@
+2011-02-27 Bor Kraljič <pyrobor AT ver.si>
+       * DEPENDS: request mlt with python bindings
+
 2011-02-24 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS, DEPENDS, BUILD, INSTALL: spell created, version 1.3.0