Skip to Content.
Sympa Menu

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

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 (2dad7767bbd6e84e78b59dfbc8132c5b018838b5)
  • Date: Mon, 22 Aug 2011 06:01:32 -0500

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

chat-irc/znc/DEPENDS | 16 ++++++++++++++--
chat-irc/znc/HISTORY | 3 ++-
devel/swig/DEPENDS | 7 ++++++-
devel/swig/DETAILS | 6 +++---
devel/swig/HISTORY | 5 +++++
devel/swig/PRE_SUB_DEPENDS | 1 +
devel/swig/REPAIR^all^PRE_SUB_DEPENDS | 12 ++++++++++++
devel/swig/SUB_DEPENDS | 1 +
8 files changed, 44 insertions(+), 7 deletions(-)

New commits:
commit 9eb6ff709db21b91dc3a303160a1a206e7e88619
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

znc: added swig version check

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

swig: => 2.0.4

diff --git a/chat-irc/znc/DEPENDS b/chat-irc/znc/DEPENDS
index d6c063a..b6ca65c 100755
--- a/chat-irc/znc/DEPENDS
+++ b/chat-irc/znc/DEPENDS
@@ -1,3 +1,5 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends -sub CXX gcc &&

message "NOTE: ZNC needs swig enabled for modperl/modpython support" &&
@@ -11,13 +13,23 @@ if is_depends_enabled $SPELL perl; then
depends -sub PERL swig '--enable-swig'
fi &&

+if spell_ok python3; then
+ local PYTHON3_BRANCH=$(installed_version python3 | cut -d. -f1,2)
+else
+ local PYTHON3_BRANCH=$(codex_set_current_spell_quick python3; echo
$VERSION | cut -d. -f1,2)
+fi &&
+
optional_depends python3 \
- "--enable-python" \
+ "--enable-python=python-$PYTHON3_BRANCH" \
"--disable-python" \
"to use Python" &&

if is_depends_enabled $SPELL python3; then
- depends -sub PYTHON swig '--enable-swig'
+ depends -sub PYTHON3 swig '--enable-swig' &&
+
+ if spell_ok swig && is_version_less $(installed_version swig) 2.0.4; then
+ force_depends swig
+ fi
fi &&

optional_depends tcl \
diff --git a/chat-irc/znc/HISTORY b/chat-irc/znc/HISTORY
index e650c12..3890177 100644
--- a/chat-irc/znc/HISTORY
+++ b/chat-irc/znc/HISTORY
@@ -1,6 +1,7 @@
2011-08-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.200
- * DEPENDS: python3 is the only branch of Python supported
+ * DEPENDS: python3 is the only branch of Python supported; added swig
+ version check

2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
diff --git a/devel/swig/DEPENDS b/devel/swig/DEPENDS
index 02d6d6c..33032ad 100755
--- a/devel/swig/DEPENDS
+++ b/devel/swig/DEPENDS
@@ -18,7 +18,12 @@ optional_depends ocaml \
optional_depends python \
"--with-python=$INSTALL_ROOT/usr/bin/python" \
"--without-python" \
- "to include Python support" &&
+ "to include Python 2 support" &&
+
+optional_depends python3 \
+ "--with-python3=$INSTALL_ROOT/usr/bin/python3" \
+ "--without-python3" \
+ "to include Python 3 support" &&

optional_depends perl \
"--with-perl=$INSTALL_ROOT/usr/bin/perl" \
diff --git a/devel/swig/DETAILS b/devel/swig/DETAILS
index dfdb550..5b27b90 100755
--- a/devel/swig/DETAILS
+++ b/devel/swig/DETAILS
@@ -1,8 +1,8 @@
SPELL=swig
- VERSION=2.0.3
-
SOURCE_HASH=sha512:3290694162e5f314ba9946a187996a821cefb66b0a2f80c3f70cee11d5a36057db285f8f196376cde9057589a0f0c7b92f17e5095afeaa6fc4e52c9922b635f4
+ VERSION=2.0.4
+
SOURCE_HASH=sha512:f2918a35cd73ec7da5911803f44f81fc3a2b61ff13aa0e98b930ab54c64a21032c8b73cc4ca34b3b7c5f52d0106f04ae89f49db99f7749fbb056cd5e8070f968
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
LICENSE[0]=http://www.swig.org/copyright.html
WEB_SITE=http://www.swig.org/
diff --git a/devel/swig/HISTORY b/devel/swig/HISTORY
index dcd4408..f4a39bc 100644
--- a/devel/swig/HISTORY
+++ b/devel/swig/HISTORY
@@ -1,3 +1,8 @@
+2011-08-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.4; quoting paths
+ * {PRE_,}SUB_DEPENDS: added Python 3 support
+ * REPAIR^all^PRE_SUB_DEPENDS: repair PRE_SUB_DEPENDS
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/devel/swig/PRE_SUB_DEPENDS b/devel/swig/PRE_SUB_DEPENDS
index 8d56ae3..e4c0d2d 100755
--- a/devel/swig/PRE_SUB_DEPENDS
+++ b/devel/swig/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case "$THIS_SUB_DEPENDS" in
PYTHON) is_depends_enabled $SPELL python ;;
+ PYTHON3) is_depends_enabled $SPELL python3 ;;
GUILE) is_depends_enabled $SPELL guile ;;
JAVA) is_depends_enabled $SPELL JAVA ;;
PERL) is_depends_enabled $SPELL perl ;;
diff --git a/devel/swig/REPAIR^all^PRE_SUB_DEPENDS
b/devel/swig/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..e4c0d2d
--- /dev/null
+++ b/devel/swig/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,12 @@
+case "$THIS_SUB_DEPENDS" in
+ PYTHON) is_depends_enabled $SPELL python ;;
+ PYTHON3) is_depends_enabled $SPELL python3 ;;
+ GUILE) is_depends_enabled $SPELL guile ;;
+ JAVA) is_depends_enabled $SPELL JAVA ;;
+ PERL) is_depends_enabled $SPELL perl ;;
+ RUBY) is_depends_enabled $SPELL ruby ;;
+ PHP) is_depends_enabled $SPELL php ;;
+ TCL) is_depends_enabled $SPELL tcl ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/devel/swig/SUB_DEPENDS b/devel/swig/SUB_DEPENDS
index 096d2a2..c863258 100755
--- a/devel/swig/SUB_DEPENDS
+++ b/devel/swig/SUB_DEPENDS
@@ -1,5 +1,6 @@
case "$THIS_SUB_DEPENDS" in
PYTHON) depends python "--with-python=$INSTALL_ROOT/usr/bin/python" ;;
+ PYTHON3) depends python3 "--with-python3=$INSTALL_ROOT/usr/bin/python3"
;;
GUILE) depends guile "--with-guile=$INSTALL_ROOT/usr/bin/guile" ;;
JAVA) depends JAVA "--with-java" ;;
PERL) depends perl "--with-perl=$INSTALL_ROOT/usr/bin/perl" ;;



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2dad7767bbd6e84e78b59dfbc8132c5b018838b5), Vlad Glagolev, 08/22/2011

Archive powered by MHonArc 2.6.24.

Top of Page