diff --git a/FUNCTIONS b/FUNCTIONS
index fddef66..6d3ec0a 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -463,33 +463,6 @@ disable_pic() {
fi
}
-#
-## Function to check if we're using xorg-modular libs or not
-#
-
-function check_if_xorg_modular_libs()
-{
- if [[ "$(get_spell_provider ${1:-$SPELL} X11-LIBS)" == "xorg-server"
]] ||
- [[ "$(get_spell_provider ${1:-$SPELL} X11-LIBS)" == "xorg-libs"
]]
- then
- return 0
- fi
- return 1
-}
-
-#
-## Function to check if we're using xorg-modular server or not
-#
-
-function check_if_xorg_modular_server()
-{
- if [[ "$(get_spell_provider ${1:-$SPELL} X11-SERVER)" ==
"xorg-server" ]]
- then
- return 0
- fi
- return 1
-}
-
# FUnction to tag config files that cannot be tagged by the normal
install_config_file method
# do NOT call check_if_modified or mark_file_modified ANYWHERE ELSE!!!
# # THIS function will go away when it migrates down from devel sorcery
diff --git a/crypto/openssh/DEPENDS b/crypto/openssh/DEPENDS
index 6f8d43d..0b084ba 100755
--- a/crypto/openssh/DEPENDS
+++ b/crypto/openssh/DEPENDS
@@ -3,6 +3,7 @@ depends gnupg &&
depends openssl &&
depends smgl-fhs &&
depends zlib &&
+depends xauth --with-xauth="${INSTALL_ROOT}/usr/bin/xauth"
optional_depends "tcp_wrappers" \
"--with-tcp-wrappers" \
@@ -22,9 +23,4 @@ optional_depends "krb5" \
optional_depends "X11-SERVER" \
"" \
"" \
- "X server auth (needed by X11Forwarding)" &&
-
-. $GRIMOIRE/FUNCTIONS &&
-if check_if_xorg_modular_server; then
- depends xauth --with-xauth="${INSTALL_ROOT}/usr/bin/xauth"
-fi
+ "X server auth (needed by X11Forwarding)"
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index 270586e..286bd88 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2008-11-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: remove check_if_xorg_modular* reference #14708
+
2008-07-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.1p1