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/DEPENDS            |   29 +++++------------------------
 devel/python/HISTORY            |    6 ++++++
 devel/python/INSTALL            |    8 ++++----
 devel/python/PRE_SUB_DEPENDS    |    3 ++-
 devel/python/SUB_DEPENDS        |    4 ++--
 devel/python/UP_TRIGGERS        |   32 +++++++++++++++++---------------
 python-devel/setuptools/DETAILS |   17 ++++++++---------
 python-devel/setuptools/HISTORY |    4 ++++
 python-devel/setuptools/INSTALL |    1 +
 9 files changed, 49 insertions(+), 55 deletions(-)

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

    setuptools: added forgotten INSTALL file

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

    python: fix the huge bug in spell: when you have a lot of python modules 
installed (in /usr/lib/python2.5/site-packages dir), and want to recast 
python, it will recompile every module in that dir recursively, while adding 
every compiled (.pyc) and object (.pyo) files. So package of python becomes 
bigger with any new pythonic module/app. And if we want to recast python 
(remember -- every module in site-packages must be reinstalled after python), 
then we need to dispel all pythonic modules first, then cast python, then 
cast all those modules. We MUST do it not only after minor version upgrade -- 
but EVERYTIME we want to recast python, to keep it clear an proper.

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

    setuptools: fixed the install process

diff --git a/devel/python/DEPENDS b/devel/python/DEPENDS
index 4b5bcd9..d008b03 100755
--- a/devel/python/DEPENDS
+++ b/devel/python/DEPENDS
@@ -1,24 +1,5 @@
-optional_depends  db                \
-                  ""                \
-                  ""                \
-                  "Sleepycat db support" &&
-
-optional_depends  sqlite            \
-                  ""                \
-                  ""                \
-                  "sqlite db support"&&
-
-optional_depends  tk                \
-                  ""                \
-                  ""                \
-                  "for tk support"  &&
-
-optional_depends  expat                       \
-                  ""                          \
-                  ""                          \
-                  "for an xml parser module"  &&
-
-optional_depends g++                          \
-                 ""                           \
-                 "--with-cxx=no"              \
-                 "for c++ module support"
+optional_depends db "" "" "Sleepycat db support" &&
+optional_depends sqlite "" "" "SQLite db support" &&
+optional_depends tk "" "" "for Tk support" &&
+optional_depends expat "" "" "for XML parser module" &&
+optional_depends g++ "" "--with-cxx=no" "for c++ module support"
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index a25b7bc..9cb6b8f 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,9 @@
+2007-12-26 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: fixed the huge bug in spell, now python's recasting won't
+         include all files from the pythonic modules/apps in site-packages:
+         we MUST dispell every python-based spell on recasting python, and
+         every python-based module/app MUST be recompiled -- only by its 
setup
+
 2007-06-03 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: fix minor typo, bug #13798
 
diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index eaf5f3b..917e825 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -1,6 +1,6 @@
-default_install  &&
+default_install &&
 
-if [ -f $SOURCE_DIRECTORY/spell-tmp/pydcop.py ];  then
-  mv  $SOURCE_DIRECTORY/spell-tmp/pydcop.py                       \
-      $INSTALL_ROOT/usr/lib/python${VERSION:0:3}
+if [ -f $SOURCE_DIRECTORY/spell-tmp/pydcop.py ]; then
+  mv $SOURCE_DIRECTORY/spell-tmp/pydcop.py \
+    $INSTALL_ROOT/usr/lib/python${VERSION:0:3}
 fi
diff --git a/devel/python/PRE_SUB_DEPENDS b/devel/python/PRE_SUB_DEPENDS
index 47f7444..03059f4 100755
--- a/devel/python/PRE_SUB_DEPENDS
+++ b/devel/python/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
 case $THIS_SUB_DEPENDS in
-expat) if is_depends_enabled $SPELL expat; then return 0; fi;;
+  expat) if is_depends_enabled $SPELL expat; then return 0; fi;;
 esac
+
 return 1
diff --git a/devel/python/SUB_DEPENDS b/devel/python/SUB_DEPENDS
index 7c283e1..c85dbd5 100755
--- a/devel/python/SUB_DEPENDS
+++ b/devel/python/SUB_DEPENDS
@@ -1,4 +1,4 @@
 case $THIS_SUB_DEPENDS in
-   expat) echo "xml parser module requested, forcing them."; depends expat;;
-   *) echo "unknown sub-depends!"; return 1;;
+  expat) echo "xml parser module requested, forcing them."; depends expat;;
+  *) echo "unknown sub-depends!"; return 1;;
 esac
diff --git a/devel/python/UP_TRIGGERS b/devel/python/UP_TRIGGERS
index 0a6deb7..90c2dfa 100755
--- a/devel/python/UP_TRIGGERS
+++ b/devel/python/UP_TRIGGERS
@@ -1,23 +1,25 @@
 # up_trigger everything on minor version updates
+# dispel every spell before casting python again
 
 local OLD_SPELL_VERSION
-if spell_ok  $SPELL; then
+if spell_ok $SPELL; then
   OLD_SPELL_VERSION="$(installed_version $SPELL)"
-  # Test the second number of the version ie 4 in 2.4.3
   if test "${VERSION:2:1}" != "${OLD_SPELL_VERSION:2:1}"; then
     message "This is a possibly incompatible update of python..."
-    message "Figuring out what spells need to be recast, this may take a 
while."
-    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 
-      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
-      fi
-    done
   fi
+  message "Figuring out what spells need to be recast, this may take a 
while."
+  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
+      dispel --notriggers $each
+    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
+       dispel --notriggers $each
+      fi
+    fi
+  done
 fi
diff --git a/devel/python/volatiles b/devel/python/volatiles
old mode 100644
new mode 100755
diff --git a/python-devel/setuptools/DETAILS b/python-devel/setuptools/DETAILS
index 71d6cc5..675e645 100755
--- a/python-devel/setuptools/DETAILS
+++ b/python-devel/setuptools/DETAILS
@@ -1,16 +1,15 @@
            SPELL=setuptools
-  CHEESESHOP_PKG=$SPELL
          VERSION=0.6c7
      
SOURCE_HASH=sha512:25016bde2bfefb4f370edb49a8b40c8447383e5d947c14ce48b4e3cb6b38df867b30e653f73c1813d1d868359832983f4f04808654851a9a7d053939cc248726
-          SOURCE="$SPELL-$VERSION.tar.gz"
-   
SOURCE_URL[0]="http://cheeseshop.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE";
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-        WEB_SITE="http://peak.telecommunity.com/DevCenter/$SPELL";
-       WEB_SITE2="http://www.python.org/pypi/$SPELL/";
-      LICENSE[0]='PSF'
-      LICENSE[1]='ZPL'
+          SOURCE=$SPELL-$VERSION.tar.gz
+   
SOURCE_URL[0]=http://cheeseshop.python.org/packages/source/${SPELL:0:1}/$SPELL/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=http://peak.telecommunity.com/DevCenter/setuptools
+      LICENSE[0]="PSF"
+      LICENSE[1]="ZPL"
+      PATCHLEVEL=1
         KEYWORDS="python devel"
-           SHORT='setuptools is a collection of enhancements to the Python 
distutils'
+           SHORT="setuptools is a collection of enhancements to the Python 
distutils"
 cat << EOF
 setuptools is a collection of enhancements to the Python distutils (for 
Python
 2.3 and up) that allow you to more easily build and distribute Python 
packages,
diff --git a/python-devel/setuptools/HISTORY b/python-devel/setuptools/HISTORY
index 3ca22a6..8287ac5 100644
--- a/python-devel/setuptools/HISTORY
+++ b/python-devel/setuptools/HISTORY
@@ -1,3 +1,7 @@
+2007-12-26 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL++, cleaned up
+       * INSTALL: installing the sources, not egg!
+
 2007-11-01 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.6c7
 
diff --git a/python-devel/setuptools/INSTALL b/python-devel/setuptools/INSTALL
new file mode 100755
index 0000000..31793e1
--- /dev/null
+++ b/python-devel/setuptools/INSTALL
@@ -0,0 +1 @@
+python setup.py install --root "$INSTALL_ROOT/"