[Lunar-commits] <moonbase> SQLAlchemy & simplejson: stop clobbering .pth file

[Paul Bredbury]

commit dfcf49a94fe899bf7508e86517d18acaf371910b
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Tue Jan 18 14:58:46 2011 +0700

    SQLAlchemy & simplejson: stop clobbering .pth file
---
 python/SQLAlchemy/BUILD   |    9 +++++++--
 python/SQLAlchemy/DEPENDS |    2 +-
 python/SQLAlchemy/DETAILS |   10 +++++-----
 zbeta/simplejson/BUILD    |   10 +++++++---
 zbeta/simplejson/DETAILS  |   12 ++++++------
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/python/SQLAlchemy/BUILD b/python/SQLAlchemy/BUILD
index 3eb695a..8f7f2f0 100644
--- a/python/SQLAlchemy/BUILD
+++ b/python/SQLAlchemy/BUILD
@@ -1,6 +1,11 @@
 (
 
-  prepare_install  &&
-  python ./setup.py install
+  python ./setup.py build &&
+
+  prepare_install &&
+
+  # Specifying root, to stop packages clobbering each other's easy-install.pth
+  # http://mail.python.org/pipermail/distutils-sig/2008-October/010208.html
+  python ./setup.py install --root=/
 
 ) > $C_FIFO 2>&1
diff --git a/python/SQLAlchemy/DEPENDS b/python/SQLAlchemy/DEPENDS
index 7d03d17..54f5789 100644
--- a/python/SQLAlchemy/DEPENDS
+++ b/python/SQLAlchemy/DEPENDS
@@ -1 +1 @@
-depends Python
+depends setuptools
diff --git a/python/SQLAlchemy/DETAILS b/python/SQLAlchemy/DETAILS
index 73b13ee..b72d8d7 100644
--- a/python/SQLAlchemy/DETAILS
+++ b/python/SQLAlchemy/DETAILS
@@ -1,16 +1,16 @@
           MODULE=SQLAlchemy
-         VERSION=0.6.4
+         VERSION=0.6.6
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/sqlalchemy
-      SOURCE_VFY=sha1:45651784576b258e2ace569fe744263256fd9ce7
+      SOURCE_VFY=sha1:6ed990141710b95a583b3e22cbd5c0eeff5076c5
         WEB_SITE=http://www.sqlalchemy.org
          ENTERED=20100102
-         UPDATED=20100911
+         UPDATED=20110110
            SHORT="A Python SQL Toolkit and Object Relational Mapper"
 
 cat << EOF
 A Python-centric SQL toolset, database resource manager and object-
-relational mapper. Includes a componentized clause construction API 
-capable of most ANSI SQL, transparent connection pooling, and an 
+relational mapper. Includes a componentized clause construction API
+capable of most ANSI SQL, transparent connection pooling, and an
 extensible rowset-oriented Data Mapper architecture.
 EOF
diff --git a/zbeta/simplejson/BUILD b/zbeta/simplejson/BUILD
index df781e5..afa4a83 100644
--- a/zbeta/simplejson/BUILD
+++ b/zbeta/simplejson/BUILD
@@ -1,8 +1,12 @@
 (
 
-  python ./setup.py build  &&
-  prepare_install          &&
-  python ./setup.py install
+  python ./setup.py build &&
+
+  prepare_install &&
+
+  # Specifying root, to stop packages clobbering each other's easy-install.pth
+  # http://mail.python.org/pipermail/distutils-sig/2008-October/010208.html
+  python ./setup.py install --root=/
 
 ) > $C_FIFO 2>&1
 
diff --git a/zbeta/simplejson/DETAILS b/zbeta/simplejson/DETAILS
index 218d614..2ed1cc5 100644
--- a/zbeta/simplejson/DETAILS
+++ b/zbeta/simplejson/DETAILS
@@ -1,14 +1,14 @@
           MODULE=simplejson
-         VERSION=2.1.1
+         VERSION=2.1.3
           SOURCE=${MODULE}-${VERSION}.tar.gz
       SOURCE_URL=http://pypi.python.org/packages/source/s/simplejson/
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-      SOURCE_VFY=sha1:106fe3481c9a3a9488cbe7d212eca7671837783f
-        WEB_SITE="http://code.google.com/p/simplejson/"
+      SOURCE_VFY=sha1:ab9b677d1d14c9fd8283132ea1fe9cefcf1a67e3
+        WEB_SITE=http://pypi.python.org/pypi/simplejson/
          ENTERED=20100526
-         UPDATED=20100526
+         UPDATED=20110116
            SHORT="extensible JSON encoder and decoder for Python 2.5+"
-cat <<EOF
+
+cat << EOF
 simplejson is a simple, fast, complete, correct and extensible JSON
 encoder and decoder for Python 2.5+
 EOF