From 04952c63227375838e3da5e5db9165b742d6a84c Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Sat, 25 Jun 2016 10:30:15 +0000
Subject: [PATCH] Merge trunk up to revision 3866

---
 Config.in                         | 4 ----
 common/libs/func_check_version.sh | 7 ++-----
 common/libs/func_install_blfs     | 5 -----
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Config.in b/Config.in
index 798287e..c77eff1 100644
--- a/Config.in
+++ b/Config.in
@@ -512,10 +512,6 @@ menu "--- BOOK Settings"
 		bool	"libxslt (required)"
 		default	y
 
-		config	DEP_TIDY
-		bool	"tidy (required)"
-		default	y
-
 		config	DEP_DBXML
 		bool	"DocBook XML DTD (required)"
 		default	y
diff --git a/common/libs/func_check_version.sh b/common/libs/func_check_version.sh
index 7a7932c..50d5005 100644
--- a/common/libs/func_check_version.sh
+++ b/common/libs/func_check_version.sh
@@ -233,17 +233,14 @@ inline_doc
 check_blfs_tools() {         #
 #----------------------------#
 : << inline_doc
-In addition to the tools needed for the LFS part, tidy and docbook-xml
-are needed for installing the BLFS tools
+In addition to the tools needed for the LFS part, docbook-xml
+is needed for installing the BLFS tools
 inline_doc
 
   # Avoid translation of version strings
   local LC_ALL=C
   export LC_ALL
 
-  tidyVer=$(tidy -V | cut -d " " -f9)
-  check_version "2004" "${tidyVer}" "TIDY"
-
   # Minimal docbook-xml code for testing
   XML_FILE="<?xml version='1.0' encoding='ISO-8859-1'?>
 <?xml-stylesheet type='text/xsl' href='http://docbook.sourceforge.net/release/xsl/1.69.1/xhtml/docbook.xsl'?>
diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs
index 4b0e717..7d9b4d8 100644
--- a/common/libs/func_install_blfs
+++ b/common/libs/func_install_blfs
@@ -58,11 +58,6 @@ if [ "$DEP_LIBXSLT" = y ]; then
 else
   LINE_LIBXSLT='#CONFIG_libxslt is not set'
 fi
-if [ "$DEP_TIDY" = y ]; then
-  LINE_TIDY='CONFIG_html-tidy=y'
-else
-  LINE_TIDY='#CONFIG_html-tidy is not set'
-fi
 # DocBook is a rec dep of libxslt
 # if [ "$DEP_DBXML" = y ]; then
 #   LINE_DBXML='CONFIG_DocBook=y'