Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1badb3c2242b80dcc69b58da77b05cab3eda0fba)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1badb3c2242b80dcc69b58da77b05cab3eda0fba)
  • Date: Sat, 5 Jan 2008 10:20:25 -0600

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

devel/python/BUILD | 1 -
devel/python/DEPENDS | 2 +-
devel/python/DETAILS | 2 +-
devel/python/FINAL | 3 +++
devel/python/HISTORY | 6 ++++++
devel/python/INSTALL | 10 ++++++++--
devel/python/TRIGGERS | 6 +++---
devel/python/UP_TRIGGERS | 31 ++++++++++++++-----------------
8 files changed, 36 insertions(+), 25 deletions(-)

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

python: revolution complete, finally

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

python: revolution complete

diff --git a/devel/python/BUILD b/devel/python/BUILD
index 19eccba..f698f07 100755
--- a/devel/python/BUILD
+++ b/devel/python/BUILD
@@ -1,6 +1,5 @@
export OPT="$CFLAGS"
export OPTS="$OPTS --enable-shared --enable-unicode"
-#sedit "s/\['ndbm'\]/\['ndbm', 'gdbm_compat'\]/g" setup.py &&

# The following file from kdebindings has a syntax error that
# makes Python compilation fail
diff --git a/devel/python/DEPENDS b/devel/python/DEPENDS
index d008b03..72beab8 100755
--- a/devel/python/DEPENDS
+++ b/devel/python/DEPENDS
@@ -2,4 +2,4 @@ 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"
+optional_depends g++ "" "--with-cxx=no" "for C++ module support"
diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index d831714..fbfa68c 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Python-$VERSION
WEB_SITE=http://www.python.org/
ENTERED=20010922
LICENSE[0]=PYTHON
- PATCHLEVEL=1
+ PATCHLEVEL=2
SECURITY_PATCH=1
KEYWORDS="devel"
SHORT="Interpreted, interactive, object-oriented language"
diff --git a/devel/python/FINAL b/devel/python/FINAL
new file mode 100755
index 0000000..b427479
--- /dev/null
+++ b/devel/python/FINAL
@@ -0,0 +1,3 @@
+if [ -d $PYPATH/site-packages ]; then
+ mv $SOURCE_DIRECTORY/site-packages/* $PYPATH/site-packages
+fi
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index ed828b5..02306d6 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,9 @@
+2008-01-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * INSTALL: temp-move site-packages before installing python
+ * FINAL: push back site-packages if it's the same version of python
+ * TRIGGERS, UP_TRIGGERS: cleaned up
+
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:
diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index 0ff45cf..42e73bf 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -1,8 +1,14 @@
+persistent_add PYPATH &&
+local PYPATH=$INSTALL_ROOT/usr/lib/python${VERSION:0:3}
+
+if [ -d $PYPATH/site-packages ]; then
+ mv $PYPATH/site-packages $SOURCE_DIRECTORY
+fi &&
+
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}
+ mv $SOURCE_DIRECTORY/spell-tmp/pydcop.py $PYPATH
fi &&

# gettext
diff --git a/devel/python/TRIGGERS b/devel/python/TRIGGERS
index 2c7c6bc..4a23cff 100755
--- a/devel/python/TRIGGERS
+++ b/devel/python/TRIGGERS
@@ -1,3 +1,3 @@
-on_cast gettext check_self
-on_dispel pygtk2 check_self
-on_dispel pygobject check_self
+on_cast gettext check_self
+on_dispel pygtk2 check_self
+on_dispel pygobject check_self
diff --git a/devel/python/UP_TRIGGERS b/devel/python/UP_TRIGGERS
index 90c2dfa..ad5fa1d 100755
--- a/devel/python/UP_TRIGGERS
+++ b/devel/python/UP_TRIGGERS
@@ -1,25 +1,22 @@
# up_trigger everything on minor version updates
-# dispel every spell before casting python again

-local OLD_SPELL_VERSION
if spell_ok $SPELL; then
- OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)"
if test "${VERSION:2:1}" != "${OLD_SPELL_VERSION:2:1}"; then
message "This is a possibly incompatible update of python..."
- 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
+ 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
+ fi
fi
- fi
- done
+ done
+ fi
fi




Archive powered by MHonArc 2.6.24.

Top of Page