From 90f5b6de2e1cda1395072db11d8e08fff79de453 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Sat, 9 Mar 2019 08:02:10 +0000
Subject: [PATCH] Remove obsolete blfs_tools dependencies

---
 Config.in                            | 24 ++++--------------------
 common/libs/func_install_blfs        | 12 ------------
 common/libs/func_validate_configs.sh |  2 +-
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/Config.in b/Config.in
index a5f7e25..ea7f3a5 100644
--- a/Config.in
+++ b/Config.in
@@ -469,32 +469,16 @@ menu "BOOK Settings"
             default    n
             help
                 if you install gpm, it will be started
-                automatically on boot. You'll have to edit
-                /etc/sysconfig/mouse for your system
+                automatically on boot. It allows copy-paste
+                while Xorg is not installed.
 
             config    DEP_SVN
             bool    "SVN client (optional, see help)"
             default    n
             help
                 Subversion is needed for updating the book
-                sources. If you want ssl support, select
-                OPENSSL below.
-
-            config    DEP_OPENSSL
-            bool    "OPENSSL (optional, see help)"
-            default    n
-            help
-                selecting OPENSSL here allows to build
-                subversion with ssl support, avoiding a later
-                recompilation
-
-            config    DEP_PYTHON
-            bool    "PYTHON 2 (optional, see help)"
-            default    n
-            help
-                selecting PYTHON 2 here allows to build
-                the libxml2 and libxslt python modules,
-                avoiding a later recompilation
+                sources. You do not need it if building a
+                stable book.
 
         endmenu
 
diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs
index ab58f0b..8666ebd 100644
--- a/common/libs/func_install_blfs
+++ b/common/libs/func_install_blfs
@@ -109,20 +109,8 @@ if [ "$DEP_SVN" = y ]; then
 else
   LINE_SVN='#CONFIG_subversion is not set'
 fi
-if [ "$DEP_OPENSSL" = y ]; then
-  LINE_OPENSSL='CONFIG_openssl=y'
-else
-  LINE_OPENSSL='#CONFIG_openssl is not set'
-fi
-if [ "$DEP_PYTHON" = y ]; then
-  LINE_PYTHON='CONFIG_python2=y'
-else
-  LINE_PYTHON='#CONFIG_python2 is not set'
-fi
 
 cat >$BUILDDIR$BLFS_ROOT/configuration <<EOF
-$LINE_OPENSSL
-$LINE_PYTHON
 $LINE_LIBXML
 $LINE_LIBXSLT
 $LINE_WGET
diff --git a/common/libs/func_validate_configs.sh b/common/libs/func_validate_configs.sh
index 14bbc6c..7f0304f 100644
--- a/common/libs/func_validate_configs.sh
+++ b/common/libs/func_validate_configs.sh
@@ -62,7 +62,7 @@ inline_doc
   local -r blfs_tool_PARAM_LIST="\
      BLFS_TREE BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR \
      DEP_LIBXML DEP_LIBXSLT DEP_DBXML DEP_LYNX DEP_SUDO DEP_WGET \
-     DEP_SVN DEP_GPM DEP_OPENSSL DEP_PYTHON"
+     DEP_SVN DEP_GPM"
   local -r custom_tool_PARAM_LIST="TRACKING_DIR"
 
   # Internal variables