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
+#
+## 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.
-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