Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 devel/python/BUILD           |   19 ++++++-------------
 devel/python/CONFIGURE       |   18 ++++++++++++++++--
 devel/python/DEPENDS         |   12 +++++++++---
 devel/python/DETAILS         |   24 +++++++++++-------------
 devel/python/HISTORY         |    9 +++++++++
 devel/python/INSTALL         |    4 ++--
 devel/python/PRE_SUB_DEPENDS |   10 +++++-----
 devel/python/SUB_DEPENDS     |   12 ++++++++----
 devel/python/UP_TRIGGERS     |    8 ++++----
 9 files changed, 70 insertions(+), 46 deletions(-)

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

    python: 2.6, waiting 2 weeks for 3.0 a.k.a. py3k

diff --git a/devel/python/BUILD b/devel/python/BUILD
index 22addd2..577ac37 100755
--- a/devel/python/BUILD
+++ b/devel/python/BUILD
@@ -1,26 +1,19 @@
 OPT="$CFLAGS" &&
-OPTS="$OPTS --enable-shared --enable-unicode" &&
 
-if [[ $IPV6 == y ]]; then
-  OPTS="$OPTS --enable-ipv6"
-fi &&
-
-if [[ $THREADS == y ]]; then
-  OPTS="$OPTS --with-threads"
-fi &&
+OPTS="--enable-shared $OPTS $PYTHON_OPTS" &&
 
 # The following file from kdebindings has a syntax error that
 # makes Python compilation fail
 local PYTHON_VERSION=`echo $VERSION|cut -d. -f1,2`
-if [[ -f $INSTALL_ROOT/usr/lib/python${PYTHON_VERSION}/pydcop.py ]]; then
-  mkdir $SOURCE_DIRECTORY/spell-tmp &&
-  mv $INSTALL_ROOT/usr/lib/python${PYTHON_VERSION}/pydcop.py \
-    $SOURCE_DIRECTORY/spell-tmp
+if [[ -f $INSTALL_ROOT/usr/lib/python$PYTHON_VERSION/pydcop.py ]]; then
+  mkdir "$SOURCE_DIRECTORY/spell-tmp" &&
+  mv "$INSTALL_ROOT/usr/lib/python$PYTHON_VERSION/pydcop.py" \
+    "$SOURCE_DIRECTORY/spell-tmp"
 fi &&
 
 default_build &&
 
 # python -c '"(c)", "lynx"*3'
-make install DESTDIR=$SOURCE_DIRECTORY/anywhere &&
+make install DESTDIR="$SOURCE_DIRECTORY/anywhere" &&
 
 message "Fake stage complete, installing to real path.."
diff --git a/devel/python/CONFIGURE b/devel/python/CONFIGURE
index ad0b08c..3e34b95 100755
--- a/devel/python/CONFIGURE
+++ b/devel/python/CONFIGURE
@@ -1,2 +1,16 @@
-config_query IPV6 "Enable IPv6?" n &&
-config_query THREADS "Enable threads support?" n
+config_query_option PYTHON_OPTS \
+                    "enable IPv6?" y \
+                    "--enable-ipv6" \
+                    "--disable-ipv6" &&
+
+config_query_option PYTHON_OPTS \
+                    "enable threads support?" y \
+                    "--with-threads" \
+                    "--without-threads" &&
+
+if echo $PYTHON_OPTS | grep -q -- "--with-threads"; then
+  config_query_option PYTHON_OPTS \
+                      "enable POSIX threads (pthreads) support?" n \
+                      "--with-pth" \
+                      "--without-pth"
+fi
diff --git a/devel/python/DEPENDS b/devel/python/DEPENDS
index 72beab8..76d7d7f 100755
--- a/devel/python/DEPENDS
+++ b/devel/python/DEPENDS
@@ -1,5 +1,11 @@
-optional_depends db "" "" "Sleepycat db support" &&
-optional_depends sqlite "" "" "SQLite db support" &&
+optional_depends db "" "" "for Sleepycat db support" &&
+optional_depends sqlite "" "" "for SQLite db support" &&
 optional_depends tk "" "" "for Tk support" &&
+optional_depends ncurses "" "" "for Ncurses support" &&
+optional_depends readline "" "" "for Readline support" &&
 optional_depends expat "" "" "for XML parser module" &&
-optional_depends g++ "" "--with-cxx=no" "for C++ module support"
+
+optional_depends g++ \
+                 "--with-cxx-main=g++" \
+                 "--without-cxx-main" \
+                 "for C++ module support"
diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index 5741eff..f7453b3 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,23 +1,21 @@
            SPELL=python
-         VERSION=2.5.2
-     
SOURCE_HASH=sha512:c432697de12cb9e1a22a13ba257ecc7e6564ddeaddcd2838c1bc0485e5ba9127f6f64b68bd9832b94c61298c77d55de42b2862da9867e3a8ee8741ab4869bf10
+         VERSION=2.6
+     
SOURCE_HASH=sha512:b84eacd6d4b979d72ac70ba06cd6d2350d00d5d2513cca592fd5cfe92204556f53a0b7ee782858343c22584b158404f2cdfef0e47d60d8015152092802b8263d
           SOURCE=Python-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/Python-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
    SOURCE_URL[0]=http://www.python.org/ftp/$SPELL/$VERSION/$SOURCE
         WEB_SITE=http://www.python.org/
          ENTERED=20010922
       LICENSE[0]=PYTHON
-      PATCHLEVEL=3
   SECURITY_PATCH=1
         KEYWORDS="devel"
-           SHORT="Interpreted, interactive, object-oriented language"
+           SHORT="interpreted, interactive, object-oriented language"
 cat << EOF
-Python is an interpreted, interactive, object-oriented programming
-language. It combines remarkable power with very clear syntax, and isn't
-difficult to learn. It has modules, classes, exceptions, very high level
-data types, and dynamic typing. There are interfaces to many system
-calls and libraries, as well as to various windowing systems (Tk, Mac,
-MFC, GTK+, Qt, wxWindows). Newbuilt-in modules are easily written in C
-or C++. Python is also usable as an extension language for applications
-that need a programmable interface.
+Python is an interpreted, interactive, object-oriented programming language. 
It
+combines remarkable power with very clear syntax, and isn't difficult to 
learn.
+It has modules, classes, exceptions, very high level data types, and dynamic
+typing. There are interfaces to many system calls and libraries, as well as 
to
+various windowing systems (Tk, Mac, MFC, GTK+, Qt, wxWindows). Newbuilt-in
+modules are easily written in C or C++. Python is also usable as an extension
+language for applications that need a programmable interface.
 EOF
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 8bc0c14..c36a6fe 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,12 @@
+2008-10-02 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.6; fixed descs
+       * DEPENDS: added missing deps; fixed g++ dep flags
+       * CONFIGURE: use PYTHON_OPTS; changed default values as noted in 
README
+       * INSTALL: quoting paths
+       * BUILD, UP_TRIGGERS: cleaned up
+       * [PRE_]SUB_DEPENDS: cleaned up the code; corrected descriptions and
+         messages
+
 2008-02-23 George Sherwood <george AT beernabeer.com>
        * DETAILS: Updated to version 2.5.2
 
diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index f0640d6..9376f6c 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -5,5 +5,5 @@ if [[ -f $SOURCE_DIRECTORY/spell-tmp/pydcop.py ]]; then
 fi &&
 
 # gettext
-install -m 755 $SOURCE_DIRECTORY/Tools/i18n/{pygettext.py,msgfmt.py} \
-  $INSTALL_ROOT/usr/bin
+install -vm 755 $SOURCE_DIRECTORY/Tools/i18n/{pygettext.py,msgfmt.py} \
+                "$INSTALL_ROOT/usr/bin"
diff --git a/devel/python/PRE_SUB_DEPENDS b/devel/python/PRE_SUB_DEPENDS
index c5ce85c..eb48c7f 100755
--- a/devel/python/PRE_SUB_DEPENDS
+++ b/devel/python/PRE_SUB_DEPENDS
@@ -1,7 +1,7 @@
 case $THIS_SUB_DEPENDS in
-  db)    if is_depends_enabled $SPELL db;     then return 0; fi;;
-  sqlite)if is_depends_enabled $SPELL sqlite; then return 0; fi;;
-  expat) if is_depends_enabled $SPELL expat; then return 0; fi;;
+      db) is_depends_enabled $SPELL db;;
+  sqlite) is_depends_enabled $SPELL sqlite;;
+   expat) is_depends_enabled $SPELL expat;;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1;;
 esac
-
-return 1
diff --git a/devel/python/SUB_DEPENDS b/devel/python/SUB_DEPENDS
index 8100ee9..4205f7c 100755
--- a/devel/python/SUB_DEPENDS
+++ b/devel/python/SUB_DEPENDS
@@ -1,6 +1,10 @@
 case $THIS_SUB_DEPENDS in
-  db)     echo "Sqlite support requested, forcing it";      depends sqlite;;
-  sqlite) echo "DB support requested, forcing it";          depends db;;
-  expat) echo "xml parser module requested, forcing them."; depends expat;;
-  *) echo "unknown sub-depends!"; return 1;;
+      db) message "DB support requested, forcing db dependency" &&
+          depends db;;
+  sqlite) message "SQLite support requested, forcing sqlite dependency" &&
+          depends sqlite;;
+   expat) message "XML parser module requested, forcing expat dependency" &&
+          depends expat;;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1;;
 esac
diff --git a/devel/python/UP_TRIGGERS b/devel/python/UP_TRIGGERS
index ad5fa1d..9d71f8a 100755
--- a/devel/python/UP_TRIGGERS
+++ b/devel/python/UP_TRIGGERS
@@ -9,13 +9,13 @@ if spell_ok $SPELL; then
     for each in $(show_up_depends $SPELL); do
       # Check in the install logs if python packages has been installed
       if gaze install $each | grep -q 
"$TRACK_ROOT/usr/lib/python${OLD_SPELL_VERSION:0:3}/site-packages"; then
-       up_trigger $each cast_self
+        up_trigger $each cast_self
       else
       # Check if the binaries link against libpython.so
         if gaze install $each | xargs readelf -d 2> /dev/null |
-         grep -q "NEEDED.*libpython${OLD_SPELL_VERSION:0:3}"; then
-         up_trigger $each cast_self
-       fi
+          grep -q "NEEDED.*libpython${OLD_SPELL_VERSION:0:3}"; then
+          up_trigger $each cast_self
+        fi
       fi
     done
   fi