Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (a65cec9596f157829c0cc75672e98b9473231e15)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (a65cec9596f157829c0cc75672e98b9473231e15)
  • Date: Thu, 19 Oct 2006 17:39:08 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

ChangeLog | 9 +++++++++
audio-creation/om-synth/DEPENDS | 5 +++++
audio-creation/om-synth/HISTORY | 4 ++++
audio-creation/rosegarden/DEPENDS | 5 +++++
audio-creation/rosegarden/HISTORY | 4 ++++
audio-creation/zynaddsubfx/HISTORY | 4 ++++
audio-creation/zynaddsubfx/PRE_BUILD | 5 +++++
audio-players/banshee/DEPENDS | 9 +++++++--
audio-players/banshee/HISTORY | 5 +++++
cluster/fann/BUILD | 6 ++++++
cluster/fann/HISTORY | 4 ++++
disk/dump/HISTORY | 4 ++++
disk/dump/INSTALL | 5 +++++
display/qingy/HISTORY | 5 +++++
display/qingy/PRE_BUILD | 8 +++++++-
ftp/proftpd/HISTORY | 5 +++++
ftp/proftpd/TRIGGERS | 23 ++++++++++-------------
gnome2-apps/gedit2/DEPENDS | 5 +++++
gnome2-apps/gedit2/HISTORY | 4 ++++
graphics/nip2/BUILD | 5 +++++
graphics/nip2/HISTORY | 4 ++++
is_depends_enabled.function | 17 +++++++++++++++++
kde-apps/KDE_DEPENDS | 16 ++++++++--------
kde-core/KDE_DEPENDS | 20 ++++++++++----------
kde-core/kdebase/DEPENDS | 20 +++++++++-----------
kde-core/kdebase/HISTORY | 5 +++++
printer/cups-old/HISTORY | 5 +++++
printer/cups-old/TRIGGERS | 12 ++++++++----
printer/cups/HISTORY | 5 +++++
printer/cups/TRIGGERS | 12 ++++++++----
python-devel/mercurial/HISTORY | 4 ++++
python-devel/mercurial/INSTALL | 5 +++++
utils/lshw/BUILD | 9 +++++++--
utils/lshw/CONFIGURE | 5 -----
utils/lshw/DEPENDS | 14 +++++++++++---
utils/lshw/DETAILS | 1 -
utils/lshw/HISTORY | 7 +++++++
utils/lshw/INSTALL | 4 ++--
video/xvattr/BUILD | 9 +++++++--
video/xvattr/HISTORY | 5 +++++
x11-libs/libafterimage/DEPENDS | 12 +++++++++---
x11-libs/libafterimage/WIP | 6 ++++++
42 files changed, 250 insertions(+), 71 deletions(-)

New commits:
commit c4ef1220de0a7847ff35ace6fd44170614bddd40
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

libafterimage: Source is_depends_enabled.function

commit ffefe45fcdbb55e4e76dc4c52a01a8a27c5c08ef
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

xvattr: Switch to using is_depends_enabled, source
is_depends_enabled.function.

commit 77f693c721cd676fc797a8d5e5de8404c0c5b7dd
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

lshw: Switch to is_depends_enabled, source is_depends_enabled.function.

commit 413c5869904e0e9b064db1e16643ed008e1283c5
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

cups: Switch to use is_depends_enabled, source
is_depends_enabled.function

commit 412702cc1912f0e4fda22ff1d3ca9048d947a775
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

cups-old: Switch to using is_depends_enabled, source
is_depends_enabled.function

commit cdb3bd8e8afa531bb0ec24cfb2c3aca365ec546d
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kde-core: Source is_depends_enabled.function to be able to use it always.

commit e65f98112b178fc05dccc8a2e9219e68dd32bfaf
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kde-core/KDE_DEPENDS: Source is_depends_enabled.function

commit 1f2f65e5993e5ae53e22490430943bcbf768a81d
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kde-apps/KDE_DEPENDS: Source is_depends_enabled.function

commit 1aefac66c977e81d6dfbc429f0ddb1b82bb8d6bd
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

nip2: Source is_depends_enabled.function

commit fa31ec7ac73322570ef43d4f387566c631f56f87
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

proftpd: Switch to using is_depends_enabled, source
is_depends_enabled.function.

commit 46a8fd481872d04a3479fa6508681624d42b7b0f
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

qingy: Source is_depends_enabled.function, fix invalid
is_depends_enabled call.

commit 721ed002871e0c553308ea2c9596aa2ee9a80fc8
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

banshee: Source is_depends_enabled.function, fixed invalid
is_depends_enabled call.

commit b5891f48d482b55c2276f2885bb6f0e46fc2ccdb
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

fann: Source is_depends_enabled.function

commit 59f67f88099f5dd23fd82763555551626f553fd9
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

mercurial: Source is_depends_enabled.function

commit 9d535da67c9331e1640a95d7529363ffc9a61aec
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

gedit2: Source is_depends_enabled.function

commit 8612c2523888301d95d7c9d1f3bf0be6cbe20f60
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

dump: Source is_depends_enabled.function

commit e574e4867c65111390ff3b3726e99e55ef54119d
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

zynaddsubfx: Source is_depends_enabled.function

commit 5bc2c8e5afee56da595f1a044bb4575a5e274aca
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

rosegarden: Source is_depends_enabled.function

commit 87d1efeecc677c8e3cfe4499ccad034587ad2d53
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

om-synth: Source is_depends_enabled.function

commit 83124e7a26bfbed87f50919f203077a5d97902f2
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

Added function is_depends_enabled temporarily until it is included in
stable sorcery. Spells that use is_depends_enabled need to source this
for now.

commit b2bde57726c4569cf8eaf0842d86195efaf35da2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Updated amanda to 2.5.1p1 (latest stable)

commit 243b6903a391db51ec05dc94dba49e1163d07f6e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Tim: missed something

commit 4599b7cc3ad2843b1ac456d74cb944e78ccb7c97
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

rename Tim -> tim #10658

diff --git a/ChangeLog b/ChangeLog
index ca91426..5a8bc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * kde-apps/KDE_DEPENDS: Source is_depends_enabled.function
+ (remove it when is_depends_enabled is in stable sorcery).
+ * kde-core/KDE_DEPENDS: Source is_depends_enabled.function.
+
+2006-10-19 Juuso Alasuutari <iuso AT sourcemage.org>
+ * is_depends_enabled.function: Added temporarily, to be removed
+ once is_depends_enabled is in stable sorcery.
+
2006-10-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* smgl/Tim renamed to tim #10658

diff --git a/audio-creation/om-synth/DEPENDS b/audio-creation/om-synth/DEPENDS
index 1deb7d8..17b707e 100755
--- a/audio-creation/om-synth/DEPENDS
+++ b/audio-creation/om-synth/DEPENDS
@@ -20,6 +20,11 @@ optional_depends libxml2
"--disable-console-clients" \
"to build console clients" &&

+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
if is_depends_enabled $SPELL libxml2; then
optional_depends flowcanvas \
"--enable-gtk-client" \
diff --git a/audio-creation/om-synth/HISTORY b/audio-creation/om-synth/HISTORY
index ed94d3a..578fce4 100644
--- a/audio-creation/om-synth/HISTORY
+++ b/audio-creation/om-synth/HISTORY
@@ -1,3 +1,7 @@
+2006-10-19 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery).
+
2006-09-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Added depends g++.

diff --git a/audio-creation/rosegarden/DEPENDS
b/audio-creation/rosegarden/DEPENDS
index 142666e..d2ba28d 100755
--- a/audio-creation/rosegarden/DEPENDS
+++ b/audio-creation/rosegarden/DEPENDS
@@ -22,6 +22,11 @@ if [[ "$ROSEGARDEN_SOUND" == y ]]; then
"nodssi=1" \
"for DSSI plugin support" &&

+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
if is_depends_enabled $SPELL ladspa ||
is_depends_enabled $SPELL dssi; then
optional_depends liblo "" "" "for audio plugin custom GUI support"
&&
diff --git a/audio-creation/rosegarden/HISTORY
b/audio-creation/rosegarden/HISTORY
index 8a60ba3..babeb83 100644
--- a/audio-creation/rosegarden/HISTORY
+++ b/audio-creation/rosegarden/HISTORY
@@ -1,3 +1,7 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery).
+
2006-09-20 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 1.4.0, changed short description.
* DEPENDS: Clarified lirc description.
diff --git a/audio-creation/zynaddsubfx/HISTORY
b/audio-creation/zynaddsubfx/HISTORY
index 7301b3a..30f7969 100644
--- a/audio-creation/zynaddsubfx/HISTORY
+++ b/audio-creation/zynaddsubfx/HISTORY
@@ -1,3 +1,7 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery).
+
2006-10-06 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Changed jack to JACK-DRIVER.

diff --git a/audio-creation/zynaddsubfx/PRE_BUILD
b/audio-creation/zynaddsubfx/PRE_BUILD
index 42a62ae..b872857 100755
--- a/audio-creation/zynaddsubfx/PRE_BUILD
+++ b/audio-creation/zynaddsubfx/PRE_BUILD
@@ -4,6 +4,11 @@ cd $SOURCE_DIRECTORY &&
# Apply bugfixes from Debian
patch -p1 < $SCRIPT_DIRECTORY/zyn_debian.diff &&

+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
# Apply config options shared by standalone & DSSI builds
sedit "s/^ASM_F2I=.*/ASM_F2I=$ASM_F2I/" src/Makefile.inc &&
if ! is_depends_enabled $SPELL fltk; then
diff --git a/audio-players/banshee/DEPENDS b/audio-players/banshee/DEPENDS
index 995b879..465c6f3 100755
--- a/audio-players/banshee/DEPENDS
+++ b/audio-players/banshee/DEPENDS
@@ -35,6 +35,11 @@ optional_depends avahi
"--disable-avahi --disable-daap" \
"Enable DAAP using avahi?" &&

-if $(is_depends_enabled avahi)
-then sub_depends avahi MONO
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL avahi; then
+ sub_depends avahi MONO
fi
diff --git a/audio-players/banshee/HISTORY b/audio-players/banshee/HISTORY
index 89d23a9..e37e6d9 100644
--- a/audio-players/banshee/HISTORY
+++ b/audio-players/banshee/HISTORY
@@ -1,3 +1,8 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery), corrected invalid
+ is_depends_enabled call.
+
2006-09-30 Bearcat M. Sandor <sourcemage AT feline-soul.com>
*DEPENDS: Updated to version 0.11.0

diff --git a/cluster/fann/BUILD b/cluster/fann/BUILD
index 8fe0357..19f639c 100755
--- a/cluster/fann/BUILD
+++ b/cluster/fann/BUILD
@@ -1,4 +1,10 @@
default_build &&
+
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
if is_depends_enabled $SPELL python
then
cd python &&
diff --git a/cluster/fann/HISTORY b/cluster/fann/HISTORY
index df3b440..fac4e1e 100644
--- a/cluster/fann/HISTORY
+++ b/cluster/fann/HISTORY
@@ -1,3 +1,7 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * BUILD: Source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery).
+
2006-10-11 David Brown <dmlb2000 AT gmail.com>
* DETAILS: updated 2.0.0 and sha512sum
* DEPENDS: added for python bindings
diff --git a/disk/dump/HISTORY b/disk/dump/HISTORY
index 3460661..c4abc69 100644
--- a/disk/dump/HISTORY
+++ b/disk/dump/HISTORY
@@ -1,3 +1,7 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * INSTALL: Source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery).
+
2006-09-22 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Version 0.4b41. GPG -> SHA512. Removed UPDATED,
corrected LICENSE, edited descriptions.
diff --git a/disk/dump/INSTALL b/disk/dump/INSTALL
index a97eeee..5d773c6 100755
--- a/disk/dump/INSTALL
+++ b/disk/dump/INSTALL
@@ -1,5 +1,10 @@
default_install &&

+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
if is_depends_enabled $SPELL openssl; then
install -m 755 rmt/ermt $INSTALL_ROOT/usr/sbin/ermt
fi
diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY
index c32a167..d6dd311 100644
--- a/display/qingy/HISTORY
+++ b/display/qingy/HISTORY
@@ -1,3 +1,8 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery), fixed invalid
+ is_depends_enabled call.
+
2006-10-11 Arjan Bouter <abouter AT sourcemage.org>
* BUILD: removed themedir configure option and default to upstream
default
* DETAILS: PATCHLEVEL=4
diff --git a/display/qingy/PRE_BUILD b/display/qingy/PRE_BUILD
index e7bfa7e..9395dea 100755
--- a/display/qingy/PRE_BUILD
+++ b/display/qingy/PRE_BUILD
@@ -1,7 +1,13 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
patch -p1 < $SCRIPT_DIRECTORY/shutdown.patch &&
-if ! ( is_depends_enabled emacs ); then
+
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if ! is_depends_enabled $SPELL emacs; then
rm media/sessions/emacs &&
sedit "s/emacs//" media/sessions/Makefile.am &&
sedit "s/emacs//" media/sessions/Makefile.in
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index 5569cec..042227c 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,8 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * TRIGGERS: Rewritten to use is_depends_enabled, sources
+ is_depends_enabled.function (remove it when is_depends_enabled
+ is in stable sorcery).
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/ftp/proftpd/TRIGGERS b/ftp/proftpd/TRIGGERS
index b8de68e..d21f443 100755
--- a/ftp/proftpd/TRIGGERS
+++ b/ftp/proftpd/TRIGGERS
@@ -1,15 +1,12 @@
-#messy code to be replaced with 'is_depends_enabled $SPELL mysql' when
-#sorcery 1.14 is out
-for i in $(grep $SPELL $DEPENDS_STATUS);
-do if [ $(echo $i | cut -d: -f1) = "$SPELL" ] && [ $(echo $i | cut -d: -f2)
== "linux-pam" ] && [ $(echo $i | cut -d: -f3 ) = "on" ] ;
- then on_cast linux-pam cast_self
- fi
-done &&
-for i in $(grep $SPELL $DEPENDS_STATUS);
-do if [ $(echo $i | cut -d: -f1) = "$SPELL" ] && [ $(echo $i | cut -d:
--f2) == "mysql" ] && [ $(echo $i | cut -d: -f3 ) = "on" ] ;
- then on_cast mysql check_self
- fi
-done
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&

+if is_depends_enabled $SPELL linux-pam; then
+ on_cast linux-pam cast_self
+fi &&

+if is_depends_enabled $SPELL mysql; then
+ on_cast mysql check_self
+fi
diff --git a/gnome2-apps/gedit2/DEPENDS b/gnome2-apps/gedit2/DEPENDS
index a71260d..c20a690 100755
--- a/gnome2-apps/gedit2/DEPENDS
+++ b/gnome2-apps/gedit2/DEPENDS
@@ -24,6 +24,11 @@ optional_depends gtk-doc
"--disable-gtk-doc" \
"to build documentation" &&

+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
if is_depends_enabled $SPELL python; then
depends gnome-python-desktop &&
depends pygobject &&
diff --git a/gnome2-apps/gedit2/HISTORY b/gnome2-apps/gedit2/HISTORY
index 65f035c..2e2b526 100644
--- a/gnome2-apps/gedit2/HISTORY
+++ b/gnome2-apps/gedit2/HISTORY
@@ -1,3 +1,7 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery).
+
2006-10-02 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 2.16.1

diff --git a/graphics/nip2/BUILD b/graphics/nip2/BUILD
index d48087d..7bdd2e8 100755
--- a/graphics/nip2/BUILD
+++ b/graphics/nip2/BUILD
@@ -1,3 +1,8 @@
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
if is_depends_enabled vips imagemagick; then
if is_depends_enabled imagemagick graphviz; then
LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,/usr/lib/graphviz"
diff --git a/graphics/nip2/HISTORY b/graphics/nip2/HISTORY
index 73626bd..86a2bb1 100644
--- a/graphics/nip2/HISTORY
+++ b/graphics/nip2/HISTORY
@@ -1,3 +1,7 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * BUILD: Source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery).
+
2006-09-18 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 7.10.21

diff --git a/is_depends_enabled.function b/is_depends_enabled.function
new file mode 100644
index 0000000..6b54209
--- /dev/null
+++ b/is_depends_enabled.function
@@ -0,0 +1,17 @@
+#
+## This is here temporarily until is_depends_enabled is integrated to
+## stable sorcery. Before that this needs to be sourced by spells which
+## use is_depends_enabled.
+#
+if ! declare -f is_depends_enabled &>/dev/null; then
+ function is_depends_enabled() {
+ local dep_status
+ if [[ $3 ]] ; then
+ dep_status=$DEPENDS_STATUS
+ else
+ dep_status=$(hash_get uncommitted_hash $1)
+ [[ $dep_status ]] || dep_status=$DEPENDS_STATUS
+ fi
+ grep -q "^[[:space:]]*$1:$2:on" $dep_status
+ }
+fi
diff --git a/kde-apps/KDE_DEPENDS b/kde-apps/KDE_DEPENDS
index 713cb13..3bcb1d9 100755
--- a/kde-apps/KDE_DEPENDS
+++ b/kde-apps/KDE_DEPENDS
@@ -1,13 +1,13 @@
optional_depends arts \
"--with-arts" \
"--without-arts" \
- "for aRts sound daemon" &&
+ "for aRts sound daemon" &&

-# is_enabled_depends is a 1.14 sorcery function, but not in libcompat,
-# so we only run it if it is actually available.
-# this is here for #8811
-if declare -f is_depends_enabled &> /dev/null; then
- if is_depends_enabled $SPELL arts; then
- sub_depends kdelibs ARTS
- fi
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL arts; then
+ sub_depends kdelibs ARTS
fi
diff --git a/kde-core/KDE_DEPENDS b/kde-core/KDE_DEPENDS
index 6ce13c3..502a2e2 100755
--- a/kde-core/KDE_DEPENDS
+++ b/kde-core/KDE_DEPENDS
@@ -1,15 +1,15 @@
depends qt-x11 &&

optional_depends arts \
- '--with-arts' \
- '--without-arts' \
- 'for aRts sound daemon' &&
+ "--with-arts" \
+ "--without-arts" \
+ "for aRts sound daemon" &&

-# is_enabled_depends is a 1.14 sorcery function, but not in libcompat,
-# so we only run it if it is actually available.
-# this is here for #8811
-if declare -f is_depends_enabled &> /dev/null; then
- if is_depends_enabled $SPELL arts; then
- sub_depends kdelibs ARTS
- fi
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL arts; then
+ sub_depends kdelibs ARTS
fi
diff --git a/kde-core/kdebase/DEPENDS b/kde-core/kdebase/DEPENDS
index 52ba2e1..48fd249 100755
--- a/kde-core/kdebase/DEPENDS
+++ b/kde-core/kdebase/DEPENDS
@@ -111,22 +111,20 @@ optional_depends hal
'--without-hal' \
'for automatic hardware detection' &&

+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL hal; then
+ depends dbus-qt3-old
+fi &&
+
optional_depends XDAMAGE \
'--with-composite' \
'--without-composite' \
'for kompmgr - kde compositing manager' &&

-# is_depends_enabled is only in devel for now #12949
-# once it is everywhere, only the second if block should remain
-if declare -f is_depends_enabled &> /dev/null; then
- if is_depends_enabled $SPELL hal; then
- depends dbus-qt3-old
- fi
-else
- message "dbus-qt3-old is needed for the hal backend, so say y here if you
said y to hal" &&
- optional_depends dbus-qt3-old '' '' 'for automatic hardware detection'
-fi &&
-
optional_depends ntp \
'' \
'' \
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index e53fa37..2de3376 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,8 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Always use is_depends_enabled for checking if
+ dbus-qt3-old is needed, sources is_depends_enabled.function
+ (remove it when is_depends_enabled is in stable sorcery).
+
2006-10-11 Anton Brondz <dinolinux AT sourcemage.org>
* DETAILS: updated to 3.5.5

diff --git a/printer/cups-old/HISTORY b/printer/cups-old/HISTORY
index 8edd5b2..40b1fc7 100644
--- a/printer/cups-old/HISTORY
+++ b/printer/cups-old/HISTORY
@@ -1,3 +1,8 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * TRIGGERS: Rewritten to use is_depends_enabled, sources
+ is_depends_enabled.function (remove it when is_depends_enabled
+ is in stable sorcery).
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/printer/cups-old/TRIGGERS b/printer/cups-old/TRIGGERS
index 9ac6d19..38fde73 100755
--- a/printer/cups-old/TRIGGERS
+++ b/printer/cups-old/TRIGGERS
@@ -1,6 +1,10 @@
-# replace with is_depends_enabled once it's available
-if grep -q "$SPELL:linux-pam:on" "$DEPENDS_STATUS"; then
- on_cast linux-pam cast_self
-fi
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL linux-pam; then
+ on_cast linux-pam cast_self
+fi &&

on_cast gnutls check_self
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 0e564ac..f0d0b5d 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,8 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * TRIGGERS: Rewritten to use is_depends_enabled, sources
+ is_depends_enabled.function (remove it when is_depends_enabled
+ is in stable sorcery).
+
2006-10-05 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Added optional_depends acl.

diff --git a/printer/cups/TRIGGERS b/printer/cups/TRIGGERS
index 9ac6d19..38fde73 100755
--- a/printer/cups/TRIGGERS
+++ b/printer/cups/TRIGGERS
@@ -1,6 +1,10 @@
-# replace with is_depends_enabled once it's available
-if grep -q "$SPELL:linux-pam:on" "$DEPENDS_STATUS"; then
- on_cast linux-pam cast_self
-fi
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL linux-pam; then
+ on_cast linux-pam cast_self
+fi &&

on_cast gnutls check_self
diff --git a/python-devel/mercurial/HISTORY b/python-devel/mercurial/HISTORY
index cbaeceb..2f9f7db 100644
--- a/python-devel/mercurial/HISTORY
+++ b/python-devel/mercurial/HISTORY
@@ -1,3 +1,7 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * INSTALL: Source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery).
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/python-devel/mercurial/INSTALL b/python-devel/mercurial/INSTALL
index 29b12e4..f53b540 100755
--- a/python-devel/mercurial/INSTALL
+++ b/python-devel/mercurial/INSTALL
@@ -1,5 +1,10 @@
python setup.py install &&

+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
if is_depends_enabled ${SPELL} tk ; then
install -m 0755 -o root -g root contrib/hgk \
$INSTALL_ROOT/usr/bin/hgk
diff --git a/utils/lshw/BUILD b/utils/lshw/BUILD
index 8f1d71e..c637c43 100755
--- a/utils/lshw/BUILD
+++ b/utils/lshw/BUILD
@@ -1,5 +1,10 @@
make &&

-if [ "$LSHWGUI" = "y" ] ; then
- make gui
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL gtk+2; then
+ make gui
fi
diff --git a/utils/lshw/CONFIGURE b/utils/lshw/CONFIGURE
deleted file mode 100755
index 252ae31..0000000
--- a/utils/lshw/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-# replace the logic with a plain optional_depends call, once
is_depends_enabled
-# is available. It will allow for better dispel handling.
-local default=n
-spell_ok gtk+2 && default=y
-config_query LSHWGUI "Enable GUI support?" $default
diff --git a/utils/lshw/DEPENDS b/utils/lshw/DEPENDS
index 532f166..1709440 100755
--- a/utils/lshw/DEPENDS
+++ b/utils/lshw/DEPENDS
@@ -1,3 +1,11 @@
-if [ "$LSHWGUI" = "y" ] ; then
- depends gtk+2
-fi
+#
+## Remove this when spell is in stable.
+#
+if [[ $LSHWGUI ]]; then
+ persistent_remove LSHWGUI
+fi &&
+
+optional_depends gtk+2 \
+ "" \
+ "" \
+ "for GUI support"
diff --git a/utils/lshw/DETAILS b/utils/lshw/DETAILS
index e655019..e9b6b57 100755
--- a/utils/lshw/DETAILS
+++ b/utils/lshw/DETAILS
@@ -7,7 +7,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[1]="http://www.ezix.org/software/files/$SOURCE";
WEB_SITE=http://ezix.org/project/wiki/HardwareLiSter
ENTERED=20030402
- UPDATED=20030726
LICENSE[0]=GPL
KEYWORDS="utils"
SHORT="HardWare LiSter"
diff --git a/utils/lshw/HISTORY b/utils/lshw/HISTORY
index e9554a9..1744295 100644
--- a/utils/lshw/HISTORY
+++ b/utils/lshw/HISTORY
@@ -1,3 +1,10 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Removed UPDATED.
+ * CONFIGURE: Deleted, unnecessary with is_depends_enabled.
+ * DEPENDS, BUILD, INSTALL: Switched to use is_depends_enabled,
+ source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery.)
+
2006-07-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFIGURE: use smarter query logic #12791

diff --git a/utils/lshw/INSTALL b/utils/lshw/INSTALL
index fc5e4d0..923078d 100755
--- a/utils/lshw/INSTALL
+++ b/utils/lshw/INSTALL
@@ -1,5 +1,5 @@
default_install &&

-if [ "$LSHWGUI" = "y" ] ; then
- make install-gui
+if is_depends_enabled $SPELL gtk+2; then
+ make install-gui
fi
diff --git a/video/xvattr/BUILD b/video/xvattr/BUILD
index c6cfacc..a29ab66 100755
--- a/video/xvattr/BUILD
+++ b/video/xvattr/BUILD
@@ -1,6 +1,11 @@
./configure $OPTS &&
make xvattr &&
-# change this to is_depends_enabled once that makes it to stable sorcery
-if spell_ok gtk+; then
+
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL gtk+; then
make gxvattr
fi
diff --git a/video/xvattr/HISTORY b/video/xvattr/HISTORY
index 5d84d20..d3c21e4 100644
--- a/video/xvattr/HISTORY
+++ b/video/xvattr/HISTORY
@@ -1,3 +1,8 @@
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * BUILD: Rewritten to use is_depends_enabled, sources
+ is_depends_enabled.function (remove it when is_depends_enabled
+ is in stable sorcery).
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/x11-libs/libafterimage/DEPENDS b/x11-libs/libafterimage/DEPENDS
index 76954e3..c9e74eb 100755
--- a/x11-libs/libafterimage/DEPENDS
+++ b/x11-libs/libafterimage/DEPENDS
@@ -27,12 +27,18 @@ if [ "${LIBAFTERSTEP_GIF}" == "y" ] ; th
optional_depends LIBGIF \
"--without-builtin-ungif" \
"--with-builtin-ungif" \
- "Use external gif library?"
+ "Use external gif library?" &&
+
+ #
+ ## Remove this after is_depends_enabled is integrated to stable sorcery.
+ #
+ source "$GRIMOIRE/is_depends_enabled.function" &&
+
# test for which LIBGIF is picked go here.
if is_depends_enabled ${SPELL} giflib
- then depends giflib '--with-gif'
+ then depends giflib '--with-gif'
elif is_depends_enabled ${SPELL} libungif
- then depends libungif '--with-ungif'
+ then depends libungif '--with-ungif'
fi
else OPTS="${OPTS} --without-gif --without-builtin-ungif"
fi
diff --git a/x11-libs/libafterimage/WIP b/x11-libs/libafterimage/WIP
index 81d4e2f..20523d1 100644
--- a/x11-libs/libafterimage/WIP
+++ b/x11-libs/libafterimage/WIP
@@ -1,3 +1,9 @@
as needs to provide LIBAFTERIMAGE
aterm needs to depend on LIBAFTERIMAGE
needs HISTORY
+
+Added here in lack of a HISTORY file:
+
+2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Source is_depends_enabled.function (remove it when
+ is_depends_enabled is in stable sorcery).



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (a65cec9596f157829c0cc75672e98b9473231e15), Juuso Alasuutari, 10/19/2006

Archive powered by MHonArc 2.6.24.

Top of Page