Major changes

17 files changed, 2457 insertions, 0 deletions

diff --git a/blfs/Extras.Makefile b/blfs/Extras.Makefile
new file mode 100644
index 0000000..dea44af
--- /dev/null
+++ b/blfs/Extras.Makefile
@@ -0,0 +1,101 @@
+extratargets = Cups-Extras Cups-filters Cyrus-SASL-Extras GTK-Engines \
+			   GTK3-Extras Gutenprint ImageMagick-Extras Kuserfeedback-Extras \
+			   OpenLDAP-Extras PHP Pixman-Extras Subversion-Extras
+
+all : $(extratargets)
+
+Cups-Extras : GnuTLS colord libusb Linux-PAM xdg-utils Avahi libpaper LLVM \
+	MIT_Kerberos java PHP Python2 Gutenprint hplip
+	@echo $@
+
+Cups-filters : ghostscript mupdf PHP Cups GLib LCMS2 Poppler Qpdf \
+	dejavu-fonts libjpeg-turbo libpng libtiff Avahi OpenLDAP
+	@echo $@
+
+Cyrus-SASL-Extras : Linux-PAM MariaDB MIT_Kerberos-keyutils OpenLDAP \
+	PostgreSQL
+	@echo $@
+
+GD : libjpeg-turbo libpng libtiff libwebp FreeType Fontconfig \
+	# libavif libheif libXpm libraqm libimagequant
+	@echo $@
+
+GTK-Engines : GTK2 Lua54 which
+	@echo $@
+
+GTK3-Extras : adwaita-icon-theme colord Cups rest # PyAtSpi2
+	@echo $@
+
+hplip : qt-everywhere
+	@echo $@ " - WIP: External from BLFS"
+
+ImageMagick-Extras : Enscript Gimp Inkscape
+	@echo $@
+
+Kuserfeedback-Extras : PHP PHPUnit # "http://phpunit.de"
+	@echo $@
+
+OpenLDAP-Extras : GnuTLS MariaDB PostgreSQL unixODBC # Pth
+	@echo $@
+
+Pixman-Extras : GTK2 libpng # both for tests and demos
+	@echo $@
+
+# libsoup graphviz cups cups-filters can use PHP
+PHP : Apache libxml2 Aspell enchant libxslt PCRE FreeType libexif \
+	libjpeg-turbo libpng libtiff libwebp Xorg-Libs cURL tidy-html5 \
+	Berkeley_DB libiodbc lmdb MariaDB OpenLDAP PostgreSQL sqlite3 \
+	unixODBC Cyrus-SASL MIT_Kerberos GD
+	@echo $@
+
+PHPUnit : PHP
+	@echo $@ "https://phar.phpunit.de/phpunit-8.phar"
+
+Subversion-Extras : Apache apache-ant Boost Cyrus-SASL Doxygen \
+	java Ruby Serf SWIG # gnome-keyring libsecret LZ4 UTF8proc dbus
+	@echo $@
+
+adwaita-icon-theme : Inkscape git GTK2 GTK3 librsvg
+	@echo $@
+
+Apache : Apr-Util PCRE Brotli Berkeley_DB Doxygen libxml2 Lua54 Lynx Links \
+	nghttp2 OpenLDAP rsync
+	@echo $@
+
+Enscript :
+	@echo $@
+
+GDL : # GTK3
+	@echo $@
+
+ghostscript :
+	@echo $@
+
+Gimp : Python2-libxml2 ghostscript \
+	# gegl gexiv2 glib-networking GTK2 HarfBuzz libjpeg-turbo libmypaint \
+	librsvg libtiff LCMS2 mypaint-brushes oppler Xorg-Libs dbus-glib \
+	ISO-Codes libgudev PyGTK xdg-utils AAlib alsa-lib libmng libwebp OpenJPEG \
+	GTK-Doc OpenEXR Gvfs
+	@echo $@
+
+gtkmm3 : # atkmm GTK3 pangomm Doxygen
+	@echo $@
+
+Gutenprint : Gimp # Cups
+	@echo $@
+
+Inkscape : GDL gtkmm3 Scour # Boost Double-conversion GC Gsl libsoup libxslt \
+	Poppler popt wget ImageMagick6 LCMS2 libcanberra Potrace lxml
+	@echo $@
+
+mupdf : # GLU Xorg-Libs HarfBuzz libjpeg-turbo OpenJPEG cURL xdg-utils
+	@echo $@
+
+Python2-libxml2 : # libxml2 Python2
+	@echo $@
+
+rest : make-ca libsoup gobject-introspection GTK-Doc
+	@echo $@
+
+Scour : # six
+	@echo $@
diff --git a/blfs/KDE.Makefile b/blfs/KDE.Makefile
index dc2681c..a254988 100644
--- a/blfs/KDE.Makefile
+++ b/blfs/KDE.Makefile
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Most deps like GLib, Xorg, gobject-introspection brought in from

 # Systemd-Extras and Xorg in main and Xorg Makefiles and not listed 

 # here or commented in targets

@@ -416,3 +417,631 @@ Xorg_Synaptics_Driver : # libevdev Xorg-Server
 

 XviD : # yasm or NASM

 	@echo $@

+=======
+# Most deps like GLib, Xorg, gobject-introspection brought in from
+# Systemd-Extras and Xorg in main and Xorg Makefiles and not listed 
+# here or commented in targets
+#
+# Deps which can use QT5 after systemd extra and Xorg and QT5
+# Rebuild the following:
+# wpa_supplicant cairo doxygen cmake graphviz
+# suggest waiting for cairo and graphviz for later
+
+kde = extra-cmake-modules ffmpeg phonon-backend-gstreamer \
+	  phonon-backend-vlc polkit-qt libdbusmenu-qt \
+	  plasma-wayland-protocols kf5-pre-install-config \
+	  kf5 Ark Kdenlive KMix Khelpcenter Konsole libkexiv2 \
+	  Okular libkdcraw Gwenview libkcddb K3b plasma5 Konversation \
+	  Falkon K3b-qt5webkit Kmail kmail-account-wizard kaccounts-providers \
+	  kdepim-addons kwave Kate Dolphin KCalc \
+	  # Other apps to install may be viewed at https://apps.kde.org/
+
+all: Systemd-Extras $(kde)
+
+akonadi : kaccounts-integration kf5
+	@echo $@
+
+akonadi-calendar : kf5 grantleetheme
+	@echo $@
+
+akonadi-contact : grantleetheme libkleo
+	@echo $@
+
+akonadi-import-wizard : akonadi-contact
+	@echo $@
+
+akonadi-mime : akonadi kmime
+	@echo $@
+
+akonadi-notes : kf5 kmime
+	@echo $@
+
+akonadi-search : kf5
+	@echo $@
+
+Ark : cpio p7zip UnRar kf5 libarchive unzip Zip
+	@echo $@
+
+Aspell : which
+	@echo $@
+
+atkmm : glibmm ATK
+	@echo $@
+
+AudioFile :
+	@echo $@
+
+baloo-widgets : kf5
+	@echo $@
+
+breeze-icons : extra-cmake-modules kf5 libxml2 lxml
+	@echo $@
+
+c-ares : CMake
+	@echo $@
+
+calendarsupport : akonadi-notes
+	@echo $@
+
+Cdrdao : gtkmm libao libmad libvorbis LAME
+	@echo $@
+
+Cdrtools : alsa-lib
+	@echo $@
+
+clisp :
+	@echo $@
+
+cpio :
+	@echo $@
+
+dhcp :
+	@echo $@ "(client only)"
+
+Discount :
+	@echo $@
+
+Dolphin : baloo-widgets # packagekit-qt
+	@echo $@
+
+dvd-rw-tools : Cdrtools
+	@echo $@
+
+dosfstools :
+	@echo $@
+
+eventviews : akonadi-calendar kmime calendarsupport
+	@echo $@
+
+extra-cmake-modules : CMake
+	@echo $@
+
+Exiv2 : CMake cURL Doxygen Graphviz libxslt
+	@echo $@
+
+FAAC :
+	@echo $@
+
+FAAD2 :
+	@echo $@
+
+Falkon : extra-cmake-modules qtwebengine kf5
+	@echo $@
+
+fdk-aac :
+	@echo $@
+
+ffmpeg : libass fdk-aac x264 x265 frei0r-plugins libcdio opencv OpenJPEG \
+	Samba XviD FreeType LAME libtheora libvorbis libvpx Opus NASM \
+	yasm alsa-lib libva libvdpau SDL2 Doxygen Fontconfig FriBidi libdrm \
+	libwebp GnuTLS PulseAudio Speex v4l-utils Xorg-Libs
+	@echo $@ "(opencv4 not supported)"
+
+ffmpeg-min :
+	@echo $@
+
+frei0r-plugins : gavl Doxygen # opencv(currenty broken)
+	@echo $@
+
+Fuse : Doxygen
+	@echo $@
+
+gavl : libpng Doxygen
+	@echo $@
+
+glibmm : libsigc GLib Doxygen glib-networking GnuTLS libxslt
+	@echo $@
+
+GnuPG2 : Fuse ImageMagick libassuan libksba npth pinentry
+	@echo $@
+
+GPGME : clisp GnuPG2 libassuan libsigsegv SWIG
+	@echo $@
+
+gptfdisk : popt ICU
+	@echo $@
+
+grantlee : CMake qt-everywhere
+	@echo $@
+
+grantleetheme : grantlee
+	@echo $@
+
+gst-plugins-bad : FAAC FAAD2 fdk-aac libass libexif libdvdread libdvdnav \
+	libmpeg2 neon opencv OpenJPEG SoundTouch x265 BlueZ cURL \
+	gst-plugins-base GTK3 LCMS2 libgcrypt libgudev librsvg libsndfile \
+	libssh2 libwebp libxkbcommon Nettle Opus SBC Wayland Xorg-Libs \
+	# Valgrind
+	@echo $@
+
+gst-plugins-ugly : liba52 libcdio libdvdread libmpeg2 x264
+	@echo $@
+
+gtkmm : atkmm pangomm GTK2
+	@echo $@
+
+Gwenview : Exiv2 kf5 kf5kipi libkdcraw LCMS2
+	@echo $@
+
+Hspell :
+	@echo $@
+
+Hunspell :
+	@echo $@
+
+hyphen :
+	@echo $@
+
+id3lib : alsa-lib FLAC asciidoc # Valgrind
+	@echo $@
+
+ImageMagick : libgxps libraw OpenEXR OpenJPEG
+	@echo $@
+
+incidenceeditor : kdiagram eventviews
+	@echo $@
+
+jansson :
+	@echo $@
+
+Jinja2 : # MarkupSafe
+	@echo $@
+
+K3b : kf5 libkcddb ffmpeg libburn libdvdread Cdrtools \
+	dvd-rw-tools Cdrdao libmad libmusicbrainz2 libsamplerate \
+	qt-everywhere shared-mime-info taglib UDisks FLAC LAME libsndfile libvorbis
+	@echo $@
+
+K3b-qt5webkit : qt5webkit
+	@echo $@
+
+kaccounts-integration : kf5 libaccounts-qt5 signond
+	@echo $@
+
+kaccounts-providers : kf5
+	@echo $@
+
+kaddressbook : akonadi-contact akonadi-search grantleetheme
+	@echo $@
+
+kalarmcal : kf5 kcalutils kpimtextedit
+	@echo $@
+
+Kate : kf5
+	@echo $@
+
+KCalc : kf5
+	@echo $@
+
+kcalutils : kf5
+	@echo $@
+
+Kdenlive : kf5 mlt breeze-icons v4l-utils
+	@echo $@
+
+kdepim-addons : akonadi-import-wizard Discount incidenceeditor kaddressbook \
+	kitinerary kpkpass
+	@echo $@
+
+kdepim-runtimes : akonadi-notes akonadi-calendar kalarmcal Kmail \
+	# libkolabxml etebase
+	@echo $@
+
+kdewebkit : qt5webkit
+	@echo $@
+
+kf5 : kf5-pre-install-config Aspell GPGME Hspell Hunspell \
+	media-player-info ModemManager NetworkManager Oxygen-fonts \
+	Noto-fonts Jinja2 OpenEXR UDisks UPower
+	@echo $@
+
+kf5-pre-install-config :
+	@echo $@
+
+kf5kipi : kf5
+	@echo $@
+
+kdiagram : qt-everywhere
+	@echo $@
+
+kgpg : kf5 GPGME
+	@echo $@
+
+Khelpcenter : grantlee kf5 xapian libxml2
+	@echo $@
+
+kidentitymanagement : kpimtextedit
+	@echo $@
+
+kimap : kf5
+	@echo $@
+
+kitinerary : kpkpass libxml2 Poppler shared-mime-info \
+	# ZXing PhoneNumber OsmTools
+	@echo $@
+
+kldap : qtkeychain
+	@echo $@
+
+Kmail : libksieve kdewebkit kontactinterface ktnef \
+	mailcommon messagelib kuserfeedback
+	@echo $@
+
+kmail-account-wizard : Kmail
+	@echo $@
+
+kmailtransport : libkgapi ksmtp
+	@echo $@
+
+kmbox : kf5
+	@echo $@
+
+kmime : kf5
+	@echo $@
+
+KMix : kf5 libcanberra alsa-lib PulseAudio
+	@echo $@
+
+kontactinterface : kf5
+	@echo $@
+
+Konversation : kf5 Phonon CMake
+	@echo $@
+
+Konsole : kf5
+	@echo $@
+
+kpimtextedit : kf5
+	@echo $@
+
+kpkpass : kf5 shared-mime-info
+	@echo $@
+
+ksmtp : kf5 Cyrus-SASL
+	@echo $@
+
+ktnef : kcalutils kf5
+	@echo $@
+
+kuserfeedback : qt-everywhere \
+	# php phpunit (recommended deps)
+	@echo $@ "https://github.com/KDE/kuserfeedback.git"
+
+kwave : AudioFile id3lib fftw kf5 alsa-lib FLAC libogg PulseAudio Doxygen
+	@echo $@
+
+liba52 : # djbfft optional
+	@echo $@
+
+libaccounts-glib : GLib gobject-introspection
+	@echo $@ "https://gitlab.com/accounts-sso/libaccounts-glib.git"
+
+libaccounts-qt5 : libaccounts-glib qt-everywhere
+	@echo $@ "https://gitlab.com/accounts-sso/libaccounts-qt.git"
+
+libao : Xorg-Libs Alsa PulseAudio
+	@echo $@
+
+libass : FreeType FriBidi NASM Fontconfig HarfBuzz
+	@echo $@
+
+libassuan : libgpg-error
+	@echo $@
+
+libatasmart :
+	@echo $@
+
+libblockdev : libbytesize parted volume-key gobject-introspection \
+	libyaml btrfs-progs GTK-Doc mdadm
+	@echo $@
+
+libbytesize : PCRE2 GTK-Doc six
+	@echo $@
+
+libburn : Doxygen
+	@echo $@
+
+libcairomm : libsigc Cairo Boost Doxygen
+	@echo $@
+
+libcanberra : libvorbis alsa-lib gstreamer GTK3 GTK2 PulseAudio
+	@echo $@
+
+libcddb :
+	@echo $@
+
+libcdio : libcddb
+	@echo $@
+
+libdbusmenu-qt : Doxygen qt-everywhere
+	@echo $@
+
+libdvdcss : Doxygen
+	@echo $@
+
+libdvdnav : libdvdread
+	@echo $@
+
+libdvdread :
+	@echo $@
+
+libexif : Doxygen Graphviz
+	@echo $@
+
+libgravatar : pimcommon
+	@echo $@
+
+libgxps : GTK3 LCMS2 libarchive libjpeg-turbo libtiff libxslt git \
+	GTK-Doc
+	@echo $@
+
+libidn :
+	@echo $@
+
+libkcddb : kf5 libmusicbrainz5
+	@echo $@
+
+libkdcraw : kf5 libraw
+	@echo $@
+
+libkdepim : kf5
+	@echo $@
+
+libkexiv2 : kf5 Exiv2
+	@echo $@
+
+libkgapi : kf5 Cyrus-SASL
+	@echo $@
+
+libkleo : GPGME kpimtextedit Boost
+	@echo $@
+
+libksba :
+	@echo $@
+
+libksieve : kf5 kmime kimap kpimtextedit Cyrus-SASL
+	@echo $@
+
+libmad :
+	@echo $@
+
+libmbim : libgudev gobject-introspection GTK-Doc
+	@echo $@
+
+libmpeg2 :
+	@echo $@
+
+libmusicbrainz2 : Python2
+	@echo $@
+
+libmusicbrainz5 : neon CMake libxml2 Doxygen
+	@echo $@
+
+libndp :
+	@echo $@
+
+libqmi : libmbim GLib gobject-introspection GTK-Doc
+	@echo $@
+
+libraw : libjpeg-turbo JasPer LCMS2
+	@echo $@
+
+libsigc : Boost libxslt DocBook-Utils Doxygen
+	@echo $@
+
+libsigsegv :
+	@echo $@
+
+lm-sensors : which
+	@echo $@
+
+lmdb :
+	@echo $@
+
+Lua :
+	@echo $@
+
+mailcommon : mailimporter
+	@echo $@
+
+mailimporter : kf5 kimap kmime pimcommon
+	@echo $@
+
+media-player-info :
+	@echo $@
+
+messagelib : akonadi-contact akonadi-mime kgpg kidentitymanagement \
+	kmailtransport kmbox libgravatar
+	@echo $@
+
+mlt : frei0r-plugins libexif qt-everywhere Doxygen fftw SDL2
+	@echo $@
+
+mobile-broadband-provider-info :
+	@echo $@
+
+ModemManager : libmbim libqmi libgudev gobject-introspection \
+	Polkit Vala GTK-Doc
+	@echo $@
+
+neon : GnuTLS libxml2 MIT_Kerberos
+	@echo $@
+
+NetworkManager : dhcp jansson libndp mobile-broadband-provider-info \
+	ModemManager newt UPower \
+	cURL gobject-introspection iptables nss Polkit PyGObject Vala \
+	wpa_supplicant BlueZ DBus-Python GnuTLS GTK-Doc libpsl \
+	qt-everywhere # Valgrind
+	@echo $@
+
+newt : popt slang GPM
+	@echo $@
+
+nodejs : c-ares ICU libuv nghttp2
+	@echo $@
+
+Noto-fonts :
+	@echo $@
+
+npth :
+	@echo $@
+
+ntfs-3g : # fuse 2.x optional (this disables user mounts)
+	@echo $@
+
+Okular : kf5 libkexiv2 Poppler qca libtiff
+	@echo $@
+
+opencv : libexif xine-lib CMake unzip gst-plugins-base GTK3 \
+	JasPer libpng libtiff libwebp v4l-utils apache-ant Doxygen \
+	java Python2
+	@echo $@
+
+OpenEXR :
+	@echo $@
+
+OpenJPEG : CMake LCMS2 libpng libtiff Doxygen
+	@echo $@
+
+Oxygen-fonts :
+	@echo $@
+
+oxygen-icons : extra-cmake-modules qt-everywhere
+	@echo $@
+
+p7zip : # wxWidgets optional
+	@echo $@
+
+pangomm : libcairomm glibmm Pango
+	@echo $@
+
+Parse-Yapp :
+	@echo $@
+
+parted : dosfstools LVM2 dosfstools
+	@echo $@
+
+Phonon : extra-cmake-modules CMake GLib qt-everywhere
+	@echo $@
+
+phonon-backend-gstreamer : gst-plugins-bad gst-plugins-ugly Phonon \
+	gstreamer libxml2 gst-plugins-base gst-plugins-good
+	@echo $@
+
+phonon-backend-vlc : Phonon VLC
+	@echo $@
+
+pimcommon : akonadi akonadi-search kimap kldap libkdepim
+	@echo $@
+
+pinentry : libassuan
+	@echo $@
+
+pipewire : BlueZ ffmpeg gstreamer gst-plugins-base libva PulseAudio SBC \
+	SDL2 v4l-utils Doxygen Graphviz # Valgrind
+	@echo $@
+
+plasma-wayland-protocols : extra-cmake-modules
+	@echo $@
+
+plasma5 : pipewire lm-sensors oxygen-icons smartmontools Xorg_Synaptics_Driver \
+	GConf GTK2 GTK3 kf5 libpwquality libxkbcommon Mesa Wayland \
+	NetworkManager PulseAudio qca sassc taglib xcb-util-cursor fftw \
+	gsettings-desktop-schemas libdbusmenu-qt libcanberra libinput \
+	Linux-PAM GLU ibus
+	@echo $@
+
+polkit-qt : CMake Polkit qt-everywhere
+	@echo $@
+
+Poppler : OpenJPEG CMake Fontconfig Cairo LCMS2 libjpeg-turbo \
+	libpng nss Boost cURL gdk-pixbuf git gobject-introspection \
+	GTK-Doc Pygments GTK3 libtiff qt-everywhere
+	@echo $@
+
+qca : GnuPG2 make-ca CMake qt-everywhere which Cyrus-SASL libgcrypt \
+	libgpg-error nss nspr p11-kit Doxygen which
+	@echo $@
+
+qt5webkit : hyphen
+	@echo $@
+
+qtkeychain : kf5 Cyrus-SASL
+	@echo $@ "https://github.com/frankosterfeld/qtkeychain"
+
+qtwebengine : nodejs nss Python2 qt-everywhere alsa-lib PulseAudio \
+	ffmpeg ICU libwebp libxslt Opus libevent Poppler
+	@echo $@
+
+Samba : jansson lmdb Fuse GPGME Parse-Yapp GnuPG2
+	@echo $@
+
+signond : qt-everywhere
+	@echo $@ "https://gitlab.com/accounts-sso/signond.git"
+
+smartmontools : cURL Lynx wget GnuPG2
+	@echo $@
+
+SoundTouch :
+	@echo $@
+
+SWIG : PCRE Boost
+	@echo $@
+
+UDisks : libatasmart libblockdev dosfstools gptfdisk ntfs-3g \
+	libgudev libxslt Polkit btrfs-progs mdadm xfsprogs \
+	gobject-introspection DBus-Python GTK-Doc LVM2 PyGObject
+	@echo $@
+
+UnRar :
+	@echo $@
+
+UPower : libgudev libusb Polkit gobject-introspection GTK-Doc \
+	PyGObject
+	@echo $@
+
+VLC : FAAD2 libass libmpeg2 liba52 libcddb libdvdcss libdvdread \
+	libdvdnav libidn libmad Lua ffmpeg Samba x264
+	@echo $@
+
+volume-key : GPGME SWIG cryptsetup GLib nss
+	@echo $@
+
+x264 : NASM
+	@echo $@
+
+x265 : CMake NASM
+	@echo $@
+
+xapian : # Valgrind
+	@echo $@
+
+xine-lib : FAAD2 ImageMagick liba52 libdvdcss libdvdnav libmad Samba ffmpeg-min
+	@echo $@
+
+Xorg_Synaptics_Driver : libevdev Xorg-Server
+	@echo $@
+
+XviD : yasm NASM
+	@echo $@
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/blfs/Makefile b/blfs/Makefile
index bb7b8b1..8a1c7c4 100644
--- a/blfs/Makefile
+++ b/blfs/Makefile
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 targets = wpa_supplicant wget desktop-file-utils \

 		  libpwquality OpenSSH shared-mime-info Systemd-Extras

 

@@ -533,3 +534,526 @@ zsh : libcap-pam PCRE Valgrind
 include Xorg.Makefile

 include QT5.Makefile

 include KDE.Makefile

+=======
+targets = wpa_supplicant wget desktop-file-utils \
+		  libpwquality OpenSSH shared-mime-info Systemd-Extras
+
+all   : $(targets) $(xorg) $(qt5) $(kde) $(utils) $(extratargets)
+
+apache-ant : GLib java
+	@echo $@
+
+Apr :
+	@echo $@
+
+Apr-Util : Apr
+	@echo $@
+
+Apr-Util-Extra : Apr Berkeley_DB MariaDB OpenLDAP PostgreSQL SQLite unixODBC
+	@echo $@
+
+asciidoc : docbook-xsl fop libxslt Lynx
+	@echo $@
+
+Autoconf213 :
+	@echo $@
+
+Berkeley_DB : java Sharutils
+	@echo $@
+
+bind-utils : libuv libxml2 PLY
+	@echo $@
+
+bind-utils-extra : json-c libcap-pam libxml2
+	@echo $@
+
+BlueZ : GLib libical
+	@echo $@
+
+Brotli : CMake
+	@echo $@
+
+btrfs-progs : asciidoc LZO xmlto
+	@echo $@
+
+CMake : cURL libuv libarchive nghttp2
+	@echo $@
+
+CrackLib :
+	@echo $@
+
+cryptsetup: json-c libpwquality LVM2 popt
+	@echo $@
+
+cURL : make-ca MIT_Kerberos-keyutils nghttp2 OpenLDAP
+	@echo $@
+
+cURL-extra : Brotli c-ares GnuTLS libidn2 libpsl libssh2 Samba
+	@echo $@
+
+Cyrus-SASL : Berkeley_DB java sqlite3
+	@echo $@
+
+dbus-xorglibs : Xorg-Libs
+	@echo $@
+
+desktop-file-utils : GLib
+	@echo $@
+
+dhcpcd : ntp
+	@echo $@
+
+docbook-dsssl :
+	@echo $@
+
+docbook-dtd : sgml-common unzip
+	@echo $@
+
+DocBook-Utils : docbook-dsssl docbook-dtd OpenJade
+	@echo $@
+
+docbook-xml : libxml2 sgml-common unzip
+	@echo $@
+
+docbook-xsl :
+	@echo $@
+
+Doxygen : CMake git Graphviz
+	@echo $@
+
+Fontconfig : FreeType-HarfBuzz json-c DocBook-Utils libxml2
+	@echo $@
+
+fop : apache-ant
+	@echo $@
+
+FreeType :
+	@echo $@
+
+FreeType-HarfBuzz : Brotli FreeType Graphite-HarfBuzz libpng which
+	@echo $@
+
+GC : libatomic_ops
+	@echo $@
+
+GDB : Guile six # Valgrind-llvm
+	@echo $@
+
+git : asciidoc cURL PCRE2 Subversion Tk xmlto # Valgrind
+	@echo $@
+
+GLib : docbook-xml docbook-xsl GDB GTK-Doc libxslt PCRE \
+	# gobject-introspection shared-mime-info desktop-file-utils
+	@echo $@
+
+GnuTLS : libseccomp libidn2 libtasn1 libunistring make-ca Nettle p11-kit
+	@echo $@
+
+gobject-introspection : GLib GTK-Doc Mako Markdown
+	@echo $@
+
+Graphite : CMake
+	@echo $@
+
+Graphviz :
+	@echo $@
+
+Graphviz-Extra : Cairo Fontconfig GTK+-2 libjpeg-turbo libpng Pango Xorg-Libs \
+	GD libwebp ghostscript librsvg Poppler Freeglut libglade Qt SWIG Guile \
+	java Lua PHP Ruby Tk
+	@echo $@
+
+GTK-Doc : docbook-xml docbook-xsl itstool libxslt lxml Pygments
+	@echo $@
+
+GTK-Doc-fop : GTK-Doc fop
+	@echo $@
+
+Guile : GC libunistring # Runtime GDB Emacs
+	@echo $@
+
+HarfBuzz : GLib gobject-introspection ICU
+	@echo $@
+
+Graphite-HarfBuzz : Graphite HarfBuzz
+	@echo $@
+
+ICU :
+	@echo $@
+
+inih : ICU
+	@echo $@
+
+iptables : libnetfilter_acct libnetfilter_conntrack libnetfilter_cttimeout \
+	libnetfilter_cthelper libnetfilter_queue libnfnetlink libpcap nfacct
+	@echo $@
+
+IO-Socket-SSL : Net-SSLeay URI
+	@echo $@
+
+itstool : docbook-xml
+	@echo $@
+
+java : # Runtime Deps - alsa-lib cups giflib xorg-lib
+	@echo $@
+
+js78 : Autoconf213 ICU rustc which
+	@echo $@
+
+json-c : CMake
+	@echo $@
+
+keyutils : MIT_Kerberos
+	@echo $@
+
+libaio :
+	@echo $@
+
+libarchive : libxml2 LZO Nettle
+	@echo $@
+
+libatomic_ops :
+	@echo $@
+
+libcap-pam : Linux-PAM
+	@echo $@
+
+libedit :
+	@echo $@
+
+libevent : Doxygen
+	@echo $@
+
+libgcrypt : libgpg-error
+	@echo $@
+
+libgpg-error :
+	@echo $@
+
+libical : Berkeley_DB Doxygen gobject-introspection ICU Vala 
+	@echo $@
+
+libidn2 : git GTK-Doc libunistring
+	@echo $@
+
+libmicrohttpd :
+	@echo $@
+
+libmnl :
+	@echo $@
+
+libnetfilter_acct : libmnl
+	@echo $@
+
+libnetfilter_conntrack : libnfnetlink libmnl
+	@echo $@
+
+libnetfilter_cthelper : libmnl
+	@echo $@
+
+libnetfilter_cttimeout : libmnl
+	@echo $@
+
+libnetfilter_queue : libnfnetlink libmnl
+	@echo $@
+
+libnfnetlink :
+	@echo $@
+
+libnftnl :
+	@echo $@
+
+libnl :
+	@echo $@
+
+libnsl : libtirpc rpcsvc-proto
+	@echo $@
+
+libpcap : BlueZ libnl libusb
+	@echo $@
+
+libpng :
+	@echo $@
+
+libpsl : libidn2 GTK-Doc # Valgrind
+	@echo $@
+
+libpwquality : CrackLib Linux-PAM
+	@echo $@
+
+libseccomp : # Valgrind
+	@echo $@
+
+libssh2 :
+	@echo $@
+
+libtasn1 : GTK-Doc # Valgrind
+	@echo $@
+
+libtirpc : MIT_Kerberos-keyutils
+	@echo $@
+
+libunistring :
+	@echo $@
+
+libusb : Doxygen
+	@echo $@
+
+libuv :
+	@echo $@
+
+libXau : xorgproto
+	@echo $@
+
+libxcb : libXau libXdmcp xcb-proto
+	@echo $@
+
+libXdmcp : fop xorgproto
+	@echo $@
+
+libxkbcommon : Doxygen libxcb Wayland-Protocols xkeyboard-config
+	@echo $@
+
+libxml2 : ICU
+	@echo $@
+
+libxslt : docbook-xml docbook-xsl libgcrypt libxml2
+	@echo $@
+
+libyaml :
+	@echo $@
+
+Linux-PAM : Berkeley_DB docbook-xml docbook-xsl fop libnsl libtirpc libxslt \
+	Lynx
+	@echo $@
+
+qrencode : Doxygen
+	@echo $@
+
+lxml : libxslt
+	@echo $@
+
+LVM2 : libaio mdadm reiserfsprogs which xfsprogs # Valgrind
+	@echo $@
+
+LLVM : CMake libxml2 Pygments PyYAML Zip # Valgrind
+	@echo $@
+
+Lynx : Sharutils Zip unzip
+	@echo $@
+
+LZO :
+	@echo $@
+
+lz4 :
+	@echo $@
+
+make-ca : p11-kit
+	@echo $@
+
+Mako : MarkupSafe
+	@echo $@
+
+Markdown :
+	@echo $@
+
+MarkupSafe :
+	@echo $@
+
+mdadm :
+	@echo $@
+
+MIT_Kerberos :
+	@echo $@
+
+MIT_Kerberos-keyutils : bind-utils keyutils libedit OpenLDAP yasm
+	@echo $@
+
+Net-SSLeay :
+	@echo $@
+
+Nettle :
+	@echo $@
+
+nfacct : libmnl libnetfilter_acct
+	@echo $@
+
+nftables : iptables libmnl libnftnl
+	@echo $@
+
+nghttp2 : libxml2
+	@echo $@
+
+nghttp2-extra : Boost c-ares jansson libevent
+	@echo nghttp2-extra
+
+nss : nspr sqlite3
+	@echo $@
+
+nspr :
+	@echo $@
+
+# optional with a Systemd install
+ntp : IO-Socket-SSL libcap-pam libedit libevent
+	@echo $@
+
+OpenJade : OpenSP SGMLSpm Lynx
+	@echo $@
+
+OpenLDAP : Berkeley_DB Cyrus-SASL
+	@echo $@
+
+OpenSP : sgml-common xmlto
+	@echo $@
+
+OpenSSH : libedit
+	@echo $@
+
+p11-kit : libtasn1 libxslt nss
+	@echo $@
+
+PCRE : libedit # Valgrind
+	@echo $@
+
+PCRE2 : libedit # Valgrind
+	@echo $@
+
+Polkit : GLib gobject-introspection js78 Linux-PAM
+	@echo $@
+
+popt : Doxygen
+	@echo $@
+
+PLY :
+	@echo $@
+
+Pygments :
+	@echo $@
+
+PyYAML : libyaml
+	@echo $@
+
+reiserfsprogs :
+	@echo $@
+
+rpcsvc-proto :
+	@echo $@
+
+rsync : Doxygen lz4 popt
+	@echo $@
+
+rustc : CMake cURL libssh2 LLVM
+	@echo $@
+
+SCons : docbook-xsl libxslt
+	@echo $@
+
+sgml-common :
+	@echo $@
+
+SGMLSpm :
+	@echo $@
+
+shadow-pam : Linux-PAM
+	@echo $@
+
+shared-mime-info : GLib itstool libxml2 xmlto
+	@echo $@
+
+Sharutils :
+	@echo $@
+
+six :
+	@echo $@
+
+sqlite3 : libedit unzip
+	@echo $@
+
+Subversion : Apr-Util sqlite3
+	@echo $@
+
+sudo : bind-utils Linux-PAM MIT_Kerberos-keyutils OpenLDAP
+	@echo $@
+
+Systemd-Extras : btrfs-progs cURL cryptsetup dbus-xorglibs git GnuTLS iptables \
+	libcap-pam libgcrypt libidn2 libmicrohttpd libpwquality libxkbcommon lxml \
+	lz4 make-ca nftables p11-kit PCRE2 Polkit qrencode rsync shadow-pam \
+	zsh # Valgrind gnu-efi kexec-tools libfido2 quota-tools Sphinx
+	@echo $@
+
+Tk : Xorg-Libs
+	@echo $@
+
+unzip :
+	@echo $@
+
+URI :
+	@echo $@
+
+util-macros : Xorg-Build-Environment
+	@echo $@
+
+Vala : GLib libxslt
+	@echo $@
+
+Valgrind : GTK-Doc
+	@echo $@
+
+Valgrind-llvm : LLVM
+	@echo $@
+
+Wayland : Doxygen libxml2
+	@echo $@
+
+Wayland-Protocols : Wayland
+	@echo $@
+
+wget : libidn2 libpsl make-ca PCRE2
+	@echo $@
+
+which :
+	@echo $@
+
+whois : libidn2
+	@echo $@
+
+wpa_supplicant : # QT5, For Network-Manager: libnl libxml2
+	@echo $@
+
+xcb-proto :
+	@echo $@
+
+xfsprogs : inih ICU
+	@echo $@
+
+xkeyboard-config : Xorg-Libs
+	@echo $@
+
+xmlto: docbook-xml docbook-xsl fop libxslt Lynx
+	@echo $@
+
+Xorg-Libs : Fontconfig libxcb xmlto fop Lynx
+	@echo $@
+
+Xorg-Build-Environment : sudo
+	@echo $@
+
+xorgproto : asciidoc util-macros
+	@echo $@
+
+yasm :
+	@echo $@
+
+Zip :
+	@echo $@
+
+zsh : libcap-pam PCRE # Valgrind
+	@echo $@
+
+
+include Xorg.Makefile
+include QT5.Makefile
+include KDE.Makefile
+include Utils.Makefile
+include Extras.Makefile
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/blfs/QT5.Makefile b/blfs/QT5.Makefile
index 906b358..aa1e2a6 100644
--- a/blfs/QT5.Makefile
+++ b/blfs/QT5.Makefile
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Most deps like GLib, Xorg, gobject-introspection brought in from

 # Systemd-Extras and Xorg in main and Xorg Makefiles and not listed 

 # here or commented in targets

@@ -282,3 +283,282 @@ xdg-utils : # xmlto Lynx Xorg-Apps dbus
 

 wpa_supplicant-qt : qt-everywhere

 	@echo $@

+=======
+# Most deps like GLib, Xorg, gobject-introspection brought in from
+# Systemd-Extras and Xorg in main and Xorg Makefiles and not listed 
+# here or commented in targets
+#
+# Deps which can use QT5 after systemd extra and Xorg and QT5
+# Rebuild the following:
+# wpa_supplicant cairo doxygen cmake graphviz
+# suggest waiting for cairo and graphviz for later
+
+qt5 = qt-everywhere Avahi-qt CMake-qt gst-plugins-base-qt \
+	  gst-plugins-good-qt v4l-utils-qt wpa_supplicant-qt
+
+
+all: Systemd-Extras $(qt5)
+
+qt-everywhere : Alsa Cups gst-plugins-good JasPer libmng libtiff-libwebp \
+	ibus MariaDB pciutils PostgreSQL Python2 PulseAudio SDL2 unixODBC \
+	Xorg-Libs make-ca GLib HarfBuzz ICU libjpeg-turbo libpng libtiff \
+	libxkbcommon Mesa MIT_Kerberos mtdev PCRE2 sqlite3 Wayland xcb-util-image \
+	xcb-util-keysyms xcb-util-renderutil xcb-util-wm BlueZ libinput
+	@echo $@
+
+AAlib : GPM slang Xorg-Libs
+	@echo $@
+
+Alsa : alsa-lib alsa-plugins alsa-utils alsa-oss
+	@echo $@
+
+alsa-lib : Python2 Doxygen
+	@echo $@
+
+alsa-oss : alsa-lib
+	@echo $@
+
+alsa-plugins : alsa-lib libsamplerate PulseAudio Speex
+	@echo $@
+
+alsa-utils : alsa-lib fftw libsamplerate docutils xmlto
+	@echo $@
+
+Avahi : libdaemon libglade DBus-Python PyGTK \
+	GLib gobject-introspection GTK2 GTK3 libevent Doxygen
+	@echo $@
+
+Avahi-qt : qt-everywhere
+	@echo $@
+
+bash-completion :
+	@echo $@ "https://github.com/scop/bash-completion"
+
+Boost : which ICU
+	@echo $@
+
+CDParanoia-III :
+	@echo $@
+
+CMake-qt : qt-everywhere
+	@echo $@
+
+colord: LCMS2 libgusb SANE Polkit sqlite3 gobject-introspection libgudev Vala
+	@echo $@
+
+Cups : Avahi colord libpaper Python2 xdg-utils libusb Linux-PAM java # dbus
+	@echo $@
+
+dbus-glib : GLib GTK-Doc # dbus
+	@echo $@
+
+DBus-Python : Python2 PyGObject docutils GLib # dbus
+	@echo $@
+
+DConf : bash-completion GLib GTK3 libxml2 libxslt Vala GTK-Doc # dbus
+	@echo $@
+
+fftw :
+	@echo $@
+
+FLAC : libogg NASM DocBook-Utils Doxygen # Valgrind
+	@echo $@
+
+GConf : dbus-glib libxml2 gobject-introspection GTK3 Polkit OpenLDAP
+	@echo $@
+
+giflib : # xmlto
+	@echo $@
+
+glib-networking : gsettings-desktop-schemas GLib GnuTLS make-ca
+	@echo $@
+
+GPM :
+	@echo $@
+
+gsettings-desktop-schemas : GLib gobject-introspection
+	@echo $@
+
+Gsl :
+	@echo $@
+
+graphene :
+	@echo $@
+
+gst-plugins-base : alsa-lib CDParanoia-III graphene gstreamer libogg libtheora \
+	libvorbis Opus SDL2 gobject-introspection ISO-Codes \
+	libgudev Mesa Wayland-Protocols Xorg-Libs # Valgrind
+	@echo $@
+
+gst-plugins-base-qt : qt-everywhere
+	@echo $@
+
+gst-plugins-good : AAlib alsa-oss FLAC gst-plugins-base LAME libcaca \
+	libdv libsoup libvpx mpg123 PulseAudio Speex taglib v4l-utils \
+	Cairo GTK3 libgudev libjpeg-turbo libpng Mesa Wayland \
+	NASM Xorg-Libs # Valgrind
+	@echo $@
+
+gst-plugins-good-qt : qt-everywhere
+	@echo $@
+
+gstreamer : Gsl GLib gobject-introspection GTK3 # Valgrind
+	@echo $@
+
+ibus : DConf libnotify DBus-Python PyGObject PyXDG \
+	ISO-Codes Vala gobject-introspection GTK2 GTK-Doc libxkbcommon \
+	Wayland
+	@echo $@
+
+Imlib2 : giflib libid3tag Xorg-Libs libpng libjpeg-turbo libtiff-webp
+	@echo $@
+
+JasPer : CMake libjpeg-turbo freeglut
+	@echo $@
+
+LAME : libsndfile NASM
+	@echo $@
+
+LCMS2 : libjpeg-turbo libtiff
+	@echo $@
+
+libcaca : Imlib2 slang Xorg-Libs
+	@echo $@
+
+libdaemon : Doxygen Lynx
+	@echo $@
+
+libdazzle : GTK3 Vala
+	@echo $@
+
+libdv : popt Xorg-Libs
+	@echo $@
+
+libglade : Python2 libxml2 GTK2 GTK-Doc
+	@echo $@
+
+libgusb : usbutils libusb GTK-Doc gobject-introspection Vala
+	@echo $@
+
+libid3tag :
+	@echo $@
+
+libmng : LCMS2 libjpeg-turbo
+	@echo $@
+
+libnotify : GTK3 gobject-introspection GTK-Doc xmlto
+	@echo $@
+
+libogg :
+	@echo $@
+
+libpaper :
+	@echo $@
+
+libsamplerate : alsa-lib libsndfile fftw
+	@echo $@
+
+libsndfile : alsa-lib FLAC libvorbis Opus Speex sqlite3
+	@echo $@
+
+libsoup : glib-networking libpsl sysprof libxml2 sqlite3 \
+	gobject-introspection Vala
+	@echo $@
+
+libtheora : libogg libvorbis
+	@echo $@
+
+libtheora-qt : qt-everywhere
+	@echo $@
+
+libvorbis : libogg
+	@echo $@
+
+libvpx : yasm NASM which cURL Doxygen
+	@echo $@
+
+libwebp : giflib libjpeg-turbo libpng libtiff
+	@echo $@
+
+libtiff-libwebp : libwebp
+	@echo $@
+
+MariaDB : Boost Ruby unixODBC \
+	CMake libevent libaio libxml2 Linux-PAM MIT_Kerberos PCRE # Valgrind
+	@echo $@
+
+mpg123 : alsa-lib Boost PulseAudio
+	@echo $@
+
+Opus :
+	@echo $@
+
+pciutils : cURL wget Lynx
+	@echo $@
+
+PostgreSQL : Python2 ICU libxml2 OpenLDAP Linux-PAM MIT_Kerberos \
+	fop docbook-dtd docbook-dsssl DocBook-Utils OpenJade SGMLSpm
+	@echo $@
+
+PulseAudio : libsndfile alsa-lib Speex Avahi fftw GConf libsamplerate SBC \
+	GLib libcap-pam Xorg-Libs BlueZ Doxygen GTK3 # Valgrind dbus
+	@echo $@
+
+PyCairo : Python2 Cairo
+	@echo $@
+
+PyGObject : PyCairo Python2
+	@echo $@
+
+PyGTK : libglade PyCairo PyGObject Python2 ATK GTK2 libxslt Pango
+	@echo $@
+
+Python2 : BlueZ sqlite3 Tk # Valgrind
+	@echo $@
+
+PyXDG : Python2
+	@echo $@
+
+Ruby : Berkeley_DB Doxygen Graphviz Tk # Valgrind
+	@echo $@
+
+SANE : Avahi v4l-utils
+	@echo $@
+
+SBC : libsndfile
+	@echo $@
+
+SDL2 : Alsa ibus PulseAudio libsamplerate \
+   	libxkbcommon Wayland-Protocols Xorg-Libs Doxygen NASM
+	@echo $@
+
+slang : libpng PCRE
+	@echo $@
+
+Speex : libogg # Valgrind
+	@echo $@
+
+sysprof : libdazzle GTK3 Polkit
+	@echo $@
+
+taglib : CMake
+	@echo $@
+
+v4l-utils : alsa-lib SDL2 Doxygen GLU libjpeg-turbo
+	@echo $@
+
+v4l-utils-qt : qt-everywhere
+	@echo $@
+
+unixODBC :
+	@echo $@
+
+usbutils : libusb wget
+	@echo $@
+
+xdg-utils : xmlto Lynx Xorg-Apps # dbus
+	@echo $@
+
+wpa_supplicant-qt : qt-everywhere
+	@echo $@
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/blfs/Utils.Makefile b/blfs/Utils.Makefile
index 07c8e66..36db1a0 100644
--- a/blfs/Utils.Makefile
+++ b/blfs/Utils.Makefile
@@ -1,6 +1,356 @@
+<<<<<<< HEAD
 # Most deps like GLib, Xorg, gobject-introspection brought in from

 # Systemd-Extras and Xorg in main and Xorg Makefiles and not listed 

 # here or commented in targets

 utiltargets = 

 

 all: $(utiltargets)

+=======
+# Most deps like GLib, Xorg, gobject-introspection brought in from
+# Systemd-Extras and Xorg in main and Xorg Makefiles and not listed 
+# here or commented in targets
+#
+# These are utils or libraries or other apps. Maybe rename this.
+# These may depend on QT/KF5 or other
+
+utiltargets = $(security) $(filesystems) $(genlibs) $(uefiboot) $(editors) \
+			  $(shells) $(virtualization) $(graphfontlibs) $(genutils) \
+			  $(sysutils) $(programming) $(netprogs) $(netutils) $(netlibs) \
+			  $(textbrowsers) $(mail_newsclients) $(servers)
+
+all : Systemd-Extras $(utiltargets)
+
+editors = Bluefish Ed Emacs Joe Nano Vim # Gedit Mousepad
+
+filesystems = jfsutils sshfs
+
+genlibs = Double-conversion enchant liblinear Talloc telepathy-glib \
+		  # CLucene Exempi GMime gspell libgrss libgsf \
+		  libiodbc libportal libsigc3 libstatgrab \
+		  libuninameslist libunique Pth Uchardet Umockdev wv
+
+genutils = Bogofilter Compface Hd2u Highlight lsof Rarian Rep-gtk Screen \
+		   telepathy-logger telepathy-mission-control tidy-html5 Time \
+		   tree Xdg-user-dirs
+
+#gnomeapps = Gucharmap
+
+graphfontlibs = babl gegl GLM libmypaint libspiro mypaint-brushes Potrace \
+				Qpdf woff2
+
+mail_newsclients = Fetchmail mailx Mutt Procmail
+
+netlibs = # GeoClue ldns libnma uhttpmock
+
+netprogs = bridge-utils cifs-utils iw NcFTP Wireless_tools
+
+netutils = Nmap Traceroute Whois Wireshark \
+		   # Avahi bind-utils NetworkManager network-manager-applet
+
+programming = librep Lua54 Mercurial # Cbindgen 
+
+security = haveged liboauth ssh-askpass \
+		   # firewall polkit-gnome stunnel Tripwire
+
+servers = # Apache BIND ProTPD vsftpd Dovecot Exim Postfix sendmail unbound
+
+shells = Dash Tcsh
+
+sysutils = acpid at autofs cups-pk-helper \
+		   Fcron Hdparm LSB-Tools Logrotate MC \
+		   Pax pm-utils  sg3_utils Sysstat \
+		   # AccountsService Bubblewrap notification-daemon \
+		   Raptor Rasqal Redland
+
+textbrowsers = Links # Lynx
+
+uefiboot = # efivar efibootmgr GRUB
+
+#virtualization = qemu
+
+all: $(utiltargets)
+
+### Security ###
+
+haveged :
+	@echo $@
+
+liboauth : cURL nss Doxygen
+	@echo $@
+
+ssh-askpass : GTK2 sudo Xorg-Libs
+	@echo $@
+
+### Filesystems ###
+
+jfsutils :
+	@echo $@
+
+sshfs : Fuse GLib docutils
+	@echo $@
+
+### UEFI Boot ###
+
+
+
+### Editors ###
+
+Bluefish : enchant Gucharmap # Jing
+	@echo $@
+
+Ed : libarchive
+	@echo $@
+
+Emacs : HarfBuzz giflib GnuTLS jansson libtiff Xorg-Libs \
+	alsa-lib Cairo GConf gobject-introspection gsettings-desktop-schemas \
+	GPM GTK2 GTK3 ImageMagick LCMS2 libjpeg-turbo libpng librsvg libxml2 \
+	MIT_Kerberos # Valgrind dbus
+	@echo $@
+
+Joe :
+	@echo $@
+
+Nano :
+	@echo $@
+
+Vim : Lua54 Xorg-Libs GTK3 GPM rsync Ruby
+	@echo $@
+
+### General Libraries ###
+
+Double-conversion : CMake
+	@echo $@
+
+enchant : GLib Aspell dbus-glib Doxygen Hspell Hunspell 
+	@echo $@
+
+libiodbc :
+	@echo $@
+
+liblinear :
+	@echo $@
+
+Talloc : docbook-xml docbook-xsl libxslt GDB git libnsl libtirpc xfsprogs \
+	# Valgrind
+	@echo $@
+
+telepathy-glib : dbus-glib GTK-Doc libxslt gobject-introspection Vala # dbus
+	@echo $@
+
+### Graphics and Font Libraries ###
+
+babl : gobject-introspection librsvg LCMS2 Vala
+	@echo $@
+
+gegl : babl gexiv2 libspiro JSON-GLib libjpeg-turbo libpng \
+	gobject-introspection Graphviz Pygments PyGObject asciidoc Cairo \
+	Exiv2 ffmpeg gdk-pixbuf GTK-Doc JasPer LCMS2 librsvg libtiff \
+	libwebp Pango Ruby SDL2 v4l-utils Vala OpenEXR
+	@echo $@
+
+GLM :
+	@echo $@
+
+libmypaint : json-c GLib gobject-introspection Doxygen
+	@echo $@
+
+libspiro :
+	@echo $@
+
+mypaint-brushes : libmypaint
+	@echo $@
+
+Potrace : LLVM
+	@echo $@
+
+Qpdf : libjpeg-turbo fop GnuTLS libxslt
+	@echo $@
+
+woff2 : Brotli CMake
+	@echo $@
+
+### General Utilities ###
+
+Bogofilter : Berkeley_DB Gsl libxml2 lmdb sqlite3 xmlto
+	@echo $@
+
+Compface :
+	@echo $@
+
+Hd2u : popt
+	@echo $@
+
+Highlight : Lua54 Boost qt-everywhere
+	@echo $@
+
+lsof : libtirpc
+	@echo $@
+
+Rarian : libxslt docbook-xml
+	@echo $@
+
+Rep-gtk : librep GTK2
+	@echo $@
+
+Screen : Linux-PAM
+	@echo $@
+
+telepathy-logger : telepathy-glib Python2 sqlite3
+	@echo $@
+
+telepathy-mission-control : telepathy-glib DBus-Python NetworkManager \
+	GTK-Doc UPower
+	@echo $@
+
+tidy-html5 : CMake libxslt
+	@echo $@
+
+Time :
+	@echo $@
+
+tree :
+	@echo $@
+
+Xdg-user-dirs :
+	@echo $@
+
+### System Utilities ###
+
+acpid :
+	@echo $@
+
+at :
+	@echo $@
+
+autofs : nfs-utils libtirpc rpcsvc-proto libnsl libxml2 MIT_Kerberos \
+	OpenLDAP Cyrus-SASL
+	@echo $@
+
+cups-pk-helper :
+	@echo $@
+
+Fcron : Vim Linux-PAM DocBook-Utils
+	@echo $@
+
+Hdparm :
+	@echo $@
+
+LSB-Tools :
+	@echo $@
+
+Logrotate : popt
+	@echo $@
+
+MC : GLib PCRE slang Doxygen GPM libssh2 Ruby Samba unzip Xorg-Libs Zip
+	@echo $@
+
+Pax :
+	@echo $@
+
+pm-utils : xmlto Hdparm
+	@echo $@
+
+sg3_utils :
+	@echo $@
+
+Sysstat :
+	@echo $@
+
+### Gnome Libraries and Desktop ###
+
+gexiv2 : Exiv2 Vala GTK-Doc Python2
+	@echo $@
+
+### Gnome Apps ###
+
+Gucharmap : desktop-file-utils GTK3 itstool unzip wget \
+	gobject-introspection Vala GTK-Doc
+	@echo $@
+
+### Shells ###
+
+Dash :
+	@echo $@
+
+Tcsh :
+	@echo $@
+
+### Virtualization ###
+
+
+### Programming ###
+
+librep :
+	@echo $@
+
+Lua54 :
+	@echo $@
+
+Mercurial : docutils git GnuPG2 OpenSSH Pygments rustc Subversion
+	@echo $@
+
+### Networking Programs ###
+
+bridge-utils :
+	@echo $@
+
+cifs-utils : Talloc keyutils Linux-PAM MIT_Kerberos Samba libcap-pam
+	@echo $@
+
+iw : libnl
+	@echo $@
+
+NcFTP : LLVM
+	@echo $@
+
+nfs-utils : rpcbind libtirpc rpcsvc-proto Cyrus-SASL LVM2 libnsl OpenLDAP \
+	sqlite3 MIT_Kerberos libcap-pam
+	@echo $@
+
+rpcbind : libtirpc
+	@echo $@
+
+Wireless_tools :
+	@echo $@
+
+### Networking Utilities ###
+
+Nmap : liblinear Lua54 libpcap PCRE PyGTK Python2 libssh2
+	@echo $@
+
+Traceroute :
+	@echo $@
+
+Whois : libidn2
+	@echo $@
+
+Wireshark : CMake GLib libgcrypt qt-everywhere libpcap Brotli c-ares \
+	Doxygen git GnuTLS libnl libxslt libxml2 Lua MIT_Kerberos nghttp2 \
+	SBC Speex
+	@echo $@
+
+### Networking Libraries ###
+
+Serf : Apr-Util SCons MIT_Kerberos
+	@echo $@
+
+### Text Web Browsers ###
+
+Links : libevent GPM Xorg-Libs libpng libjpeg-turbo librsvg libtiff
+	@echo $@
+
+### Mail / News Clients ###
+
+Fetchmail : Procmail MIT_Kerberos
+	@echo $@
+
+mailx : nss MIT_Kerberos
+	@echo $@
+
+Mutt : Links Lynx Aspell Cyrus-SASL GDB GnuPG2 GPGME libidn MIT_Kerberos \
+	slang sqlite3
+	@echo $@
+
+Procmail : libnsl
+	@echo $@
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/blfs/Xorg.Makefile b/blfs/Xorg.Makefile
index 96701bf..f23862a 100644
--- a/blfs/Xorg.Makefile
+++ b/blfs/Xorg.Makefile
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Most deps like GLib, Xorg-Libs, gobject-introspection brought in from

 # Systemd-Extras in main Makefile and not listed here or commented in targets

 xorg = xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil \

@@ -188,3 +189,187 @@ Xorg-Server : libepoxy libxcvt Pixman-GTK2 xcb-util-keysyms xcb-util-image \
 

 xterm : dejavu-fonts Xorg-Apps # PCRE2 Valgrind

 	@echo $@

+=======
+# Most deps like GLib, Xorg-Libs, gobject-introspection brought in from
+# Systemd-Extras in main Makefile and not listed here or commented in targets
+xorg = Systemd-Extras \
+	   xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil \
+	   xcb-util-wm xcb-util-cursor libva Mesa libva-Mesa xbitmaps Xorg-Apps \
+	   xcursor-themes Xorg-Fonts librsvg Xorg-Server Xorg-Drivers \
+	   twm xterm xclock xinit
+
+all: $(xorg)
+
+at-spi2-atk : at-spi2-core ATK
+	@echo $@
+
+at-spi2-core : GLib Xorg-Libs gobject-introspection GTK-Doc # dbus
+	@echo $@
+
+ATK : GLib gobject-introspection GTK-Doc
+	@echo $@
+
+Cairo : Pixman libdrm Fontconfig GLib GTK-Doc libpng libxml2 LZO \
+	Xorg-Libs # Valgrind
+	@echo $@
+
+Cairo-Extra : Cogl GTK2 GTK3 Poppler QT
+	@echo $@
+
+dejavu-fonts :
+	@echo $@
+
+docutils :
+	@echo $@
+
+freeglut : GLU CMake
+	@echo $@
+
+FriBidi :
+	@echo $@
+
+gdk-pixbuf : libjpeg-turbo libtiff \
+	GLib libpng shared-mime-info gobject-introspection GTK-Doc \
+	# librsvg-runtime	
+	@echo $@
+
+GLU : Mesa
+	@echo $@
+
+GTK2 : ATK gdk-pixbuf Pango hicolor-icon-theme
+	@echo $@
+
+GTK3 : at-spi2-atk gdk-pixbuf hicolor-icon-theme ISO-Codes \
+	JSON-GLib libepoxy Pango sassc \
+	libxkbcommon Wayland Wayland-Protocols DocBook-Utils GTK-Doc
+	@echo $@
+
+HarfBuzz-Cairo : Cairo
+	@echo $@
+
+hicolor-icon-theme :
+	@echo $@
+
+ISO-Codes :
+	@echo $@
+
+JBIG-KIT :
+	@echo $@
+
+JSON-GLib : GLib gobject-introspection GTK-Doc
+	@echo $@
+
+libdrm : docutils
+	@echo $@
+
+libepoxy : Mesa
+	@echo $@
+
+libevdev :
+	@echo $@
+
+libgudev : GLib gobject-introspection GTK-Doc
+	@echo $@
+
+libinput : GTK3 libevdev libwacom mtdev
+	@echo $@
+
+libjpeg-turbo : NASM CMake yasm
+	@echo $@
+
+librsvg : gdk-pixbuf Cairo Pango rustc gobject-introspection Vala GTK-Doc
+	@echo $@
+
+libtiff : Mesa freeglut JBIG-KIT CMake
+	@echo $@
+
+libtiff-webp :
+	@echo $@
+
+libva : libdrm
+	@echo $@
+
+libva-Mesa : Mesa
+	@echo $@
+
+libvdpau : Xorg-Libs Graphviz
+	@echo $@
+
+libwacom : libgudev
+	@echo $@
+
+Mesa : libdrm libva libvdpau LLVM libgcrypt Nettle # Valgrind
+	@echo $@ https://gitlab.freedesktop.org/mesa/mesa.git
+
+mtdev :
+	@echo $@
+
+NASM : asciidoc xmlto
+	@echo $@
+
+Pango : HarfBuzz-Cairo FriBidi \
+	Fontconfig GLib gobject-introspection Xorg-Libs GTK-Doc
+	@echo $@
+
+Pixman :
+	@echo $@
+
+Pixman-GTK2 : GTK2
+	@echo $@
+
+sassc :
+	@echo $@
+
+twm : Xorg-Legacy-Fonts Xorg-Server
+	@echo $@
+
+xbitmaps : util-macros
+	@echo $@
+
+xcb-util : libxcb
+	@echo $@
+
+xcb-util-cursor : xcb-util
+	@echo $@
+
+xcb-util-image : xcb-util
+	@echo $@
+
+xcb-util-keysyms : libxcb
+	@echo $@
+
+xcb-util-renderutil : libxcb
+	@echo $@
+
+xcb-util-wm : libxcb
+	@echo $@
+
+xclock : Xorg-Libs
+	@echo $@
+
+xcursor-themes : Xorg-Apps
+	@echo $@
+
+xinit : Xorg-Libs
+	@echo $@
+
+Xorg-Apps : Mesa xbitmaps xcb-util libpng Linux-PAM
+	@echo $@
+
+Xorg-Drivers : libevdev libinput mtdev Xorg-Server
+	@echo $@
+
+Xorg-Fonts : xcursor-themes
+	@echo $@
+
+Xorg-Legacy-Fonts : xcursor-themes
+	@echo $@
+
+Xorg-Server : libepoxy Pixman-GTK2 xcb-util-keysyms xcb-util-image \
+	xcb-util-renderutil xcb-util-wm Xorg-Fonts xkeyboard-config Wayland \
+	Wayland-Protocols Nettle libgcrypt fop
+	@echo $@
+
+xterm : dejavu-fonts Xorg-Apps PCRE2 # Valgrind
+	@echo $@
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/chapter6/bash.sh b/chapter6/bash.sh
index 1c53aad..54c10a7 100644
--- a/chapter6/bash.sh
+++ b/chapter6/bash.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash

 set -e

 

@@ -10,3 +11,17 @@ make &&
 make DESTDIR="${LFS}" -j1 install &&

 mv "${LFS}"/usr/bin/bash "${LFS}"/bin/bash &&

 ln -sv bash "${LFS}"/bin/sh

+=======
+#!/bin/bash
+set -e
+
+patch -Np1 -i ../bash-"${VERSION}"-fixes-2.patch &&
+./configure --prefix=/usr \
+            --build="$(support/config.guess)" \
+            --host="${LFS_TGT}" \
+            --without-bash-malloc &&
+make &&
+make DESTDIR="${LFS}" -j1 install &&
+mv "${LFS}"/usr/bin/bash "${LFS}"/bin/bash &&
+ln -sv bash "${LFS}"/bin/sh
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/chapter6/file.sh b/chapter6/file.sh
index 065bf6d..8baa055 100644
--- a/chapter6/file.sh
+++ b/chapter6/file.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash

 set -e

 

@@ -19,3 +20,26 @@ make DESTDIR="${LFS}" -j1 install &&
 

 mv -v "${LFS}"/usr/lib/libmagic.so.* "${LFS}"/lib &&

 ln -sfv ../../lib/"$(readlink /usr/lib/libmagic.so)" "${LFS}"/usr/lib/libmagic.so

+=======
+#!/bin/bash
+set -e
+
+mkdir build
+pushd build > /dev/null || exit 1
+
+../configure --disable-bzlib \
+             --disable-libseccomp \
+             --disable-xzlib \
+             --disable-zlib &&
+make &&
+popd > /dev/null || exit 1
+
+./configure --prefix=/usr \
+            --host="${LFS_TGT}" \
+            --build="$(./config.guess)" &&
+make FILE_COMPILE="$(pwd)"/build/src/file &&
+make DESTDIR="${LFS}" -j1 install &&
+
+mv -v "${LFS}"/usr/lib/libmagic.so.* "${LFS}"/lib &&
+ln -sfv ../../lib/"$(readlink "${LFS}"/usr/lib/libmagic.so)" "${LFS}"/usr/lib/libmagic.so
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/chapter8/bash.sh b/chapter8/bash.sh
index 73de0bf..ee7124f 100644
--- a/chapter8/bash.sh
+++ b/chapter8/bash.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash

 # shellcheck disable=SC2016

 

@@ -16,3 +17,23 @@ make -j1 install &&
 mv -vf /usr/bin/bash /bin

 

 #exec /bin/bash --login +h

+=======
+#!/bin/bash
+# shellcheck disable=SC2016
+
+patch -Np1 -i ../bash-"${VERSION}"-fixes-2.patch &&
+
+sed -i  '/^bashline.o:.*shmbchar.h/a bashline.o: ${DEFDIR}/builtext.h' Makefile.in &&
+
+./configure --prefix=/usr \
+            --docdir=/usr/share/doc/bash-"${VERSION}" \
+            --without-bash-malloc \
+            --with-installed-readline &&
+
+make &&
+
+make -j1 install &&
+mv -vf /usr/bin/bash /bin
+
+#exec /bin/bash --login +h
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/chapter8/cleanup.sh b/chapter8/cleanup.sh
index eb35b67..7262ba6 100644
--- a/chapter8/cleanup.sh
+++ b/chapter8/cleanup.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash

 set -e

 

@@ -66,3 +67,73 @@ else
 	success "OK"

 	sudo touch "${LFS}"/sources/chapter8/cleanup >/dev/null 2>&1

 fi

+=======
+#!/bin/bash
+set -e
+
+if [ -f "${LFS}/sources/chapter8/cleanup" ]; then
+	printf "%b" "  ${IGRN}Cleanup already performed${RST}\n"
+else
+
+	printf "%b" "${GRN}Cleaning up ${YLW}${LFS}${RST}... "
+
+	{
+
+	sudo rm -rfv "${LFS}"/tmp/*
+	sudo rm -rfv "${LFS}"/tools
+
+	sudo find "${LFS}"/usr/lib -name \*.la -delete
+	sudo find "${LFS}"/usr/libexec -name \*.la -delete
+
+	sudo find "${LFS}"/usr -depth -name "$(uname -m)"-lfs-linux-gnu\* | xargs sudo rm -rfv
+
+	sudo sed '/tester/d' -i "${LFS}"/etc/group
+	sudo sed '/tester/d' -i "${LFS}"/etc/passwd
+	sudo rm -rfv "${LFS}"/home/tester
+
+	#sudo rm -rfv "${LFS}"/usr/share/doc
+	#sudo rm -rfv "${LFS}"/usr/share/info
+	#sudo rm -rfv "${LFS}"/usr/share/man
+
+	# Place debugging symbols for selected libraries in seprate files
+	save_lib="ld-?.*.so libc-?.*.so libpthread-?.*.so libthread_db-?.?.so"
+	pushd "${LFS}"/lib || exit 1
+
+	for LIB in $save_lib; do
+		sudo objcopy --only-keep-debug "${LIB}" "${LIB}".dbg
+		sudo strip --strip-unneeded "${LIB}"
+		sudo objcopy --add-gnu-debuglink="${LIB}".dbg "${LIB}"
+	done
+
+	popd || exit 1
+
+	save_usrlib="libquadmath.so.?.?.? libstdc++.so.?.?.* libitm.so.?.?.? libatomic.so.?.?.?"
+
+	pushd "${LFS}"/usr/lib || exit 1
+
+	for LIB in $save_usrlib; do
+		sudo objcopy --only-keep-debug "${LIB}" "${LIB}".dbg
+		sudo strip --strip-unneeded "${LIB}"
+		sudo objcopy --add-gnu-debuglink="${LIB}".dbg "${LIB}"
+	done
+
+	popd || exit 1
+
+	sudo find "${LFS}"/usr/lib -type f -name \*.a -exec strip --strip-debug {} ';'
+	sudo find "${LFS}"/lib -type f -name \*.so* ! -name \*dbg -exec strip --strip-unneeded {} ';'
+	sudo find "${LFS}"/usr/lib -type f -name \*.so* ! -name \*dbg -exec strip --strip-unneeded {} ';'
+
+
+	sudo find "${LFS}"/bin -type f -exec strip --strip-all {} ';'
+	sudo find "${LFS}"/sbin -type f -exec strip --strip-all {} ';'
+	sudo find "${LFS}"/usr/bin -type f -exec strip --strip-all {} ';'
+	sudo find "${LFS}"/usr/sbin -type f -exec strip --strip-all {} ';'
+	sudo find "${LFS}"/usr/libexec -type f -exec strip --strip-all {} ';'
+
+
+} >"${LFS}"/sources/log/chapter8/cleanup.log 2>&1
+
+	success "OK"
+	sudo touch "${LFS}"/sources/chapter8/cleanup >/dev/null 2>&1
+fi
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/chapter8/e2fsprogs.sh b/chapter8/e2fsprogs.sh
index fff8359..d789152 100644
--- a/chapter8/e2fsprogs.sh
+++ b/chapter8/e2fsprogs.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash

 set -e

 

@@ -24,3 +25,32 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/libext2fs.info &&
 makeinfo -o doc/com_err.info ../lib/et/com_err.texinfo &&

 install -v -m644 doc/com_err.info /usr/share/info &&

 install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info

+=======
+#!/bin/bash
+set -e
+
+mkdir -v build
+cd build || exit 1
+
+../configure --prefix=/usr \
+             --bindir=/bin \
+             --with-root-prefix="" \
+             --sysconfdir=/etc \
+             --enable-elf-shlibs \
+             --disable-libblkid \
+             --disable-libuuid \
+             --disable-uuidd \
+             --disable-fsck &&
+
+make &&
+
+make -j1 install &&
+
+rm -fv /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a &&
+gunzip -v /usr/share/info/libext2fs.info.gz &&
+install-info --dir-file=/usr/share/info/dir /usr/share/info/libext2fs.info &&
+
+makeinfo -o doc/com_err.info ../lib/et/com_err.texinfo &&
+install -v -m644 doc/com_err.info /usr/share/info &&
+install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/chapter8/iproute2.sh b/chapter8/iproute2.sh
index cb8dd77..edd989d 100644
--- a/chapter8/iproute2.sh
+++ b/chapter8/iproute2.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash

 set -e

 

@@ -9,3 +10,18 @@ sed -i 's/.m_ipt.o//' tc/Makefile &&
 make &&

 

 make DOCDIR=/usr/share/doc/iproute2-"${VERSION}" -j1 install

+=======
+#!/bin/bash
+set -e
+
+sed -i /ARPD/d Makefile &&
+rm -fv man/man8/arpd.8 &&
+
+sed -i 's/.m_ipt.o//' tc/Makefile &&
+
+make &&
+
+make -j1 install
+mkdir -v /usr/share/doc/iproute2-"${VERSION}"
+cp -v COPYING README* /usr/share/doc/iproute2-"${VERSION}"
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/chapter8/ncurses.sh b/chapter8/ncurses.sh
index c2640c5..9d3ebbc 100644
--- a/chapter8/ncurses.sh
+++ b/chapter8/ncurses.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash

 set -e

 

@@ -30,3 +31,35 @@ rm -fv /usr/lib/libncurses++w.a &&
 

 mkdir -v       /usr/share/doc/ncurses-"${VERSION}" &&

 cp -v -R doc/* /usr/share/doc/ncurses-"${VERSION}"

+=======
+#!/bin/bash
+set -e
+
+./configure --prefix=/usr \
+            --mandir=/usr/share/man \
+            --with-shared \
+            --without-debug \
+            --without-normal \
+            --enable-pc-files \
+            --enable-widec &&
+
+make &&
+make -j1 install &&
+
+mv -v /usr/lib/libncursesw.so.6* /lib &&
+ln -sfv ../../lib/"$(readlink /usr/lib/libncursesw.so)" /usr/lib/libncursesw.so &&
+for lib in ncurses form panel menu ; do
+    rm -vf                    /usr/lib/lib"${lib}".so &&
+    echo "INPUT(-l${lib}w)" > /usr/lib/lib"${lib}".so &&
+    ln -sfv "${lib}"w.pc        /usr/lib/pkgconfig/"${lib}".pc
+done
+
+rm -vf                     /usr/lib/libcursesw.so &&
+echo "INPUT(-lncursesw)" > /usr/lib/libcursesw.so &&
+ln -sfv libncurses.so      /usr/lib/libcurses.so &&
+
+rm -fv /usr/lib/libncurses++w.a &&
+
+mkdir -v       /usr/share/doc/ncurses-"${VERSION}" &&
+cp -v -R doc/* /usr/share/doc/ncurses-"${VERSION}"
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/chapter8/python.sh b/chapter8/python.sh
index 230d4f6..fd7b1a6 100644
--- a/chapter8/python.sh
+++ b/chapter8/python.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash

 set -e

 

@@ -20,3 +21,26 @@ tar --strip-components=1  \
     --no-same-permissions \

     -C /usr/share/doc/python-"${VERSION}"/html \

     -xvf ../python-"${VERSION}"-docs-html.tar.bz2

+=======
+#!/bin/bash
+set -e
+
+./configure --prefix=/usr \
+            --enable-shared \
+            --with-system-expat \
+            --with-system-ffi \
+            --with-ensurepip=yes \
+	    --enable-optimizations &&
+
+make &&
+
+make -j1 install &&
+
+install -v -dm755 /usr/share/doc/python-"${VERSION}"/html &&
+
+tar --strip-components=1  \
+    --no-same-owner       \
+    --no-same-permissions \
+    -C /usr/share/doc/python-"${VERSION}"/html \
+    -xvf ../python-"${VERSION}"-docs-html.tar.bz2
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/env.sh b/env.sh
index 1e91ff6..837942a 100644
--- a/env.sh
+++ b/env.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash

 

 # Begin book environment settings

@@ -55,3 +56,62 @@ export TESTERUID
 # Features of this build system won't like vt100/vt220 and some others.

 # Set to xterm

 TERM="xterm"

+=======
+#!/bin/bash
+
+# Begin book environment settings
+PS1='\u:\w\$ '
+set +h
+umask 022
+
+LFS="/mnt/lfs"
+LC_ALL="POSIX"
+LFS_TGT="$(uname -m)"-lfs-linux-gnu
+PATH=/usr/bin
+if [[ ! -L /bin ]]; then PATH="/bin:${PATH}"; fi
+PATH="${LFS}/tools/bin:${PATH}"
+CONFIG_SITE="${LFS}/usr/share/config.site"
+# End book environment settings
+
+# LFS Version being built
+LFS_VER="LFS_10_1"
+
+# Disk where LFS partition will exist / or exists
+LFS_DISK="/dev/sdb"
+
+# Partition number where LFS will exist / or exists
+LFS_PART="1"
+
+# Filesystem to use for LFS
+LFS_FS="EXT4"
+
+# Swap device to use for LFS
+LFS_SWAP="/dev/sda2"
+
+# LFS User password (not used at this time)
+LFS_PWD="lfs"
+
+# Get number of online processors
+NUMPROCS="$(getconf _NPROCESSORS_ONLN)"
+numjobs="$((NUMPROCS * 2 - 1))"
+# Make flags for multiple jobs
+MAKEFLAGS="-j${numjobs}"
+NINJAJOBS="${NUMPROCS}"
+
+unset numjobs
+
+# Set spinner type (0-12 in funtions.sh)
+SPINNER="0"
+
+
+TESTERUID="$(id -u)" \
+
+export PS1 LC_ALL LFS LFS_TGT PATH CONFIG_SITE
+export LFS_VER LFS_DISK LFS_FS LFS_PART LFS_PWD NUMPROCS MAKEFLAGS NINJAJOBS
+export SPINNER
+export TESTERUID
+
+# Features of this build system won't like vt100/vt220 and some others.
+# Set to xterm
+TERM="xterm"
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/packages.csv b/packages.csv
index 45a31a7..33c1fc9 100644
--- a/packages.csv
+++ b/packages.csv
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 acl,2.3.1,http://download.savannah.gnu.org/releases/acl/acl-@.tar.xz,95ce715fe09acca7c12d3306d0f076b2

 attr,2.5.1,http://download.savannah.gnu.org/releases/attr/attr-@.tar.gz,ac1c5a7a084f0f83b8cace34211f64d8

 autoconf,2.71,http://ftp.gnu.org/gnu/autoconf/autoconf-@.tar.xz,12cfa1687ffa2606337efe1a64416106

@@ -80,3 +81,87 @@ xml-parser,2.46,https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-@.tar
 xz,5.2.5,https://tukaani.org/xz/xz-@.tar.xz,aa1621ec7013a19abab52a8aff04fe5b

 zlib,1.2.11,https://zlib.net/zlib-@.tar.xz,85adef240c5f370b308da8c938951a68

 zstd,1.4.9,https://github.com/facebook/zstd/releases/download/v@/zstd-@.tar.gz,eb718b8aae0302cabe20f968e500534d

+=======
+acl,2.3.1,http://download.savannah.gnu.org/releases/acl/acl-@.tar.xz,95ce715fe09acca7c12d3306d0f076b2
+attr,2.5.1,http://download.savannah.gnu.org/releases/attr/attr-@.tar.gz,ac1c5a7a084f0f83b8cace34211f64d8
+autoconf,2.71,http://ftp.gnu.org/gnu/autoconf/autoconf-@.tar.xz,12cfa1687ffa2606337efe1a64416106
+automake,1.16.3,http://ftp.gnu.org/gnu/automake/automake-@.tar.xz,c27f608a4e1f302ec7ce42f1251c184e
+bash,5.1,http://ftp.gnu.org/gnu/bash/bash-@.tar.gz,bb91a17fd6c9032c26d0b2b78b50aff5
+bc,4.0.2,https://github.com/gavinhoward/bc/releases/download/@/bc-@.tar.xz,230d780f978f1bc3f725bfbaf63c2b43
+binutils,2.36.1,http://ftp.gnu.org/gnu/binutils/binutils-@.tar.xz,628d490d976d8957279bbbff06cf29d4
+bison,3.7.6,http://ftp.gnu.org/gnu/bison/bison-@.tar.xz,d61aa92e3562cb7292b004ce96173cf7
+bzip2,1.0.8,https://www.sourceware.org/pub/bzip2/bzip2-@.tar.gz,67e051268d0c475ea773822f7500d0e5
+check,0.15.2,https://github.com/libcheck/check/releases/download/@/check-@.tar.gz,50fcafcecde5a380415b12e9c574e0b2
+coreutils,8.32,http://ftp.gnu.org/gnu/coreutils/coreutils-@.tar.xz,022042695b7d5bcf1a93559a9735e668
+dejagnu,1.6.2,http://ftp.gnu.org/gnu/dejagnu/dejagnu-@.tar.gz,e1b07516533f351b3aba3423fafeffd6
+diffutils,3.7,http://ftp.gnu.org/gnu/diffutils/diffutils-@.tar.xz,4824adc0e95dbbf11dfbdfaad6a1e461
+e2fsprogs,1.46.2,https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v@/e2fsprogs-@.tar.gz,e8ef5fa3b72557be5e9fe564a25da6eb
+libelf,0.185,https://sourceware.org/ftp/elfutils/@/elfutils-@.tar.bz2,2b6e94c2eebc1f2194173e31bca9396e
+eudev,3.2.10,https://dev.gentoo.org/~blueness/eudev/eudev-@.tar.gz,60b135a189523f333cea5f71a3345c8d
+expat,2.4.1,https://prdownloads.sourceforge.net/expat/expat-@.tar.xz,a4fb91a9441bcaec576d4c4a56fa3aa6
+expect,5.45.4,https://prdownloads.sourceforge.net/expect/expect@.tar.gz,00fce8de158422f5ccd2666512329bd2
+file,5.40,http://ftp.astron.com/pub/file/file-@.tar.gz,72540ea1cc8c6e1dee35d6100ec66589
+findutils,4.8.0,http://ftp.gnu.org/gnu/findutils/findutils-@.tar.xz,eeefe2e6380931a77dfa6d9350b43186
+flex,2.6.4,https://github.com/westes/flex/releases/download/v@/flex-@.tar.gz,2882e3179748cc9f9c23ec593d6adc8d
+gawk,5.1.0,http://ftp.gnu.org/gnu/gawk/gawk-@.tar.xz,8470c34eeecc41c1aa0c5d89e630df50
+gcc,10.3.0,http://ftp.gnu.org/gnu/gcc/gcc-@/gcc-@.tar.xz,443c15b92614a3ce8f22e3b24ca2226a
+gdbm,1.19,http://ftp.gnu.org/gnu/gdbm/gdbm-@.tar.gz,aeb29c6a90350a4c959cd1df38cd0a7e
+gettext,0.21,http://ftp.gnu.org/gnu/gettext/gettext-@.tar.xz,40996bbaf7d1356d3c22e33a8b255b31
+glibc,2.33,http://ftp.gnu.org/gnu/glibc/glibc-@.tar.xz,390bbd889c7e8e8a7041564cb6b27cca
+gmp,6.2.1,http://ftp.gnu.org/gnu/gmp/gmp-@.tar.xz,0b82665c4a92fd2ade7440c13fcaa42b
+gperf,3.1,http://ftp.gnu.org/gnu/gperf/gperf-@.tar.gz,9e251c0a618ad0824b51117d5d9db87e
+grep,3.6,http://ftp.gnu.org/gnu/grep/grep-@.tar.xz,f47fe27049510b2249dba7f862ac1b51
+groff,1.22.4,http://ftp.gnu.org/gnu/groff/groff-@.tar.gz,08fb04335e2f5e73f23ea4c3adbf0c5f
+grub,2.04,https://ftp.gnu.org/gnu/grub/grub-@.tar.xz,5aaca6713b47ca2456d8324a58755ac7
+gzip,1.10,http://ftp.gnu.org/gnu/gzip/gzip-@.tar.xz,691b1221694c3394f1c537df4eee39d3
+iana-etc,20210526,https://github.com/Mic92/iana-etc/releases/download/@/iana-etc-@.tar.gz,8442d67cc5f5b3616d128e25779a93c7
+inetutils,2.0,http://ftp.gnu.org/gnu/inetutils/inetutils-@.tar.xz,5e1018502cd131ed8e42339f6b5c98aa
+intltool,0.51.0,https://launchpad.net/intltool/trunk/@/+download/intltool-@.tar.gz,12e517cac2b57a0121cda351570f1e63
+iproute2,5.10.0,https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-@.tar.xz,19ffea480a21e600453776b7225f3319
+isl,0.23,http://isl.gforge.inria.fr/isl-@.tar.xz,cc8155dfe8550e59299a2368dbaa7d04
+kbd,2.4.0,https://www.kernel.org/pub/linux/utils/kbd/kbd-@.tar.xz,3cac5be0096fcf7b32dcbd3c53831380
+kmod,29,https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-@.tar.xz,e81e63acd80697d001c8d85c1acb38a0
+less,581,http://www.greenwoodsoftware.com/less/less-@.tar.gz,6201df5b9dae2af9767fc220471471b3
+lfs-bootscripts,20210201,http://www.linuxfromscratch.org/lfs/downloads/10.1/lfs-bootscripts-@.tar.xz,1fc441ef96c522974f7267dec8b40a47
+libcap,2.50,https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-@.tar.xz,66a561afa81666236ff973544ff4e864
+libffi,3.3,https://sourceware.org/pub/libffi/libffi-@.tar.gz,6313289e32f1d38a9df4770b014a2ca7
+libpipeline,1.5.3,http://download.savannah.gnu.org/releases/libpipeline/libpipeline-@.tar.gz,dad443d0911cf9f0f1bd90a334bc9004
+libstdc++,10.3.0,http://ftp.gnu.org/gnu/gcc/gcc-@/gcc-@.tar.xz,443c15b92614a3ce8f22e3b24ca2226a
+libtool,2.4.6,http://ftp.gnu.org/gnu/libtool/libtool-@.tar.xz,1bfb9b923f2c1339b4d2ce1807064aa5
+linux,5.10.41,https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,9c8b424c036f2985442c25dfe3305dd1
+linux-api-headers,5.10.41,cdn://www.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,9c8b424c036f2985442c25dfe3305dd1
+m4,1.4.18,http://ftp.gnu.org/gnu/m4/m4-@.tar.xz,730bb15d96fffe47e148d1e09235af82
+make,4.3,http://ftp.gnu.org/gnu/make/make-@.tar.gz,fc7a67ea86ace13195b0bce683fd4469
+man-db,2.9.4,http://download.savannah.gnu.org/releases/man-db/man-db-@.tar.xz,6e233a555f7b9ae91ce7cd0faa322bce
+man-pages,5.10,https://www.kernel.org/pub/linux/docs/man-pages/man-pages-@.tar.xz,4ae3f74a1beddd919936e1058642644c
+meson,0.58.0,https://github.com/mesonbuild/meson/releases/download/@/meson-@.tar.gz,18ac55e3d6a5acb17b5737eb2a15bb5b
+mpc,1.2.1,https://ftp.gnu.org/gnu/mpc/mpc-@.tar.gz,9f16c976c25bb0f76b50be749cd7a3a8
+mpfr,4.1.0,http://www.mpfr.org/mpfr-@/mpfr-@.tar.xz,bdd3d5efba9c17da8d83a35ec552baef
+ncurses,6.2,http://ftp.gnu.org/gnu/ncurses/ncurses-@.tar.gz,e812da327b1c2214ac1aed440ea3ae8d
+ninja,1.10.2,https://github.com/ninja-build/ninja/archive/v@/ninja-@.tar.gz,639f75bc2e3b19ab893eaf2c810d4eb4
+openssl,1.1.1k,https://www.openssl.org/source/openssl-@.tar.gz,c4e7d95f782b08116afa27b30393dd27
+patch,2.7.6,http://ftp.gnu.org/gnu/patch/patch-@.tar.xz,78ad9937e4caadcba1526ef1853730d5
+perl,5.34.0,https://www.cpan.org/src/5.0/perl-@.tar.xz,df7ecb0653440b26dc951ad9dbfab517
+pkg-config,0.29.2,https://pkg-config.freedesktop.org/releases/pkg-config-@.tar.gz,f6e931e319531b736fadc017f470e68a
+procps-ng,3.3.17,https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-@.tar.xz,d60613e88c2f442ebd462b5a75313d56
+psmisc,23.4,https://sourceforge.net/projects/psmisc/files/psmisc/psmisc-@.tar.xz,8114cd4489b95308efe2509c3a406bbf
+python,3.9.5,https://www.python.org/ftp/python/@/Python-@.tar.xz,71f7ada6bec9cdbf4538adc326120cfd
+python-doc,3.9.5,https://www.python.org/ftp/python/doc/@/python-@-docs-html.tar.bz2,c594916b00cbb9796fa001dd2764ab0f
+readline,8.1,http://ftp.gnu.org/gnu/readline/readline-@.tar.gz,e9557dd5b1409f5d7b37ef717c64518e
+sed,4.8,http://ftp.gnu.org/gnu/sed/sed-@.tar.xz,6d906edfdb3202304059233f51f9a71d
+shadow,4.8.1,https://github.com/shadow-maint/shadow/releases/download/@/shadow-@.tar.xz,4b05eff8a427cf50e615bda324b5bc45
+sysklogd,1.5.1,http://www.infodrom.org/projects/sysklogd/download/sysklogd-@.tar.gz,c70599ab0d037fde724f7210c2c8d7f8
+sysvinit,2.99,http://download.savannah.gnu.org/releases/sysvinit/sysvinit-@.tar.xz,6abc0ea61b8dd4a41b4e931a43b1bb90
+tar,1.34,http://ftp.gnu.org/gnu/tar/tar-@.tar.xz,9a08d29a9ac4727130b5708347c0f5cf
+tcl,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-src.tar.gz,8a4c004f48984a03a7747e9ba06e4da4
+tcl-doc,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-html.tar.gz,e358a9140c3a171e42f18c8a7f6a36ea
+texinfo,6.7,http://ftp.gnu.org/gnu/texinfo/texinfo-@.tar.xz,d4c5d8cc84438c5993ec5163a59522a6
+time Zone Data,2021a,https://www.iana.org/time-zones/repository/releases/tzdata@.tar.gz,20eae7d1da671c6eac56339c8df85bbd
+udev-lfs Tarball,udev-lfs-20171102,http://anduin.linuxfromscratch.org/LFS/@.tar.xz,27cd82f9a61422e186b9d6759ddf1634
+util-linux,2.36.2,https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-@.tar.xz,f78419af679ac9678190ad961eb3cf27
+vim,8.2.2890,http://anduin.linuxfromscratch.org/LFS/vim-@.tar.gz,ec8a8ec5f67b0ad0edba82cad2354d33
+xml-parser,2.46,https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-@.tar.gz,80bb18a8e6240fcf7ec2f7b57601c170
+xz,5.2.5,https://tukaani.org/xz/xz-@.tar.xz,aa1621ec7013a19abab52a8aff04fe5b
+zlib,1.2.11,https://zlib.net/zlib-@.tar.xz,85adef240c5f370b308da8c938951a68
+zstd,1.5.0,https://github.com/facebook/zstd/releases/download/v@/zstd-@.tar.gz,a6eb7fb1f2c21fa80030a47993853e92
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/patches.csv b/patches.csv
index 2326450..82ad10d 100644
--- a/patches.csv
+++ b/patches.csv
@@ -1,6 +1,15 @@
+<<<<<<< HEAD
 bash,5.1,http://clfs.org/~kb0iic/patches/bash-@-fixes-1.patch,55340b67b1401007a816ea97951695d7

 bzip2,1.0.8,http://www.linuxfromscratch.org/patches/lfs/10.1/bzip2-@-install_docs-1.patch,6a5ac7e89b791aae556de0f745916f7f

 coreutils,8.32,http://www.linuxfromscratch.org/patches/lfs/10.1/coreutils-@-i18n-1.patch,cd8ebed2a67fff2e231026df91af6776

 glibc,2.33,http://www.linuxfromscratch.org/patches/lfs/10.1/glibc-@-fhs-1.patch,9a5997c3452909b1769918c759eff8a2

 kbd,2.4.0,http://www.linuxfromscratch.org/patches/lfs/10.1/kbd-@-backspace-1.patch,f75cca16a38da6caa7d52151f7136895

 sysvinit,2.99,http://www.linuxfromscratch.org/patches/lfs/development/sysvinit-@-consolidated-1.patch,4900322141d493e74020c9cf437b2cdc

+=======
+bash,5.1,http://clfs.org/~kb0iic/patches/bash-@-fixes-2.patch,5b1ebb60889d36a9718d154a0cf47385
+bzip2,1.0.8,http://www.linuxfromscratch.org/patches/lfs/10.1/bzip2-@-install_docs-1.patch,6a5ac7e89b791aae556de0f745916f7f
+coreutils,8.32,http://www.linuxfromscratch.org/patches/lfs/10.1/coreutils-@-i18n-1.patch,cd8ebed2a67fff2e231026df91af6776
+glibc,2.33,http://www.linuxfromscratch.org/patches/lfs/10.1/glibc-@-fhs-1.patch,9a5997c3452909b1769918c759eff8a2
+kbd,2.4.0,http://www.linuxfromscratch.org/patches/lfs/10.1/kbd-@-backspace-1.patch,f75cca16a38da6caa7d52151f7136895
+sysvinit,2.99,http://www.linuxfromscratch.org/patches/lfs/development/sysvinit-@-consolidated-1.patch,4900322141d493e74020c9cf437b2cdc
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28