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/libcompat b/libcompat
index 515697f..b654e6e 100755
--- a/libcompat
+++ b/libcompat
@@ -32,13 +32,36 @@ function show_up_depends() {
}
# fall back to optional_depends if suggest_depends isn't implemented
-declare -f suggest_depends &> /dev/null ||
-function suggest_depends() {
- optional_depends "$@"
-}
+# OR fall back to true - this is needed to avoid some circular dependencies
+# see #13244 for an example
+if declare -f suggest_depends &> /dev/null; then
+ function suggest_depends_2() {
+ suggest_depends "$@"
+ }
+else
+ function suggest_depends() {
+ optional_depends "$@"
+ }
+
+ function suggest_depends_2() {
+ true
+ }
+fi
# fall back to depends if runtime_depends isn't implemented
declare -f runtime_depends &> /dev/null ||
function runtime_depends() {
depends "$@"
}
+
+declare -f is_depends_enabled &>/dev/null ||
+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
+}
diff --git a/libgcc b/libgcc
new file mode 100755
index 0000000..9b9449c
--- /dev/null
+++ b/libgcc
@@ -0,0 +1,106 @@
+#!/bin/bash
+#---------------------------------------------------------------------
+##
+## @Synopsis Set of functions for dealing with the problem of having to
+## @Synopsis use different version of the gcc compilers.
+##
+## The basic usage is as follows:
+## <pre>
+## - If a spell works with the latest version of gcc, do nothing.
+## - To change the compiler version for a spell, add a GCC_VERSION field
+## to the spells DETAILS specifying major.minor version of gcc it needs,
+## e.g. GCC_VERSION=3.4
+## - add a 'depends gccXX' to the spell where XX == majorminor,
+## e.g. 'depends gcc34'
+## - add 'invoke_gcc' to the top of BUILD if the spell has a
+## custom BUILD file
+## </pre>
+##
+## @Implementation These functions were added to allow the use of
+## @Implementation several versions of gcc in parallel.
+##
+##
+## @Copyright Copyright 2005 by the Source Mage Team
+##
+##
+#---------------------------------------------------------------------
+
+
+#---------------------------------------------------------------------
+## @param gcc version
+## @return 0 if that gcc version is being used
+## @return 1 otherwise
+#---------------------------------------------------------------------
+function use_gcc() {
+
+ gcc -dumpversion | grep -q $(esc_str $1) > /dev/null
+
+}
+
+#---------------------------------------------------------------------
+## @param new path to add
+## @param old path
+## @Stdout new path
+## Echos the old path with new path prepended, separated with a ':'
+#---------------------------------------------------------------------
+function gcc_prepend_path() {
+
+ if test -z $2
+ then echo $1
+ else echo $1:$2
+ fi
+
+}
+
+
+#---------------------------------------------------------------------
+## @param path
+##
+## Alters the environment so that the gcc in the specified directory
+## will be used for compiling
+##
+#---------------------------------------------------------------------
+function gcc_add_paths() {
+
+ export PATH=$( gcc_prepend_path $1/bin $PATH )
+ export LD_LIBRARY_PATH=$( gcc_prepend_path $1/lib $LD_LIBRARY_PATH )
+ export LD_RUN_PATH=$( gcc_prepend_path $1/lib $LD_RUN_PATH )
+ export INFOPATH=$( gcc_prepend_path $1/info $INFOPATH )
+ export CPPFLAGS="-I $1/include $CPPFLAGS"
+
+}
+
+
+#---------------------------------------------------------------------
+##
+## Determines if the spell specifies a gcc version to use. If so, it
+## alters the environment so that that gcc version is used for compilation.
+##
+#---------------------------------------------------------------------
+function invoke_gcc() {
+
+ if [[ "$GCC_VERSION" ]] && ! use_gcc $GCC_VERSION; then
+ gcc_add_paths /opt/gcc${GCC_VERSION//.}
+ echo "Overriding gcc version: `gcc -dumpversion`"
+ fi
+
+}
+
+
+#---------------------------------------------------------------------
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---------------------------------------------------------------------
diff --git a/xorg-app/beforelight/DETAILS b/xorg-app/beforelight/DETAILS
index a67884e..c4364cc 100755
--- a/xorg-app/beforelight/DETAILS
+++ b/xorg-app/beforelight/DETAILS
@@ -1,16 +1,15 @@
SPELL=beforelight
PKG=beforelight
- VERSION=1.0.1
+ VERSION=1.0.2
XORG_VER=X11R7.0
- SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/app/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
+ SOURCE=${PKG}-${VERSION}.tar.bz2
+
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
+
SOURCE_HASH=sha512:00e4b7ba532ffaa21e56fb35a1c8d90f9987f4c3ec0e3d0e1a5db862e4b8aba404c8f0fd04cfdeba2fbfa7223976acdf064b6e39f72cae9b667aabd1f401bbd7
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
SHORT="Module beforelight for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/beforelight/HISTORY b/xorg-app/beforelight/HISTORY
index c9749c3..8c4b21c 100644
--- a/xorg-app/beforelight/HISTORY
+++ b/xorg-app/beforelight/HISTORY
@@ -1,3 +1,6 @@
+2007-01-06 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update
+
2005-12-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: Updated VERSION to 1.0.1
added XORG_VER
diff --git a/xorg-app/beforelight/beforelight-X11R7.0-1.0.1.tar.bz2.sig
b/xorg-app/beforelight/beforelight-X11R7.0-1.0.1.tar.bz2.sig
deleted file mode 100644
index 3eb297b..0000000
Binary files a/xorg-app/beforelight/beforelight-X11R7.0-1.0.1.tar.bz2.sig and
/dev/null differ
diff --git a/xorg-app/compiz/DEPENDS b/xorg-app/compiz/DEPENDS
index 3568cf6..15f1586 100755
--- a/xorg-app/compiz/DEPENDS
+++ b/xorg-app/compiz/DEPENDS
@@ -1 +1,10 @@
-depends startup-notification
+depends startup-notification &&
+depends libpng &&
+depends libxcomposite &&
+depends libxfixes &&
+depends libxdamage &&
+depends libxrandr &&
+depends libxinerama &&
+depends libice &&
+depends libsm
+
diff --git a/xorg-app/compiz/DETAILS b/xorg-app/compiz/DETAILS
index 11ee271..0a6fccf 100755
--- a/xorg-app/compiz/DETAILS
+++ b/xorg-app/compiz/DETAILS
@@ -1,8 +1,8 @@
SPELL=compiz
- VERSION=0.3.4
+ VERSION=0.3.6
SOURCE=${SPELL}-${VERSION}.tar.bz2