Skip to Content.
Sympa Menu

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

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 (8ac3d1aa361331f6f29ae5885160338df41d3061)
  • Date: Sat, 22 Aug 2009 08:47:04 -0500

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

ChangeLog | 9 ++++++++-
FUNCTIONS | 14 ++++++++++++++
dev/null |binary
devel/python3/BUILD | 23 +++++++++++++++++++++++
devel/python3/CONFIGURE | 11 +++++++++++
devel/python3/CONFLICTS | 1 +
devel/python3/DEPENDS | 11 +++++++++++
devel/python3/DETAILS | 23 +++++++++++++++++++++++
devel/python3/HISTORY | 3 +++
devel/python3/INSTALL | 9 +++++++++
devel/python3/PRE_BUILD | 4 ++++
devel/python3/PRE_SUB_DEPENDS | 7 +++++++
devel/python3/SUB_DEPENDS | 10 ++++++++++
devel/python3/TRIGGERS | 3 +++
devel/python3/UP_TRIGGERS | 22 ++++++++++++++++++++++
devel/python3/python.gpg |binary
devel/python3/volatiles | 1 +
devel/python3/wchar.patch | 11 +++++++++++
devel/python3000/BUILD | 24 +-----------------------
devel/python3000/CONFIGURE | 11 -----------
devel/python3000/DEPENDS | 12 +-----------
devel/python3000/DETAILS | 27 ++++++---------------------
devel/python3000/HISTORY | 5 +++++
devel/python3000/INSTALL | 10 +---------
devel/python3000/PRE_BUILD | 5 +----
devel/python3000/PRE_SUB_DEPENDS | 7 -------
devel/python3000/SUB_DEPENDS | 10 ----------
devel/python3000/TRIGGERS | 3 ---
devel/python3000/UP_TRIGGERS | 23 +----------------------
devel/python3000/python.gpg | 0
devel/python3000/volatiles | 1 -
devel/python3000/wchar.patch | 11 -----------
python-pypi/pyskein/BUILD | 1 +
python-pypi/pyskein/DEPENDS | 1 +
python-pypi/pyskein/DETAILS | 20 ++++++++++++++++++++
python-pypi/pyskein/HISTORY | 2 ++
python-pypi/pyskein/INSTALL | 1 +
python-pypi/pyskein/PRE_BUILD | 4 ++++
python-pypi/pyskein/hagenf.gpg |binary
python-pypi/pyskein/unicode.patch | 33 +++++++++++++++++++++++++++++++++
40 files changed, 239 insertions(+), 134 deletions(-)

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

pyskein: new spell, efficiently compute Skein hashes

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

python3: corrected spell-name

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

added build/install instructions for python3 if a user has both versions
installed, to keep the compatibility

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

python3: new spell, python 2 successor

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

python3000: spell deprecated [renamed to python3]

diff --git a/ChangeLog b/ChangeLog
index 1dbba79..77c9245 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/pyskein: new spell, efficiently compute Skein hashes
+ * FUNCTIONS: added build/install instructions for python3 if a user
has both
+ versions installed, to keep the compatibility
+ * devel/python3: new spell, python 2 successor
+ * devel/python3000: spell deprecated [renamed to python3]
+
2009-08-22 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-apps/rekonq: new spell, webkit based browser for kde4

@@ -6,7 +13,7 @@
* libs/protobuf: new spell , encoding structured data
* cluster/gearmand: new spell, manager for sharing work

-2009-08-15 Finn Haedicke <finn_haedicke AT gmx.net>
+2009-08-15 Finn Haedicke <finn_haedicke AT gmx.net>
* chat-im/pidgin-libnotify: new spell, notification plugin for pidgin

2009-08-14 Arjan Bouter <abouter AT sourcemage.org>
diff --git a/FUNCTIONS b/FUNCTIONS
index 268b833..28c5b40 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -431,6 +431,13 @@ function default_build_python() {
}

#-------------------------------------------------------------------------
+## Default build for Python 3 spell.
+#-------------------------------------------------------------------------
+function default_build_python3() {
+ python3 setup.py build "$@"
+}
+
+#-------------------------------------------------------------------------
## Default install for Python spell.
#-------------------------------------------------------------------------
function default_install_python() {
@@ -438,6 +445,13 @@ function default_install_python() {
}

#-------------------------------------------------------------------------
+## Default install for Python 3 spell.
+#-------------------------------------------------------------------------
+function default_install_python3() {
+ python3 setup.py install --root "$INSTALL_ROOT/" "$@"
+}
+
+#-------------------------------------------------------------------------
## Default build for Perl spell.
#-------------------------------------------------------------------------
function default_build_perl() {
diff --git a/devel/python3/BUILD b/devel/python3/BUILD
new file mode 100755
index 0000000..52efd61
--- /dev/null
+++ b/devel/python3/BUILD
@@ -0,0 +1,23 @@
+OPT="$CFLAGS" &&
+
+OPTS="--enable-shared $PYTHON3_OPTS $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"
+fi &&
+
+default_build &&
+
+if [[ $PY3K == y ]]; then
+ # python3 -c 'print ("(c)", "lynx"*3)'
+ make fullinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
+else
+ make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
+fi &&
+
+message "Fake stage complete, installing to real path.."
diff --git a/devel/python3/CONFIGURE b/devel/python3/CONFIGURE
new file mode 100755
index 0000000..b990cdd
--- /dev/null
+++ b/devel/python3/CONFIGURE
@@ -0,0 +1,11 @@
+config_query PY3K "Use Python 3 as primary version on the system?" n &&
+
+config_query_option PYTHON3_OPTS \
+ "Enable IPv6?" y \
+ "--enable-ipv6" \
+ "--disable-ipv6" &&
+
+config_query_option PYTHON3_OPTS \
+ "Enable POSIX threads (pthreads) support?" y \
+ "--with-pth" \
+ "--without-pth"
diff --git a/devel/python3/CONFLICTS b/devel/python3/CONFLICTS
new file mode 100755
index 0000000..ef99b71
--- /dev/null
+++ b/devel/python3/CONFLICTS
@@ -0,0 +1 @@
+conflicts python3000 y
diff --git a/devel/python3/DEPENDS b/devel/python3/DEPENDS
new file mode 100755
index 0000000..76d7d7f
--- /dev/null
+++ b/devel/python3/DEPENDS
@@ -0,0 +1,11 @@
+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-main=g++" \
+ "--without-cxx-main" \
+ "for C++ module support"
diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
new file mode 100755
index 0000000..9a819bb
--- /dev/null
+++ b/devel/python3/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=python3
+ VERSION=3.1.1
+ SOURCE=Python-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
+ SOURCE_URL[0]=http://www.python.org/ftp/python/$VERSION/$SOURCE
+ SOURCE2_URL[0]=http://www.python.org/download/releases/$VERSION/$SOURCE2
+ SOURCE_GPG=python.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ WEB_SITE=http://www.python.org/
+ ENTERED=20081203
+ LICENSE[0]=PYTHON
+ KEYWORDS="devel"
+ SHORT="interpreted, interactive, object-oriented language,
version 3"
+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.
+EOF
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
new file mode 100644
index 0000000..9268c65
--- /dev/null
+++ b/devel/python3/HISTORY
@@ -0,0 +1,3 @@
+2009-08-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * {PRE_,}BUILD, CONFIGURE, {{PRE_,}SUB_,}DEPENDS, DETAILS, HISTORY,
+ INSTALL, {UP_,}TRIGGERS, python.gpg, volatiles: spell created
diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
new file mode 100755
index 0000000..c678f20
--- /dev/null
+++ b/devel/python3/INSTALL
@@ -0,0 +1,9 @@
+cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
+
+if [[ -f "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" ]]; then
+ cp "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" "$PYPATH"
+fi &&
+
+# gettext
+install -vm 755 "$SOURCE_DIRECTORY/Tools/i18n/"{pygettext.py,msgfmt.py} \
+ "$INSTALL_ROOT/usr/bin"
diff --git a/devel/python3/PRE_BUILD b/devel/python3/PRE_BUILD
new file mode 100755
index 0000000..4d190fe
--- /dev/null
+++ b/devel/python3/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/wchar.patch"
diff --git a/devel/python3/PRE_SUB_DEPENDS b/devel/python3/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..41377bf
--- /dev/null
+++ b/devel/python3/PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ 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
diff --git a/devel/python3/SUB_DEPENDS b/devel/python3/SUB_DEPENDS
new file mode 100755
index 0000000..3b2de4b
--- /dev/null
+++ b/devel/python3/SUB_DEPENDS
@@ -0,0 +1,10 @@
+case $THIS_SUB_DEPENDS in
+ 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/python3/TRIGGERS b/devel/python3/TRIGGERS
new file mode 100755
index 0000000..4a23cff
--- /dev/null
+++ b/devel/python3/TRIGGERS
@@ -0,0 +1,3 @@
+on_cast gettext check_self
+on_dispel pygtk2 check_self
+on_dispel pygobject check_self
diff --git a/devel/python3/UP_TRIGGERS b/devel/python3/UP_TRIGGERS
new file mode 100755
index 0000000..f9be32e
--- /dev/null
+++ b/devel/python3/UP_TRIGGERS
@@ -0,0 +1,22 @@
+# up_trigger everything on minor version updates
+
+if spell_ok $SPELL && [[ $PY3K == y ]]; then
+ 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..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+
+ for each in $(show_up_depends $SPELL 1); 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
+fi
diff --git a/devel/python3/python.gpg b/devel/python3/python.gpg
new file mode 100644
index 0000000..08682b7
Binary files /dev/null and b/devel/python3/python.gpg differ
diff --git a/devel/python3/volatiles b/devel/python3/volatiles
new file mode 100755
index 0000000..c4f7a3c
--- /dev/null
+++ b/devel/python3/volatiles
@@ -0,0 +1 @@
+^.*.pyc$
diff --git a/devel/python3/wchar.patch b/devel/python3/wchar.patch
new file mode 100644
index 0000000..7d63003
--- /dev/null
+++ b/devel/python3/wchar.patch
@@ -0,0 +1,11 @@
+--- Modules/python.c.orig 2009-05-29 18:22:26.000000000 +0200
++++ Modules/python.c 2009-06-29 16:18:12.800560478 +0200
+@@ -57,7 +57,7 @@
+ /* Overallocate; as multi-byte characters are in the argument, the
+ actual output could use less memory. */
+ argsize = strlen(arg) + 1;
+- res = PyMem_Malloc(argsize*sizeof(wchar_t));
++ res = (wchar_t *)PyMem_Malloc(argsize*sizeof(wchar_t));
+ if (!res) goto oom;
+ in = (unsigned char*)arg;
+ out = res;
diff --git a/devel/python3000/BUILD b/devel/python3000/BUILD
index fea0ea8..27ba77d 100755
--- a/devel/python3000/BUILD
+++ b/devel/python3000/BUILD
@@ -1,23 +1 @@
-OPT="$CFLAGS" &&
-
-OPTS="--enable-shared $PYTHON3_OPTS $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"
-fi &&
-
-default_build &&
-
-if [[ $PY3K == y ]]; then
- # python -c 'print ("(c)", "lynx"*3)'
- make fullinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
-else
- make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
-fi &&
-
-message "Fake stage complete, installing to real path.."
+true
diff --git a/devel/python3000/CONFIGURE b/devel/python3000/CONFIGURE
deleted file mode 100755
index 1951dae..0000000
--- a/devel/python3000/CONFIGURE
+++ /dev/null
@@ -1,11 +0,0 @@
-config_query PY3K "Use Python 3000 as primary version on the system?" n &&
-
-config_query_option PYTHON3_OPTS \
- "Enable IPv6?" y \
- "--enable-ipv6" \
- "--disable-ipv6" &&
-
-config_query_option PYTHON3_OPTS \
- "Enable POSIX threads (pthreads) support?" y \
- "--with-pth" \
- "--without-pth"
diff --git a/devel/python3000/DEPENDS b/devel/python3000/DEPENDS
index 76d7d7f..8c09196 100755
--- a/devel/python3000/DEPENDS
+++ b/devel/python3000/DEPENDS
@@ -1,11 +1 @@
-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-main=g++" \
- "--without-cxx-main" \
- "for C++ module support"
+depends python3
diff --git a/devel/python3000/DETAILS b/devel/python3000/DETAILS
index 5e67c40..b2bafae 100755
--- a/devel/python3000/DETAILS
+++ b/devel/python3000/DETAILS
@@ -1,23 +1,8 @@
- SPELL=python3000
- VERSION=3.1.1
- SOURCE=Python-$VERSION.tar.bz2
- SOURCE2=$SOURCE.asc
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
- SOURCE_URL[0]=http://www.python.org/ftp/python/$VERSION/$SOURCE
- SOURCE2_URL[0]=http://www.python.org/download/releases/$VERSION/$SOURCE2
- SOURCE_GPG=python.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
- WEB_SITE=http://www.python.org/
- ENTERED=20081203
- LICENSE[0]=PYTHON
- KEYWORDS="devel"
- SHORT="interpreted, interactive, object-oriented language,
version 3"
+ SPELL=python3000
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ ARCHIVE=off
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.
+deprecated spell [replaced by python3]
EOF
diff --git a/devel/python3000/HISTORY b/devel/python3000/HISTORY
index 3c657a1..e1f90cd 100644
--- a/devel/python3000/HISTORY
+++ b/devel/python3000/HISTORY
@@ -1,3 +1,8 @@
+2009-08-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * spell deprecated [renamed to python3]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2009-08-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.1.1

diff --git a/devel/python3000/INSTALL b/devel/python3000/INSTALL
index c678f20..27ba77d 100755
--- a/devel/python3000/INSTALL
+++ b/devel/python3000/INSTALL
@@ -1,9 +1 @@
-cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
-
-if [[ -f "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" ]]; then
- cp "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" "$PYPATH"
-fi &&
-
-# gettext
-install -vm 755 "$SOURCE_DIRECTORY/Tools/i18n/"{pygettext.py,msgfmt.py} \
- "$INSTALL_ROOT/usr/bin"
+true
diff --git a/devel/python3000/PRE_BUILD b/devel/python3000/PRE_BUILD
index 4d190fe..27ba77d 100755
--- a/devel/python3000/PRE_BUILD
+++ b/devel/python3000/PRE_BUILD
@@ -1,4 +1 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/wchar.patch"
+true
diff --git a/devel/python3000/PRE_SUB_DEPENDS
b/devel/python3000/PRE_SUB_DEPENDS
deleted file mode 100755
index eb48c7f..0000000
--- a/devel/python3000/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-case $THIS_SUB_DEPENDS in
- 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
diff --git a/devel/python3000/SUB_DEPENDS b/devel/python3000/SUB_DEPENDS
deleted file mode 100755
index 4205f7c..0000000
--- a/devel/python3000/SUB_DEPENDS
+++ /dev/null
@@ -1,10 +0,0 @@
-case $THIS_SUB_DEPENDS in
- 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/python3000/TRIGGERS b/devel/python3000/TRIGGERS
deleted file mode 100755
index 4a23cff..0000000
--- a/devel/python3000/TRIGGERS
+++ /dev/null
@@ -1,3 +0,0 @@
-on_cast gettext check_self
-on_dispel pygtk2 check_self
-on_dispel pygobject check_self
diff --git a/devel/python3000/UP_TRIGGERS b/devel/python3000/UP_TRIGGERS
index f9be32e..1ba9982 100755
--- a/devel/python3000/UP_TRIGGERS
+++ b/devel/python3000/UP_TRIGGERS
@@ -1,22 +1 @@
-# up_trigger everything on minor version updates
-
-if spell_ok $SPELL && [[ $PY3K == y ]]; then
- 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..."
- message "Figuring out what spells need to be recast, this may take a
while."
-
- for each in $(show_up_depends $SPELL 1); 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
-fi
+up_trigger python3000 dispel_self
diff --git a/devel/python3000/python.gpg b/devel/python3000/python.gpg
deleted file mode 100644
index 08682b7..0000000
Binary files a/devel/python3000/python.gpg and /dev/null differ
diff --git a/devel/python3000/volatiles b/devel/python3000/volatiles
deleted file mode 100755
index c4f7a3c..0000000
--- a/devel/python3000/volatiles
+++ /dev/null
@@ -1 +0,0 @@
-^.*.pyc$
diff --git a/devel/python3000/wchar.patch b/devel/python3000/wchar.patch
deleted file mode 100644
index 7d63003..0000000
--- a/devel/python3000/wchar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Modules/python.c.orig 2009-05-29 18:22:26.000000000 +0200
-+++ Modules/python.c 2009-06-29 16:18:12.800560478 +0200
-@@ -57,7 +57,7 @@
- /* Overallocate; as multi-byte characters are in the argument, the
- actual output could use less memory. */
- argsize = strlen(arg) + 1;
-- res = PyMem_Malloc(argsize*sizeof(wchar_t));
-+ res = (wchar_t *)PyMem_Malloc(argsize*sizeof(wchar_t));
- if (!res) goto oom;
- in = (unsigned char*)arg;
- out = res;
diff --git a/python-pypi/pyskein/BUILD b/python-pypi/pyskein/BUILD
new file mode 100755
index 0000000..78e28e3
--- /dev/null
+++ b/python-pypi/pyskein/BUILD
@@ -0,0 +1 @@
+default_build_python3
diff --git a/python-pypi/pyskein/DEPENDS b/python-pypi/pyskein/DEPENDS
new file mode 100755
index 0000000..8c09196
--- /dev/null
+++ b/python-pypi/pyskein/DEPENDS
@@ -0,0 +1 @@
+depends python3
diff --git a/python-pypi/pyskein/DETAILS b/python-pypi/pyskein/DETAILS
new file mode 100755
index 0000000..cdc9e0c
--- /dev/null
+++ b/python-pypi/pyskein/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=pyskein
+ VERSION=0.3.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ SOURCE_GPG=hagenf.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.coli.uni-saarland.de/~hagenf/personal/pyskein/
+ LICENSE[0]=GPL
+ ENTERED=20090822
+ SHORT="efficiently compute Skein hashes"
+cat << EOF
+PySkein is an extension module for Python 3.0 or later providing the Skein
hash
+algorithms (c.f. Skein website). It is based on the optimized version of the
+reference implementation written in C by Doug Whiting, allowing efficient
hash
+computations. (On a 2.8 GHz Opteron you can get a hashing performance of 373
+MB/s for Skein-512-512 as called from Python.)
+EOF
diff --git a/python-pypi/pyskein/HISTORY b/python-pypi/pyskein/HISTORY
new file mode 100644
index 0000000..61223d1
--- /dev/null
+++ b/python-pypi/pyskein/HISTORY
@@ -0,0 +1,2 @@
+2009-08-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * {PRE_,}BUILD, DEPENDS, DETAILS, INSTALL, hagenf.gpg: spell created
diff --git a/python-pypi/pyskein/INSTALL b/python-pypi/pyskein/INSTALL
new file mode 100755
index 0000000..6a91b84
--- /dev/null
+++ b/python-pypi/pyskein/INSTALL
@@ -0,0 +1 @@
+default_install_python3
diff --git a/python-pypi/pyskein/PRE_BUILD b/python-pypi/pyskein/PRE_BUILD
new file mode 100755
index 0000000..fcbea3f
--- /dev/null
+++ b/python-pypi/pyskein/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/unicode.patch"
diff --git a/python-pypi/pyskein/hagenf.gpg b/python-pypi/pyskein/hagenf.gpg
new file mode 100644
index 0000000..d0c9565
Binary files /dev/null and b/python-pypi/pyskein/hagenf.gpg differ
diff --git a/python-pypi/pyskein/unicode.patch
b/python-pypi/pyskein/unicode.patch
new file mode 100644
index 0000000..3bcc2ac
--- /dev/null
+++ b/python-pypi/pyskein/unicode.patch
@@ -0,0 +1,33 @@
+--- setup.py.orig 2009-08-12 00:22:38.000000000 +0400
++++ setup.py 2009-08-22 17:41:04.416503647 +0400
+@@ -17,7 +17,7 @@
+ setup(name="pyskein",
+ version="0.3.1",
+ description="Efficiently compute Skein hashes",
+- author="Hagen Fürstenau",
++ author="Hagen Furstenau",
+ author_email="hfuerstenau AT gmx.net",
+ license="GPL",
+ url=HOMEPAGE,
+--- scripts/skeinsum.orig 2009-08-12 00:22:38.000000000 +0400
++++ scripts/skeinsum 2009-08-22 17:38:26.354503659 +0400
+@@ -1,7 +1,7 @@
+ #!/usr/local/bin/python3
+
+ # skeinsum.py
+-# Copyright 2008, 2009 Hagen Fürstenau <hfuerstenau AT gmx.net>
++# Copyright 2008, 2009 Hagen Furstenau <hfuerstenau AT gmx.net>
+ #
+ # Demonstrates Skein hashing with PySkein.
+ #
+--- scripts/threefish.orig 2009-08-12 00:22:38.000000000 +0400
++++ scripts/threefish 2009-08-22 17:38:20.602503287 +0400
+@@ -1,7 +1,7 @@
+ #!/usr/local/bin/python3
+
+ # threefish.py
+-# Copyright 2008, 2009 Hagen Fürstenau <hfuerstenau AT gmx.net>
++# Copyright 2008, 2009 Hagen Furstenau <hfuerstenau AT gmx.net>
+ #
+ # Demonstrates Threefish encryption with PySkein.
+ #



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8ac3d1aa361331f6f29ae5885160338df41d3061), Vlad Glagolev, 08/22/2009

Archive powered by MHonArc 2.6.24.

Top of Page