Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (1e08a2cfb0542a60e015537497e6efe422651fd7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andra?? Levstik <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (1e08a2cfb0542a60e015537497e6efe422651fd7)
  • Date: Sun, 12 Nov 2006 12:56:04 -0600

GIT changes to master grimoire by Andra?? Levstik <ruskie AT mages.ath.cx>:

ChangeLog | 4 ++++
audio-players/xmms2/DEPENDS | 6 +++++-
audio-players/xmms2/HISTORY | 3 +++
libs/boost/BUILD | 17 +++++++++--------
libs/boost/CONFIGURE | 15 ++++++++-------
libs/boost/DEPENDS | 11 +++++------
libs/boost/DETAILS | 2 +-
libs/boost/HISTORY | 8 ++++++++
libs/boost/INSTALL | 14 +++++++-------
libs/boost/PRE_SUB_DEPENDS | 18 ++++++++++++++++++
libs/boost/SUB_DEPENDS | 18 ++++++++++++++++++
python-devel/httplib2/DEPENDS | 1 +
python-devel/httplib2/DETAILS | 14 ++++++++++++++
python-devel/httplib2/HISTORY | 2 ++
telephony/twinkle/DEPENDS | 40 ++++++++++++++++++++++++++++------------
telephony/twinkle/HISTORY | 3 +++
16 files changed, 134 insertions(+), 42 deletions(-)

New commits:
commit 0688a2c3c168078524c8954b3856021b40caf81b
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

httplib2: new spell

commit 689669c2743a453e0fb40e7ec5e4b109dc707d46
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

twinkle: boost subdepend

commit 9c5e4ee94eb47bc8b176eced264508bbd1bfccc4
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

xmms2: boost subdepends

commit db6f3ee1fcdde280173cbd241c61720b17b0c2e1
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

boost: enhanced the spell with sub depends and minor fixes...

diff --git a/ChangeLog b/ChangeLog
index c9ff860..40339e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-12 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * python-devel/httplib2: new spell neede for
+ libopensync-plugin-google-calendar forgot it
+
2006-11-11 George Sherwood <george AT beernabeer.com>
* chat-im/gaim1.5: new spell
* chat-im/gaim-encryption-1.x: new spell
diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS
index 788baec..8c6bb42 100755
--- a/audio-players/xmms2/DEPENDS
+++ b/audio-players/xmms2/DEPENDS
@@ -1,3 +1,4 @@
+. $GRIMOIRE/is_depends_enabled.function &&
depends scons &&
depends sqlite &&
depends glib2 &&
@@ -107,5 +108,8 @@ optional_depends ecore
optional_depends boost \
"" \
"xmmsclient++" \
- "For C++ bindings."
+ "For C++ bindings." &&
+if is_depends_enabled $SPELL boost ; then
+ sub_depends boost SIGNALS
+fi
fi
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index b85b7bd..afeb5e3 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,6 @@
+2006-11-12 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: boost subdepends on SIGNALS
+
2006-11-10 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* PRE_SUB_DEPENDS: added sourcing of is_depends_enabled

diff --git a/libs/boost/BUILD b/libs/boost/BUILD
index 4236b63..14619fc 100755
--- a/libs/boost/BUILD
+++ b/libs/boost/BUILD
@@ -1,21 +1,22 @@
local BLIST="" &&
+local BL &&
if list_find "${BOOST_LIBS}" "all" ; then
BLIST=""
else
local SEP=" --with-" &&
- for BL in $BOOST_LIBS;do
+ for BL in $BOOST_LIBS $BOOST_OPTS1 ;do
BL=${BL// /} &&
BLIST="${BLIST}${SEP}${BL}"
done
fi &&
-OPTS="$OPTS $BLIST" &&
-if spell_ok python; then
- PY_VER="`installed_version python|cut -c-3`" &&
- persistent_add PY_VER
-fi &&
+if ! list_find "$BOOST_LIBS" "python" &&
+ ! list_find "$BOOST_OPTS1" "python" ; then
+ BLIST="$BLIST --without-python"
+fi
+OPTS="$OPTS $BLIST" &&
CXXFLAGS="$CXXFLAGS" \
-PYTHON_VERSION="$PY_VER" \
-bjam --prefix=${INSTALL_ROOT}/usr \
+bjam -q \
+ --prefix=${INSTALL_ROOT}/usr \
-sTOOLS=gcc \
"-sBUILD=${BOOST_VARIANT## }" \
--layout=system \
diff --git a/libs/boost/CONFIGURE b/libs/boost/CONFIGURE
index 1eb9d2e..026cbd1 100755
--- a/libs/boost/CONFIGURE
+++ b/libs/boost/CONFIGURE
@@ -1,8 +1,9 @@
-source $GRIMOIRE/FUNCTIONS &&
-config_query_multi BOOST_LIBS "Which libraries would you like to install?" \
- all regex signals serialization thread \
- python filesystem \
- wave date_time iostreams test \
- program_options graph
&&
-config_query_multi BOOST_VARIANT "What variant of boost do you want?" \
+. $GRIMOIRE/config_query_multi.function
&&
+config_query_multi BOOST_LIBS "Which libraries would you like to install?"
\
+ all regex signals serialization thread
\
+ python filesystem
\
+ wave date_time iostreams test
\
+ program_options graph
&&
+config_query_multi BOOST_VARIANT "What variant of boost do you want?"
\
release debug
+
diff --git a/libs/boost/DEPENDS b/libs/boost/DEPENDS
index b4c8a0d..6fbc13f 100755
--- a/libs/boost/DEPENDS
+++ b/libs/boost/DEPENDS
@@ -1,11 +1,10 @@
depends g++ &&
depends boost-jam &&
-for BL in $BOOST_LIBS;do
- if [ $BL == python ];then
- depends python "--with-python-root"
- fi
-done &&
+if list_find "$BOOST_LIBS" "python"
+then
+ depends python "--with-python-version=$(installed_version python | cut
-c-3)"
+fi &&
optional_depends icu \
"-sHAVE_ICU=1" \
- "" \
+ "-sHAVE_ICU=0" \
"Unicode support"
diff --git a/libs/boost/DETAILS b/libs/boost/DETAILS
index 4df9121..13a679a 100755
--- a/libs/boost/DETAILS
+++ b/libs/boost/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPEL
WEB_SITE=http://www.boost.org/
ENTERED=20031013
LICENSE[0]=http://www.boost.org/LICENSE_1_0.txt
- PATCHLEVEL=2
+ PATCHLEVEL=3
KEYWORDS="libs"
SHORT="Portable C++ source libraries"
cat << EOF
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 87437d8..1263a58 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,11 @@
+2006-11-12 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: PATCHLEVEL++
+ * INSTALL: made it better and now using -q
+ * BUILD: improved a lot and using -q
+ * PRE_SUB_DEPENDS: added
+ * SUB_DEPENDS: added
+ * DEPENDS: minor fixup
+
2006-11-07 Treeeve Jelbert <treeve AT pi.be>
* BUILD, INSTALL: add support for python 2.5

diff --git a/libs/boost/INSTALL b/libs/boost/INSTALL
index 48f7559..459c2b0 100755
--- a/libs/boost/INSTALL
+++ b/libs/boost/INSTALL
@@ -1,8 +1,8 @@
-CXXFLAGS="$CXXFLAGS" \
-PYTHON_VERSION="$PY_VER" \
-bjam --prefix=${INSTALL_ROOT}/usr \
- -sTOOLS=gcc \
- -sBUILD=release \
- --layout=system \
- $OPTS \
+CXXFLAGS="$CXXFLAGS" \
+bjam -q \
+ --prefix=${INSTALL_ROOT}/usr \
+ -sTOOLS=gcc \
+ "-sBUILD=${BOOST_VARIANT## }" \
+ --layout=system \
+ $OPTS \
install
diff --git a/libs/boost/PRE_SUB_DEPENDS b/libs/boost/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..4e50ab1
--- /dev/null
+++ b/libs/boost/PRE_SUB_DEPENDS
@@ -0,0 +1,18 @@
+. $GRIMOIRE/is_depends_enabled.function
+case $THIS_SUB_DEPENDS in
+ PROGRAM_OPTIONS) list_find "$BOOST_LIBS" program_options ;;
+ SERIALIZATION) list_find "$BOOST_LIBS" serialization ;;
+ FILESYSTEM) list_find "$BOOST_LIBS" filesystem ;;
+ DATE_TIME) list_find "$BOOST_LIBS" date_time ;;
+ IOSTREAMS) list_find "$BOOST_LIBS" iostreams ;;
+ SIGNALS) list_find "$BOOST_LIBS" signals ;;
+ PYTHON) is_depends_enabled $SPELL python ;;
+ THREAD) list_find "$BOOST_LIBS" thread ;;
+ GRAPH) list_find "$BOOST_LIBS" graph ;;
+ REGEX) list_find "$BOOST_LIBS" regex ;;
+ TEST) list_find "$BOOST_LIBS" test ;;
+ WAVE) list_find "$BOOST_LIBS" wave ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
+
diff --git a/libs/boost/SUB_DEPENDS b/libs/boost/SUB_DEPENDS
new file mode 100755
index 0000000..b9552f5
--- /dev/null
+++ b/libs/boost/SUB_DEPENDS
@@ -0,0 +1,18 @@
+persistent_add BOOST_OPTS1
+case $THIS_SUB_DEPENDS in
+ PROGRAM_OPTIONS) list_add BOOST_OPTS1 program_options ;;
+ SERIALIZATION) list_add BOOST_OPTS1 serialization ;;
+ FILESYSTEM) list_add BOOST_OPTS1 filesystem ;;
+ DATE_TIME) list_add BOOST_OPTS1 date_time ;;
+ IOSTREAMS) list_add BOOST_OPTS1 iostreams ;;
+ SIGNALS) list_add BOOST_OPTS1 signals ;;
+ PYTHON) list_add BOOST_OPTS1 python &&
+ depends python
"--with-python-version=$(installed_version python | cut -c-3)" ;;
+ THREAD) list_add BOOST_OPTS1 thread ;;
+ GRAPH) list_add BOOST_OPTS1 graph ;;
+ REGEX) list_add BOOST_OPTS1 regex ;;
+ TEST) list_add BOOST_OPTS1 test ;;
+ WAVE) list_add BOOST_OPTS1 wave ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/python-devel/httplib2/DEPENDS b/python-devel/httplib2/DEPENDS
new file mode 100755
index 0000000..6e84a0e
--- /dev/null
+++ b/python-devel/httplib2/DEPENDS
@@ -0,0 +1 @@
+depends python
diff --git a/python-devel/httplib2/DETAILS b/python-devel/httplib2/DETAILS
new file mode 100755
index 0000000..5351527
--- /dev/null
+++ b/python-devel/httplib2/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=httplib2
+ VERSION=0.2.0
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://bitworking.org/projects/$SPELL/dist/$SOURCE
+
SOURCE_HASH=sha512:e8d4baa5a0016b1e0f4dc616331d4781be796ae89f012bcae897d07fe9865a45daf480fdde6aea1d21b1f7066fb4d1de803c849bba62fd16045c9974f0776687
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
+ WEB_SITE=http://bitworking.org/projects/httplib2/
+ LICENSE[0]=MIT
+ ENTERED=20061110
+ SHORT="comprehensive HTTP client library"
+cat << EOF
+A comprehensive HTTP client library, httplib2.py supports many features left
+out of other HTTP libraries.
+EOF
diff --git a/python-devel/httplib2/HISTORY b/python-devel/httplib2/HISTORY
new file mode 100644
index 0000000..14acb61
--- /dev/null
+++ b/python-devel/httplib2/HISTORY
@@ -0,0 +1,2 @@
+2006-11-10 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS, DEPENDS, HISTORY: created spell
diff --git a/telephony/twinkle/DEPENDS b/telephony/twinkle/DEPENDS
index 7c89e18..8994d64 100755
--- a/telephony/twinkle/DEPENDS
+++ b/telephony/twinkle/DEPENDS
@@ -1,12 +1,28 @@
-depends g++ &&
-depends flex &&
-depends commoncpp2 &&
-depends ccrtp &&
-depends qt-x11 &&
-depends libsndfile &&
-depends boost &&
-optional_depends "ilbc-rfc3951" "--with-ilbc" "--without-ilbc" "Internet
Low Bit Rate Codec" &&
-optional_depends "speex" "--with-speex" "--without-speex" "speex
support" &&
-optional_depends "kdelibs" "--with-kde" "--without-kde" "for KDE
integration" &&
-optional_depends "arts" "--with-arts" "--without-arts" "aRts sound
support" &&
-optional_depends "alsa-lib" "" "" "for ALSA sound support"
+depends g++ &&
+depends flex &&
+depends commoncpp2 &&
+depends ccrtp &&
+depends qt-x11 &&
+depends libsndfile &&
+depends boost &&
+sub_depends boost REGEX &&
+optional_depends "ilbc-rfc3951" \
+ "--with-ilbc" \
+ "--without-ilbc" \
+ "Internet Low Bit Rate Codec" &&
+optional_depends "speex" \
+ "--with-speex" \
+ "--without-speex" \
+ "speex support" &&
+optional_depends "kdelibs" \
+ "--with-kde" \
+ "--without-kde" \
+ "for KDE integration" &&
+optional_depends "arts" \
+ "--with-arts" \
+ "--without-arts" \
+ "aRts sound support" &&
+optional_depends "alsa-lib" \
+ "" \
+ "" \
+ "for ALSA sound support"
diff --git a/telephony/twinkle/HISTORY b/telephony/twinkle/HISTORY
index a7dc86b..7c254ec 100644
--- a/telephony/twinkle/HISTORY
+++ b/telephony/twinkle/HISTORY
@@ -1,3 +1,6 @@
+2006-11-12 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: subdepends on boost REGEX, make it conform to 80 chars line
+
2006-11-07 Treeve Jelbert <treeve AT pi.be>
* PRE_BUILD: deleted,
no longer needed with latest version of boost spell



  • [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (1e08a2cfb0542a60e015537497e6efe422651fd7), Andra?? Levstik, 11/12/2006

Archive powered by MHonArc 2.6.24.

Top of Page