[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7395abc42027aed2522d949849f407d6922fe6ff)

Vlad Glagolev scm at sourcemage.org
Tue Jul 6 07:01:29 EDT 2010


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

 devel/python/BUILD                         |    4 +---
 devel/python/CONFIGURE                     |   11 ++++++++---
 devel/python/DEPENDS                       |   10 ++++++++--
 devel/python/DETAILS                       |    3 +--
 devel/python/HISTORY                       |    8 ++++++++
 devel/python/PRE_BUILD                     |    3 ---
 devel/python/Python-2.6.2_tcl-tk-8.6.patch |   14 --------------
 devel/python/python.gpg                    |binary
 gnome2-libs/libgsf/DEPENDS                 |    4 ++++
 gnome2-libs/libgsf/HISTORY                 |    3 +++
 gnome2-libs/vte/DEPENDS                    |    4 ++++
 gnome2-libs/vte/HISTORY                    |    3 +++
 12 files changed, 40 insertions(+), 27 deletions(-)

New commits:
commit 7395abc42027aed2522d949849f407d6922fe6ff
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    python: => 2.7

commit e0e1fe307bebca9a67d617d171f68d5adf0a07b5
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libgsf: added python dep

commit b3984187c02f40e4f2183a30ec555d0be3ebfd9a
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    vte: added python dep

diff --git a/devel/python/BUILD b/devel/python/BUILD
index 443567a..87f5f71 100755
--- a/devel/python/BUILD
+++ b/devel/python/BUILD
@@ -1,6 +1,4 @@
-OPT="$CFLAGS" &&
-
-OPTS="--enable-shared $OPTS $PYTHON_OPTS" &&
+OPTS="--enable-shared $PYTHON_OPTS $OPTS" &&
 
 # The following file from kdebindings has a syntax error that
 # makes Python compilation fail
diff --git a/devel/python/CONFIGURE b/devel/python/CONFIGURE
index 6771864..a962b5a 100755
--- a/devel/python/CONFIGURE
+++ b/devel/python/CONFIGURE
@@ -1,16 +1,21 @@
 config_query_option PYTHON_OPTS \
-                    "enable IPv6?" y \
+                    "Enable IPv6?" y \
                     "--enable-ipv6" \
                     "--disable-ipv6" &&
 
 config_query_option PYTHON_OPTS \
-                    "enable threads support?" y \
+                    "Enable signal module?" y \
+                    "--with-signal-module" \
+                    "--without-signal-module" &&
+
+config_query_option PYTHON_OPTS \
+                    "Enable threads support?" y \
                     "--with-threads" \
                     "--without-threads" &&
 
 if list_find "$PYTHON_OPTS" "--with-threads"; then
   config_query_option PYTHON_OPTS \
-                      "enable POSIX threads (pthreads) support?" n \
+                      "Enable POSIX threads (pthreads) support?" n \
                       "--with-pth" \
                       "--without-pth"
 fi
diff --git a/devel/python/DEPENDS b/devel/python/DEPENDS
index d93eb7b..02a6e94 100755
--- a/devel/python/DEPENDS
+++ b/devel/python/DEPENDS
@@ -1,13 +1,19 @@
-optional_depends libffi '--with-system-ffi' '' 'system ffi library' &&
 optional_depends gdbm "" "" "gnu db support(old)" &&
 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 openssl "" "" "for SSL support" &&
 
+optional_depends libffi "--with-system-ffi" "" "for _ctypes module" &&
+optional_depends expat "--with-system-expat" "" "for XML parser module" &&
+
+optional_depends valgrind \
+                 "--with-valgrind" \
+                 "--without-valgrind" \
+                 "for Valgrind support" &&
+
 optional_depends g++ \
                  "--with-cxx-main=g++" \
                  "--without-cxx-main" \
diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index 7b766f0..6bc430c 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,6 +1,5 @@
            SPELL=python
-         VERSION=2.6.5
-      PATCHLEVEL=1
+         VERSION=2.7
           SOURCE=Python-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 82dd601..0ca5ae4 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,11 @@
+2010-07-06 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.7
+	* CONFIGURE: use sentence case; added signal module selection
+	* DEPENDS: added new missing deps
+	* BUILD: cleaned up; removed useless defines
+	* python.gpg: added key A4135B38 (Benjamin Peterson <benjamin at python.org>)
+	* PRE_BUILD, Python-2.6.2_tcl-tk-8.6.patch: removed, not needed anymore
+
 2010-04-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: add optional libffi
 
diff --git a/devel/python/PRE_BUILD b/devel/python/PRE_BUILD
deleted file mode 100755
index 02384f6..0000000
--- a/devel/python/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < ${SPELL_DIRECTORY}/Python-2.6.2_tcl-tk-8.6.patch
diff --git a/devel/python/Python-2.6.2_tcl-tk-8.6.patch b/devel/python/Python-2.6.2_tcl-tk-8.6.patch
deleted file mode 100644
index 6142943..0000000
--- a/devel/python/Python-2.6.2_tcl-tk-8.6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur Python-2.6.2.orig/setup.py Python-2.6.2/setup.py
---- Python-2.6.2.orig/setup.py	2009-03-31 20:20:48.000000000 +0200
-+++ Python-2.6.2/setup.py	2009-09-01 04:15:59.928688429 +0200
-@@ -1541,8 +1541,8 @@
-         # The versions with dots are used on Unix, and the versions without
-         # dots on Windows, for detection by cygwin.
-         tcllib = tklib = tcl_includes = tk_includes = None
--        for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2',
--                        '82', '8.1', '81', '8.0', '80']:
-+        for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-+                        '8.2', '82', '8.1', '81', '8.0', '80']:
-             tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
-             tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)
-             if tklib and tcllib:
diff --git a/devel/python/python.gpg b/devel/python/python.gpg
index 053455a..9c20f08 100644
Binary files a/devel/python/python.gpg and b/devel/python/python.gpg differ
diff --git a/gnome2-libs/libgsf/DEPENDS b/gnome2-libs/libgsf/DEPENDS
index 7e43641..223086b 100755
--- a/gnome2-libs/libgsf/DEPENDS
+++ b/gnome2-libs/libgsf/DEPENDS
@@ -21,6 +21,10 @@ optional_depends pygtk2 \
                  "--without-python" \
                  "build with the python support" &&
 
+if is_depends_enabled $SPELL pygtk2; then
+  depends python
+fi &&
+
 optional_depends libbonobo \
                  "--with-bonobo" \
                  "--without-bonobo" \
diff --git a/gnome2-libs/libgsf/HISTORY b/gnome2-libs/libgsf/HISTORY
index 74d7d8d..ebd378e 100644
--- a/gnome2-libs/libgsf/HISTORY
+++ b/gnome2-libs/libgsf/HISTORY
@@ -1,3 +1,6 @@
+2010-07-06 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: added python dep
+
 2010-04-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.14.18
 
diff --git a/gnome2-libs/vte/DEPENDS b/gnome2-libs/vte/DEPENDS
index ba166d2..0ba1e69 100755
--- a/gnome2-libs/vte/DEPENDS
+++ b/gnome2-libs/vte/DEPENDS
@@ -14,6 +14,10 @@ optional_depends pygtk2                                  \
                  "--enable-python" "--disable-python"    \
                  "to build python bindings for vte"      &&
 
+if is_depends_enabled $SPELL pygtk2; then
+  depends python
+fi &&
+
 optional_depends gtk-doc                                 \
                  "--enable-gtk-doc" "--disable-gtk-doc"  \
                  "build documentation with gtk-doc"
diff --git a/gnome2-libs/vte/HISTORY b/gnome2-libs/vte/HISTORY
index 7434ce1..8c9e17d 100644
--- a/gnome2-libs/vte/HISTORY
+++ b/gnome2-libs/vte/HISTORY
@@ -1,3 +1,6 @@
+2010-07-06 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: added missing python dep
+
 2010-06-22 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.24.2
 



More information about the SM-Commit mailing list