Remove conflicts.HEADmaster

4 files changed, 0 insertions, 1610 deletions

diff --git a/blfs/KDE.Makefile b/blfs/KDE.Makefile
index 7b79bd5..dc2681c 100644
--- a/blfs/KDE.Makefile
+++ b/blfs/KDE.Makefile
@@ -416,630 +416,3 @@ 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 $@
diff --git a/blfs/Makefile b/blfs/Makefile
index d00e9c7..bb7b8b1 100644
--- a/blfs/Makefile
+++ b/blfs/Makefile
@@ -533,525 +533,3 @@ 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
diff --git a/blfs/QT5.Makefile b/blfs/QT5.Makefile
index 46e20bd..906b358 100644
--- a/blfs/QT5.Makefile
+++ b/blfs/QT5.Makefile
@@ -282,281 +282,3 @@ 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 $@
diff --git a/blfs/Xorg.Makefile b/blfs/Xorg.Makefile
index a773d09..96701bf 100644
--- a/blfs/Xorg.Makefile
+++ b/blfs/Xorg.Makefile
@@ -188,186 +188,3 @@ 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 $@