Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 python-pypi/python-ldap/DEPENDS   |    5 ++++-
 python-pypi/python-ldap/DETAILS   |    6 +++---
 python-pypi/python-ldap/HISTORY   |    5 +++++
 python-pypi/python-ldap/PRE_BUILD |   11 +++++------
 4 files changed, 17 insertions(+), 10 deletions(-)

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

    python-ldap: => 2.4.7

diff --git a/python-pypi/python-ldap/DEPENDS b/python-pypi/python-ldap/DEPENDS
index 9960b58..aedea46 100755
--- a/python-pypi/python-ldap/DEPENDS
+++ b/python-pypi/python-ldap/DEPENDS
@@ -1,5 +1,8 @@
 depends python &&
 depends openldap &&
 
-optional_depends LIBSASL "" "" "for SASL support" &&
+if is_depends_enabled openldap cyrus-sasl; then
+  optional_depends LIBSASL "" "" "for SASL support"
+fi &&
+
 optional_depends openssl "" "" "for encrypted communications"
diff --git a/python-pypi/python-ldap/DETAILS b/python-pypi/python-ldap/DETAILS
index 2652997..90e30bf 100755
--- a/python-pypi/python-ldap/DETAILS
+++ b/python-pypi/python-ldap/DETAILS
@@ -1,11 +1,11 @@
            SPELL=python-ldap
-         VERSION=2.4.3
-     
SOURCE_HASH=sha512:30addd6e0985a0962cb254643411c666430f0fb6353a33bf7cdfaabd0e86076871da1ac3269c4dd7373cbe5dd3a658652307895ec61ab9891593004b4d6edadd
+         VERSION=2.4.7
+     
SOURCE_HASH=sha512:acb10be5ad1a654096018d488c9c6bf252668daae971881665e6ab15f03ad8d761b2602ebff2eb44e010d1ba028d023556f5dcd1ffcc39dd916b9e9095ed2feb
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
       LICENSE[0]=PYTHON
-        WEB_SITE=http://python-ldap.sourceforge.net/
+        WEB_SITE=http://www.python-ldap.org/
          ENTERED=20020416
            SHORT="Python interface to LDAP"
 cat << EOF
diff --git a/python-pypi/python-ldap/HISTORY b/python-pypi/python-ldap/HISTORY
index 0a27af4..01404b5 100644
--- a/python-pypi/python-ldap/HISTORY
+++ b/python-pypi/python-ldap/HISTORY
@@ -1,3 +1,8 @@
+2012-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.4.7; renewed website
+       * DEPENDS: corrected dependencies
+       * PRE_BUILD: reimplemented defines' selection
+
 2011-07-23 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.4.3
 
diff --git a/python-pypi/python-ldap/PRE_BUILD 
b/python-pypi/python-ldap/PRE_BUILD
index bea747c..9ad426d 100755
--- a/python-pypi/python-ldap/PRE_BUILD
+++ b/python-pypi/python-ldap/PRE_BUILD
@@ -1,11 +1,10 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-if ! is_depends_enabled $SPELL cyrus-sasl; then
-  sed -i "s:sasl2 ::" setup.cfg
+if ! is_depends_enabled $SPELL $(get_spell_provider $SPELL LIBSASL); then
+  sedit "s: HAVE_SASL::" setup.cfg
 fi &&
 
-sed -i "s|^\(library_dirs[[:space:]]*=\).*$|\1 /usr/lib     /usr/lib/sasl2|" 
\
-  setup.cfg &&
-sed -i "s|^\(include_dirs[[:space:]]*=\).*$|\1 /usr/include 
/usr/include/sasl|" \
-  setup.cfg
+if ! is_depends_enabled $SPELL openssl; then
+  sedit "s: HAVE_TLS::" setup.cfg
+fi