From 5050160e33eed556090b02aa05a8bc0757b5e3aa Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Fri, 22 Sep 2023 22:46:44 +1100
Subject: [PATCH] pass to new format

---
 .gitignore                                    |  10 +-
 .gitlab-ci.yml                                | 115 +++++++---
 .gitmodules                                   |   5 +
 diff/patch/PKG.patch                          |  11 +
 pacman.conf.builder                           |  41 +---
 qt5-base                                      |   1 +
 trunk/PKGBUILD                                | 204 ------------------
 trunk/qt5-base-cflags.patch                   |  46 ----
 trunk/qt5-base-nostrip.patch                  |  13 --
 trunk/work-around-pyside2-brokenness.patch    | 138 ------------
 version/5.13.0-8/PKGBUILD                     | 157 --------------
 version/5.13.0-8/qt5-base-stutter.patch       |  54 -----
 version/5.13.0-8/virtualbox-focus.patch       |  13 --
 version/5.13.1-3/PKGBUILD                     | 170 ---------------
 version/5.13.1-3/qtbug-77364.patch            |  12 --
 version/5.13.2-2/PKGBUILD                     | 167 --------------
 version/5.13.2-3/PKGBUILD                     | 167 --------------
 version/5.14.0-2/PKGBUILD                     | 169 ---------------
 version/5.14.1-2/PKGBUILD                     | 169 ---------------
 version/5.14.1-3/PKGBUILD                     | 169 ---------------
 version/5.14.1-4/PKGBUILD                     | 166 --------------
 version/5.14.1-4/qt5-base-cflags.patch        |  27 ---
 version/5.14.2-2/PKGBUILD                     | 166 --------------
 version/5.14.2-2/qt5-base-cflags.patch        |  46 ----
 version/5.14.2-3/PKGBUILD                     | 166 --------------
 version/5.14.2-3/qt5-base-cflags.patch        |  46 ----
 version/5.14.2-4/PKGBUILD                     | 168 ---------------
 version/5.14.2-4/qt5-base-cflags.patch        |  46 ----
 version/5.15.0-3/PKGBUILD                     | 168 ---------------
 version/5.15.0-3/qt5-base-cflags.patch        |  46 ----
 version/5.15.0-3/qtbug-74252.patch            | 106 ---------
 version/5.15.0-6/PKGBUILD                     | 173 ---------------
 version/5.15.0-6/qt5-base-cflags.patch        |  46 ----
 version/5.15.0-6/qtbug-74252.patch            | 106 ---------
 version/5.15.1-2/PKGBUILD                     | 164 --------------
 version/5.15.1-2/qt5-base-cflags.patch        |  46 ----
 version/5.15.10+kde+r129-2/PKGBUILD           | 198 -----------------
 .../5.15.10+kde+r129-2/qt5-base-cflags.patch  |  46 ----
 .../5.15.10+kde+r129-2/qt5-base-nostrip.patch |  13 --
 version/5.15.10+kde+r129-4/PKGBUILD           | 199 -----------------
 .../5.15.10+kde+r129-4/qt5-base-cflags.patch  |  46 ----
 .../5.15.10+kde+r129-4/qt5-base-nostrip.patch |  13 --
 version/5.15.10+kde+r129-5/PKGBUILD           | 199 -----------------
 .../5.15.10+kde+r129-5/qt5-base-cflags.patch  |  46 ----
 .../5.15.10+kde+r129-5/qt5-base-nostrip.patch |  13 --
 version/5.15.10+kde+r130-2/PKGBUILD           | 199 -----------------
 .../5.15.10+kde+r130-2/qt5-base-cflags.patch  |  46 ----
 .../5.15.10+kde+r130-2/qt5-base-nostrip.patch |  13 --
 version/5.15.10+kde+r135-2/PKGBUILD           | 199 -----------------
 .../5.15.10+kde+r135-2/qt5-base-cflags.patch  |  46 ----
 .../5.15.10+kde+r135-2/qt5-base-nostrip.patch |  13 --
 version/5.15.10+kde+r139-2/PKGBUILD           | 199 -----------------
 .../5.15.10+kde+r139-2/qt5-base-cflags.patch  |  46 ----
 .../5.15.10+kde+r139-2/qt5-base-nostrip.patch |  13 --
 version/5.15.10+kde+r145-2/PKGBUILD           | 199 -----------------
 .../5.15.10+kde+r145-2/qt5-base-cflags.patch  |  46 ----
 .../5.15.10+kde+r145-2/qt5-base-nostrip.patch |  13 --
 version/5.15.10+kde+r147-2/PKGBUILD           | 199 -----------------
 .../5.15.10+kde+r147-2/qt5-base-cflags.patch  |  46 ----
 .../5.15.10+kde+r147-2/qt5-base-nostrip.patch |  13 --
 version/5.15.10+kde+r152-2/PKGBUILD           | 204 ------------------
 .../5.15.10+kde+r152-2/qt5-base-cflags.patch  |  46 ----
 .../5.15.10+kde+r152-2/qt5-base-nostrip.patch |  13 --
 .../work-around-pyside2-brokenness.patch      | 138 ------------
 version/5.15.10+kde+r155-2/PKGBUILD           | 204 ------------------
 .../5.15.10+kde+r155-2/qt5-base-cflags.patch  |  46 ----
 .../5.15.10+kde+r155-2/qt5-base-nostrip.patch |  13 --
 .../work-around-pyside2-brokenness.patch      | 138 ------------
 version/5.15.10+kde+r158-2/PKGBUILD           | 204 ------------------
 .../5.15.10+kde+r158-2/qt5-base-cflags.patch  |  46 ----
 .../5.15.10+kde+r158-2/qt5-base-nostrip.patch |  13 --
 .../work-around-pyside2-brokenness.patch      | 138 ------------
 version/5.15.2+kde+r210-2/PKGBUILD            | 179 ---------------
 .../5.15.2+kde+r210-2/qt5-base-cflags.patch   |  46 ----
 .../qt5-base-mariadb-10.6.patch               |  23 --
 .../5.15.2+kde+r210-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r234-2/PKGBUILD            | 182 ----------------
 .../5.15.2+kde+r234-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r234-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r243-2/PKGBUILD            | 179 ---------------
 .../5.15.2+kde+r243-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r243-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r260-2/PKGBUILD            | 178 ---------------
 .../5.15.2+kde+r260-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r260-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r260-3/PKGBUILD            | 178 ---------------
 .../5.15.2+kde+r260-3/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r260-3/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r268-2/PKGBUILD            | 184 ----------------
 .../5.15.2+kde+r268-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r268-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r274-3/PKGBUILD            | 190 ----------------
 .../5.15.2+kde+r274-3/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r274-3/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r277-2/PKGBUILD            | 190 ----------------
 .../5.15.2+kde+r277-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r277-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r289-2/PKGBUILD            | 190 ----------------
 .../5.15.2+kde+r289-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r289-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r294-2/PKGBUILD            | 190 ----------------
 .../5.15.2+kde+r294-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r294-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r296-3/PKGBUILD            | 191 ----------------
 .../5.15.2+kde+r296-3/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r296-3/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r297-2/PKGBUILD            | 192 -----------------
 .../5.15.2+kde+r297-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r297-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.2+kde+r301-2/PKGBUILD            | 191 ----------------
 .../5.15.2+kde+r301-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.2+kde+r301-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.2-2/PKGBUILD                     | 164 --------------
 version/5.15.2-2/qt5-base-cflags.patch        |  46 ----
 version/5.15.2-3/PKGBUILD                     | 164 --------------
 version/5.15.2-3/qt5-base-cflags.patch        |  46 ----
 version/5.15.2-6/PKGBUILD                     | 169 ---------------
 version/5.15.2-6/qt5-base-cflags.patch        |  46 ----
 version/5.15.2-6/qt5-base-nostrip.patch       |  13 --
 version/5.15.2-7/PKGBUILD                     | 172 ---------------
 version/5.15.2-7/qt5-base-cflags.patch        |  46 ----
 version/5.15.2-7/qt5-base-nostrip.patch       |  13 --
 version/5.15.3+kde+r132-2/PKGBUILD            | 192 -----------------
 .../5.15.3+kde+r132-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.3+kde+r132-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.3+kde+r137-2/PKGBUILD            | 192 -----------------
 .../5.15.3+kde+r137-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.3+kde+r137-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.3+kde+r137-3/PKGBUILD            | 192 -----------------
 .../5.15.3+kde+r137-3/qt5-base-cflags.patch   |  46 ----
 .../5.15.3+kde+r137-3/qt5-base-nostrip.patch  |  13 --
 version/5.15.3+kde+r145-2/PKGBUILD            | 192 -----------------
 .../5.15.3+kde+r145-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.3+kde+r145-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.4+kde+r135-2/PKGBUILD            | 192 -----------------
 .../5.15.4+kde+r135-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.4+kde+r135-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.4+kde+r139-2/PKGBUILD            | 192 -----------------
 .../5.15.4+kde+r139-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.4+kde+r139-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.4+kde+r144-2/PKGBUILD            | 199 -----------------
 .../5.15.4+kde+r144-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.4+kde+r144-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.4+kde+r146-2/PKGBUILD            | 199 -----------------
 .../5.15.4+kde+r146-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.4+kde+r146-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.4+kde+r146-3/PKGBUILD            | 199 -----------------
 .../5.15.4+kde+r146-3/qt5-base-cflags.patch   |  46 ----
 .../5.15.4+kde+r146-3/qt5-base-nostrip.patch  |  13 --
 version/5.15.5+kde+r161-2/PKGBUILD            | 199 -----------------
 .../5.15.5+kde+r161-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.5+kde+r161-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.5+kde+r163-2/PKGBUILD            | 199 -----------------
 .../5.15.5+kde+r163-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.5+kde+r163-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.5+kde+r170-2/PKGBUILD            | 199 -----------------
 .../5.15.5+kde+r170-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.5+kde+r170-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.5+kde+r174-2/PKGBUILD            | 199 -----------------
 .../5.15.5+kde+r174-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.5+kde+r174-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.5+kde+r180-2/PKGBUILD            | 199 -----------------
 .../5.15.5+kde+r180-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.5+kde+r180-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.5+kde+r184-2/PKGBUILD            | 199 -----------------
 .../5.15.5+kde+r184-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.5+kde+r184-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.6+kde+r163-2/PKGBUILD            | 199 -----------------
 .../5.15.6+kde+r163-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.6+kde+r163-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.6+kde+r177-2/PKGBUILD            | 198 -----------------
 .../5.15.6+kde+r177-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.6+kde+r177-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.6+kde+r180-2/PKGBUILD            | 198 -----------------
 .../5.15.6+kde+r180-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.6+kde+r180-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.6+kde+r181-2/PKGBUILD            | 198 -----------------
 .../5.15.6+kde+r181-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.6+kde+r181-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.7+kde+r167-2/PKGBUILD            | 198 -----------------
 .../5.15.7+kde+r167-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.7+kde+r167-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.7+kde+r168-2/PKGBUILD            | 198 -----------------
 .../5.15.7+kde+r168-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.7+kde+r168-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.7+kde+r174-2/PKGBUILD            | 198 -----------------
 .../5.15.7+kde+r174-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.7+kde+r174-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.7+kde+r177-2/PKGBUILD            | 198 -----------------
 .../5.15.7+kde+r177-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.7+kde+r177-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.8+kde+r157-2/PKGBUILD            | 198 -----------------
 .../5.15.8+kde+r157-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.8+kde+r157-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.8+kde+r162-2/PKGBUILD            | 198 -----------------
 .../5.15.8+kde+r162-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.8+kde+r162-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.8+kde+r174-2/PKGBUILD            | 198 -----------------
 .../5.15.8+kde+r174-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.8+kde+r174-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.8+kde+r181-2/PKGBUILD            | 198 -----------------
 .../5.15.8+kde+r181-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.8+kde+r181-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.8+kde+r183-2/PKGBUILD            | 198 -----------------
 .../5.15.8+kde+r183-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.8+kde+r183-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.8+kde+r185-2/PKGBUILD            | 198 -----------------
 .../5.15.8+kde+r185-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.8+kde+r185-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.9+kde+r151-2/PKGBUILD            | 198 -----------------
 .../5.15.9+kde+r151-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.9+kde+r151-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.9+kde+r152-2/PKGBUILD            | 198 -----------------
 .../5.15.9+kde+r152-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.9+kde+r152-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.9+kde+r153-2/PKGBUILD            | 198 -----------------
 .../5.15.9+kde+r153-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.9+kde+r153-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.9+kde+r154-2/PKGBUILD            | 198 -----------------
 .../5.15.9+kde+r154-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.9+kde+r154-2/qt5-base-nostrip.patch  |  13 --
 version/5.15.9+kde+r155-2/PKGBUILD            | 198 -----------------
 .../5.15.9+kde+r155-2/qt5-base-cflags.patch   |  46 ----
 .../5.15.9+kde+r155-2/qt5-base-nostrip.patch  |  13 --
 224 files changed, 116 insertions(+), 19462 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 diff/patch/PKG.patch
 create mode 160000 qt5-base
 delete mode 100644 trunk/PKGBUILD
 delete mode 100644 trunk/qt5-base-cflags.patch
 delete mode 100644 trunk/qt5-base-nostrip.patch
 delete mode 100644 trunk/work-around-pyside2-brokenness.patch
 delete mode 100644 version/5.13.0-8/PKGBUILD
 delete mode 100644 version/5.13.0-8/qt5-base-stutter.patch
 delete mode 100644 version/5.13.0-8/virtualbox-focus.patch
 delete mode 100644 version/5.13.1-3/PKGBUILD
 delete mode 100644 version/5.13.1-3/qtbug-77364.patch
 delete mode 100644 version/5.13.2-2/PKGBUILD
 delete mode 100644 version/5.13.2-3/PKGBUILD
 delete mode 100644 version/5.14.0-2/PKGBUILD
 delete mode 100644 version/5.14.1-2/PKGBUILD
 delete mode 100644 version/5.14.1-3/PKGBUILD
 delete mode 100644 version/5.14.1-4/PKGBUILD
 delete mode 100644 version/5.14.1-4/qt5-base-cflags.patch
 delete mode 100644 version/5.14.2-2/PKGBUILD
 delete mode 100644 version/5.14.2-2/qt5-base-cflags.patch
 delete mode 100644 version/5.14.2-3/PKGBUILD
 delete mode 100644 version/5.14.2-3/qt5-base-cflags.patch
 delete mode 100644 version/5.14.2-4/PKGBUILD
 delete mode 100644 version/5.14.2-4/qt5-base-cflags.patch
 delete mode 100644 version/5.15.0-3/PKGBUILD
 delete mode 100644 version/5.15.0-3/qt5-base-cflags.patch
 delete mode 100644 version/5.15.0-3/qtbug-74252.patch
 delete mode 100644 version/5.15.0-6/PKGBUILD
 delete mode 100644 version/5.15.0-6/qt5-base-cflags.patch
 delete mode 100644 version/5.15.0-6/qtbug-74252.patch
 delete mode 100644 version/5.15.1-2/PKGBUILD
 delete mode 100644 version/5.15.1-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r129-2/PKGBUILD
 delete mode 100644 version/5.15.10+kde+r129-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r129-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.10+kde+r129-4/PKGBUILD
 delete mode 100644 version/5.15.10+kde+r129-4/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r129-4/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.10+kde+r129-5/PKGBUILD
 delete mode 100644 version/5.15.10+kde+r129-5/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r129-5/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.10+kde+r130-2/PKGBUILD
 delete mode 100644 version/5.15.10+kde+r130-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r130-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.10+kde+r135-2/PKGBUILD
 delete mode 100644 version/5.15.10+kde+r135-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r135-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.10+kde+r139-2/PKGBUILD
 delete mode 100644 version/5.15.10+kde+r139-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r139-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.10+kde+r145-2/PKGBUILD
 delete mode 100644 version/5.15.10+kde+r145-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r145-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.10+kde+r147-2/PKGBUILD
 delete mode 100644 version/5.15.10+kde+r147-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r147-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.10+kde+r152-2/PKGBUILD
 delete mode 100644 version/5.15.10+kde+r152-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r152-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.10+kde+r152-2/work-around-pyside2-brokenness.patch
 delete mode 100644 version/5.15.10+kde+r155-2/PKGBUILD
 delete mode 100644 version/5.15.10+kde+r155-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r155-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.10+kde+r155-2/work-around-pyside2-brokenness.patch
 delete mode 100644 version/5.15.10+kde+r158-2/PKGBUILD
 delete mode 100644 version/5.15.10+kde+r158-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.10+kde+r158-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.10+kde+r158-2/work-around-pyside2-brokenness.patch
 delete mode 100644 version/5.15.2+kde+r210-2/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r210-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r210-2/qt5-base-mariadb-10.6.patch
 delete mode 100644 version/5.15.2+kde+r210-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r234-2/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r234-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r234-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r243-2/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r243-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r243-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r260-2/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r260-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r260-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r260-3/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r260-3/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r260-3/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r268-2/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r268-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r268-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r274-3/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r274-3/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r274-3/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r277-2/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r277-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r277-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r289-2/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r289-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r289-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r294-2/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r294-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r294-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r296-3/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r296-3/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r296-3/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r297-2/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r297-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r297-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2+kde+r301-2/PKGBUILD
 delete mode 100644 version/5.15.2+kde+r301-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2+kde+r301-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2-2/PKGBUILD
 delete mode 100644 version/5.15.2-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2-3/PKGBUILD
 delete mode 100644 version/5.15.2-3/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2-6/PKGBUILD
 delete mode 100644 version/5.15.2-6/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2-6/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.2-7/PKGBUILD
 delete mode 100644 version/5.15.2-7/qt5-base-cflags.patch
 delete mode 100644 version/5.15.2-7/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.3+kde+r132-2/PKGBUILD
 delete mode 100644 version/5.15.3+kde+r132-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.3+kde+r132-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.3+kde+r137-2/PKGBUILD
 delete mode 100644 version/5.15.3+kde+r137-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.3+kde+r137-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.3+kde+r137-3/PKGBUILD
 delete mode 100644 version/5.15.3+kde+r137-3/qt5-base-cflags.patch
 delete mode 100644 version/5.15.3+kde+r137-3/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.3+kde+r145-2/PKGBUILD
 delete mode 100644 version/5.15.3+kde+r145-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.3+kde+r145-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.4+kde+r135-2/PKGBUILD
 delete mode 100644 version/5.15.4+kde+r135-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.4+kde+r135-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.4+kde+r139-2/PKGBUILD
 delete mode 100644 version/5.15.4+kde+r139-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.4+kde+r139-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.4+kde+r144-2/PKGBUILD
 delete mode 100644 version/5.15.4+kde+r144-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.4+kde+r144-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.4+kde+r146-2/PKGBUILD
 delete mode 100644 version/5.15.4+kde+r146-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.4+kde+r146-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.4+kde+r146-3/PKGBUILD
 delete mode 100644 version/5.15.4+kde+r146-3/qt5-base-cflags.patch
 delete mode 100644 version/5.15.4+kde+r146-3/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.5+kde+r161-2/PKGBUILD
 delete mode 100644 version/5.15.5+kde+r161-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.5+kde+r161-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.5+kde+r163-2/PKGBUILD
 delete mode 100644 version/5.15.5+kde+r163-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.5+kde+r163-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.5+kde+r170-2/PKGBUILD
 delete mode 100644 version/5.15.5+kde+r170-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.5+kde+r170-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.5+kde+r174-2/PKGBUILD
 delete mode 100644 version/5.15.5+kde+r174-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.5+kde+r174-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.5+kde+r180-2/PKGBUILD
 delete mode 100644 version/5.15.5+kde+r180-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.5+kde+r180-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.5+kde+r184-2/PKGBUILD
 delete mode 100644 version/5.15.5+kde+r184-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.5+kde+r184-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.6+kde+r163-2/PKGBUILD
 delete mode 100644 version/5.15.6+kde+r163-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.6+kde+r163-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.6+kde+r177-2/PKGBUILD
 delete mode 100644 version/5.15.6+kde+r177-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.6+kde+r177-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.6+kde+r180-2/PKGBUILD
 delete mode 100644 version/5.15.6+kde+r180-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.6+kde+r180-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.6+kde+r181-2/PKGBUILD
 delete mode 100644 version/5.15.6+kde+r181-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.6+kde+r181-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.7+kde+r167-2/PKGBUILD
 delete mode 100644 version/5.15.7+kde+r167-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.7+kde+r167-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.7+kde+r168-2/PKGBUILD
 delete mode 100644 version/5.15.7+kde+r168-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.7+kde+r168-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.7+kde+r174-2/PKGBUILD
 delete mode 100644 version/5.15.7+kde+r174-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.7+kde+r174-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.7+kde+r177-2/PKGBUILD
 delete mode 100644 version/5.15.7+kde+r177-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.7+kde+r177-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.8+kde+r157-2/PKGBUILD
 delete mode 100644 version/5.15.8+kde+r157-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.8+kde+r157-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.8+kde+r162-2/PKGBUILD
 delete mode 100644 version/5.15.8+kde+r162-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.8+kde+r162-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.8+kde+r174-2/PKGBUILD
 delete mode 100644 version/5.15.8+kde+r174-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.8+kde+r174-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.8+kde+r181-2/PKGBUILD
 delete mode 100644 version/5.15.8+kde+r181-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.8+kde+r181-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.8+kde+r183-2/PKGBUILD
 delete mode 100644 version/5.15.8+kde+r183-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.8+kde+r183-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.8+kde+r185-2/PKGBUILD
 delete mode 100644 version/5.15.8+kde+r185-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.8+kde+r185-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.9+kde+r151-2/PKGBUILD
 delete mode 100644 version/5.15.9+kde+r151-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.9+kde+r151-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.9+kde+r152-2/PKGBUILD
 delete mode 100644 version/5.15.9+kde+r152-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.9+kde+r152-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.9+kde+r153-2/PKGBUILD
 delete mode 100644 version/5.15.9+kde+r153-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.9+kde+r153-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.9+kde+r154-2/PKGBUILD
 delete mode 100644 version/5.15.9+kde+r154-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.9+kde+r154-2/qt5-base-nostrip.patch
 delete mode 100644 version/5.15.9+kde+r155-2/PKGBUILD
 delete mode 100644 version/5.15.9+kde+r155-2/qt5-base-cflags.patch
 delete mode 100644 version/5.15.9+kde+r155-2/qt5-base-nostrip.patch

diff --git a/.gitignore b/.gitignore
index 51b3c7a..3fd539a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
-trunk/qt5-base/
-trunk/pkg/
-trunk/src/
-trunk/*.pkg.tar.xz
-trunk/*.pkg.tar.xz.sig
-version/*/bin/
+a
+b
+patch-prepare.sh
+patch-make.sh
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d04b653..26b9a6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,42 +1,99 @@
+.job_variables: &job_variables
+  variables:
+    GIT_SUBMODULE_STRATEGY: none
+    GIT_DEPTH: 0
+    PKG_TOKEN: ${PKG_TOKEN}
+
+.job_rules_push: &job_rules_push
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG == null'
+
+.job_rules_schedule: &job_rules_schedule
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+
+.job_rules_web: &job_rules_web
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "web"'
+
+.job_rules_pipeline: &job_rules_pipeline
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "pipeline"'
+
+.copy_files: &copy_files
+    before_script:
+      - mkdir -p /etc/pkg
+      - cp ./pkg.cfg /etc/pkg/pkg.cfg
+      - cp ./pacman.conf.builder /etc/pacman.conf.builder
+
 stages:
-    - build
-    - commit
-    - deploy
+  - update
+  - build
+  - rebuild
+  - deploy
 
-package:
-  stage: build
+update:
+  stage: update
+  <<: *job_variables
+  <<: *job_rules_schedule
+  <<: *job_rules_web
+  <<: *copy_files
   script:
-    - mkdir -p /etc/pkg
-    - cp ./pkg.cfg /etc/pkg/pkg.cfg
-    - cp ./pacman.conf.builder /etc/pacman.conf.builder
-    - pkg-prepare.sh
-    - pkg-build.sh --chdir=trunk $CI_PROJECT_DIR
+    - apkg-update.sh
 
+build:
+  stage: build
+  <<: *job_variables
+  <<: *job_rules_push
+  <<: *copy_files
+  script:
+    - apkg-prepare.sh
+    - apkg-build.sh
+    - apkg-tag.sh
   artifacts:
-    name: $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
+    name: $CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
     paths:
-     - "*.pkg.tar.xz"
+      - "*.pkg.tar.xz"
+      - build.env
 
-  only:
-    changes:
-      - trunk/PKGBUILD
-
-commit:
-  stage: commit
-  only:
-    changes:
-      - trunk/PKGBUILD
+rebuild:from:
+  stage: rebuild
+  <<: *job_variables
+  <<: *job_rules_pipeline
+  <<: *copy_files
+  script:
+    - apkg-rebuild.sh
+  artifacts:
+    name: $CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
+    paths:
+      - "*.pkg.tar.xz"
 
+rebuild:dynamic:
+  stage: rebuild
+  <<: *job_rules_push
+  <<: *copy_files
+  needs: ["build"]
   script:
-    - pkg-commit.sh
+    - apkg-generate.sh > dynamic-config.yml
+  artifacts:
+    paths:
+      - dynamic-config.yml
+
+rebuild:packages:
+  stage: rebuild
+  <<: *job_variables
+  <<: *job_rules_push
+  needs: ["rebuild:dynamic","build"]
+  trigger:
+    include:
+      - artifact: dynamic-config.yml
+        job: rebuild:dynamic
+    strategy: depend
 
 deploy:
+  <<: *job_variables
+  <<: *job_rules_push
   stage: deploy
-  dependencies:
-    - package
+  needs: ["build","rebuild:packages"]
   script:
-    - pkg-deploy.sh
-
-  only:
-    changes:
-      - trunk/PKGBUILD
+    - apkg-deploy.sh
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..aba283c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,5 @@
+[submodule "qt5-base"]
+	path = qt5-base
+	url = https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-base
+	branch = main
+    update = merge
diff --git a/diff/patch/PKG.patch b/diff/patch/PKG.patch
new file mode 100644
index 0000000..4d8131f
--- /dev/null
+++ b/diff/patch/PKG.patch
@@ -0,0 +1,11 @@
+diff -uar a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD
++++ b/PKGBUILD
+@@ -67,7 +67,6 @@
+     -no-rpath \
+     -dbus-linked \
+     -system-harfbuzz \
+-    -journald \
+     -libproxy \
+     -no-mimetype-database \
+     -no-use-gold-linker \
diff --git a/pacman.conf.builder b/pacman.conf.builder
index f11eac8..602711c 100644
--- a/pacman.conf.builder
+++ b/pacman.conf.builder
@@ -5,11 +5,9 @@
 [options]
 HoldPkg     = pacman glibc
 Architecture = auto
-IgnorePkg   = systemd
-IgnorePkg   = systemd-libs
-NoExtract   = usr/lib/libsystemd*.*
+IgnorePkg   = systemd systemd-libs
+NoExtract   = usr/lib/libsystemd*.* usr/lib/systemd* etc/systemd*
 Color
-CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
 #XferCommand =
@@ -33,22 +31,6 @@ Server = https://cloud.server.obarun.org/$repo/os/$arch/
 SigLevel = Required
 Server = https://cloud.server.obarun.org/$repo/os/$arch/
 
-#[obcommunity-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obcommunity]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[obmultilib-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obmultilib]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
 #[observice-testing]
 #SigLevel = Required
 #Server = https://cloud.server.obarun.org/$repo/os/$arch/
@@ -57,23 +39,18 @@ Server = https://cloud.server.obarun.org/$repo/os/$arch/
 SigLevel = Required
 Server = https://cloud.server.obarun.org/$repo/os/$arch/
 
-#[testing]
+#[core-testing]
+#SigLevel = DatabaseOptional
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
+SigLevel = DatabaseOptional
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
+#[extra-testing]
+#SigLevel = DatabaseOptional
 #Include = /etc/pacman.d/mirrorlist
 
-[community]
+[extra]
+SigLevel = DatabaseOptional
 Include = /etc/pacman.d/mirrorlist
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist
diff --git a/qt5-base b/qt5-base
new file mode 160000
index 0000000..7f93a93
--- /dev/null
+++ b/qt5-base
@@ -0,0 +1 @@
+Subproject commit 7f93a93d322d66fa8dedf51625427ae2ac1d2d3f
diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
deleted file mode 100644
index 6c769f9..0000000
--- a/trunk/PKGBUILD
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r158
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="74917690e8cded41b087acfe6c58fcd3674864a4"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    work-around-pyside2-brokenness.patch
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../work-around-pyside2-brokenness.patch 
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -libproxy
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha256sums=('SKIP'
-            'fbc72a7b90f104c50020879884636614e169669fc66a1705b3df6dd28ad8e5bb'
-            '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
-            '957ff2f27b64a1358f8de1273d2e2691ce9edf2ab7acef35ad8dbdd66d2a1d58')
diff --git a/trunk/qt5-base-cflags.patch b/trunk/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/trunk/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/trunk/qt5-base-nostrip.patch b/trunk/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/trunk/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/trunk/work-around-pyside2-brokenness.patch b/trunk/work-around-pyside2-brokenness.patch
deleted file mode 100644
index ee959bb..0000000
--- a/trunk/work-around-pyside2-brokenness.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-# Patch from OpenMandriva:
-# https://github.com/OpenMandrivaAssociation/qt5-qtbase/commit/20f97a4b#diff-c548550538903adec7a57251150fb23c61089ec82748fae900869f550aefc8f6R161
-
-diff -up qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h.5~ qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h
---- qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h.5~	2023-03-23 20:06:47.000000000 +0100
-+++ qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h	2023-04-15 23:23:40.599956996 +0200
-@@ -104,15 +104,15 @@ protected:
- class Q_GUI_EXPORT QMouseEvent : public QInputEvent
- {
- public:
--    QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton button,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, Qt::MouseButton button,
-                 Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source);
-     ~QMouseEvent();
-@@ -154,7 +154,7 @@ protected:
- class Q_GUI_EXPORT QHoverEvent : public QInputEvent
- {
- public:
--    QHoverEvent(Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-+    QHoverEvent(QEvent::Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-     ~QHoverEvent();
- 
- #ifndef QT_NO_INTEGER_EVENT_COORDINATES
-@@ -282,12 +282,12 @@ public:
- #if QT_DEPRECATED_SINCE(5, 15)
-     // Actually deprecated since 5.4, in docs
-     QT_DEPRECATED_VERSION_X_5_15("Use the other QTabletEvent constructor")
--    QTabletEvent(Type t, const QPointF &pos, const QPointF &globalPos,
-+    QTabletEvent(QEvent::Type t, const QPointF &pos, const QPointF &globalPos,
-                  int device, int pointerType, qreal pressure, int xTilt, int yTilt,
-                  qreal tangentialPressure, qreal rotation, int z,
-                  Qt::KeyboardModifiers keyState, qint64 uniqueID); // ### remove in Qt 6
- #endif
--    QTabletEvent(Type t, const QPointF &pos, const QPointF &globalPos,
-+    QTabletEvent(QEvent::Type t, const QPointF &pos, const QPointF &globalPos,
-                  int device, int pointerType, qreal pressure, int xTilt, int yTilt,
-                  qreal tangentialPressure, qreal rotation, int z,
-                  Qt::KeyboardModifiers keyState, qint64 uniqueID,
-@@ -377,9 +377,9 @@ protected:
- class Q_GUI_EXPORT QKeyEvent : public QInputEvent
- {
- public:
--    QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(),
-+    QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(),
-               bool autorep = false, ushort count = 1);
--    QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers,
-+    QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
-               quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers,
-               const QString &text = QString(), bool autorep = false, ushort count = 1);
-     ~QKeyEvent();
-@@ -399,7 +399,7 @@ public:
- 
-     // Functions for the extended key event information
- #if QT_DEPRECATED_SINCE(5, 0)
--    static inline QKeyEvent *createExtendedKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers,
-+    static inline QKeyEvent *createExtendedKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
-                                              quint32 nativeScanCode, quint32 nativeVirtualKey,
-                                              quint32 nativeModifiers,
-                                              const QString& text = QString(), bool autorep = false,
-@@ -682,7 +682,7 @@ class Q_GUI_EXPORT QDragMoveEvent : publ
- {
- public:
-     QDragMoveEvent(const QPoint &pos, Qt::DropActions actions, const QMimeData *data,
--                   Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = DragMove);
-+                   Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, QEvent::Type type = QEvent::DragMove);
-     ~QDragMoveEvent();
- 
-     inline QRect answerRect() const { return rect; }
-diff -up qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h.5~ qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h
---- qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h.5~	2023-03-23 20:06:47.000000000 +0100
-+++ qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h	2023-04-15 23:22:38.038387091 +0200
-@@ -82,7 +82,7 @@ class QGraphicsSceneMouseEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneMouseEvent(Type type = None);
-+    explicit QGraphicsSceneMouseEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneMouseEvent();
- 
-     QPointF pos() const;
-@@ -136,7 +136,7 @@ class QGraphicsSceneWheelEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneWheelEvent(Type type = None);
-+    explicit QGraphicsSceneWheelEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneWheelEvent();
- 
-     QPointF pos() const;
-@@ -171,7 +171,7 @@ class Q_WIDGETS_EXPORT QGraphicsSceneCon
- public:
-     enum Reason { Mouse, Keyboard, Other };
- 
--    explicit QGraphicsSceneContextMenuEvent(Type type = None);
-+    explicit QGraphicsSceneContextMenuEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneContextMenuEvent();
- 
-     QPointF pos() const;
-@@ -198,7 +198,7 @@ class QGraphicsSceneHoverEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneHoverEvent(Type type = None);
-+    explicit QGraphicsSceneHoverEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneHoverEvent();
- 
-     QPointF pos() const;
-@@ -231,7 +231,7 @@ class QGraphicsSceneHelpEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneHelpEvent(Type type = None);
-+    explicit QGraphicsSceneHelpEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneHelpEvent();
- 
-     QPointF scenePos() const;
-@@ -249,7 +249,7 @@ class QGraphicsSceneDragDropEventPrivate
- class Q_WIDGETS_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneDragDropEvent(Type type = None);
-+    explicit QGraphicsSceneDragDropEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneDragDropEvent();
- 
-     QPointF pos() const;
-
diff --git a/version/5.13.0-8/PKGBUILD b/version/5.13.0-8/PKGBUILD
deleted file mode 100644
index 1243800..0000000
--- a/version/5.13.0-8/PKGBUILD
+++ /dev/null
@@ -1,157 +0,0 @@
-# Obarun      : 66 init/supervisor
-# Maintainer  : Jean-Michel T.Dydak <jean-michel@obarun.org> <jean-michel@syntazia.org>
-# Maintainer  : Eric Vidal <eric@obarun.org>
-# PkgSource   : https://framagit.org/obarun-pkgbuild-extra/qt5-base
-#--------------
-## PkgSource  : https://www.archlinux.org/packages/extra/x86_64/qt5-base/
-## Maintainer : Felix Yan <felixonmars@archlinux.org>
-## Contributor: Andrea Scarpino <andrea@archlinux.org
-#--------------------------------------------------------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.13.0
-pkgver=${_qtver/-/}
-pkgrel=8
-arch=('x86_64')
-url="https://www.qt.io"
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc="A cross-platform application and UI framework"
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-		qtbase-qxcbwindow.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117"
-		qtbase-zlib-compression.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=cbdc9a77"
-		virtualbox-focus.patch)
-conflicts=(
-	'qtchooser')
-groups=(
-	'qt'
-	'qt5')
-depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion')
-makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin')
-
-#--------------------------------------------------------------------------------------
-prepare() {
-	cd ${_pkgfqn}
-
-	## Build qmake using Arch {C,LD}FLAGS
-	## This also sets default {C,CXX,LD}FLAGS for projects built using qmake
-	sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
-	  mkspecs/common/gcc-base.conf
-	sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
-	  mkspecs/common/g++-unix.conf
-	 
-	patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze
-	patch -p1 -i ../qtbase-zlib-compression.patch # Change the default compression back to zlib for backwards compatibility
-	patch -p1 -i ../virtualbox-focus.patch # Fix virtualbox constantly stealing focus https://bugreports.qt.io/browse/QTBUG-76742
-}
-
-build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-optimized-qmake \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
-}
-
-package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
-
-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
-
-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	"${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
-}
-
-package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
-
-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
-
-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------------------------------------------------------------------------
-sha512sums=('33b74cd6e8a7671b6f621ffee1e0d572ad52463eab1f041e11f769fe01706ce187601bfe93211cd00b0138a3ff9698d5138476de7c141d52f4ec330672709580'
-            '1174da76c8f2df71f8778b3ec6a5d5171b203f519652650ca099446207a53fd052b450c1ae944e70a963695f90e32a22ecb957a1738054c05eb731521247f28c'
-            '1785bfde1685cb4e8fc0128ac6e338761ec00d0f70a68b97ba176b01ab539178ac3746eb67eed3c2039c30f076475e2e87bc31fe2a9b7fce499e6324646cad31'
-            'af0c1101bf001a8ba566859eeed083dcde6dc8b32edb8eb0de6672045622167a462f2f16cb0f208fd46bfc1847c68d44fb0ec45a0b729436b40aafa08334c56c')
diff --git a/version/5.13.0-8/qt5-base-stutter.patch b/version/5.13.0-8/qt5-base-stutter.patch
deleted file mode 100644
index e01dc76..0000000
--- a/version/5.13.0-8/qt5-base-stutter.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d4e937a6280f34bc1cce8c8cea3806a741312fbc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl>
-Date: Tue, 25 Sep 2018 18:45:10 +0200
-Subject: xcb: Don't get initial screen rotation
-
-"xcb_randr_get_screen_info" can be slow and in some configurations can
-cause short mouse cursor freezes (which will happen on Qt application
-startup).
-
-Initial screen rotation was used only to not handle possible redundant
-screen change event.
-
-Fixes: QTBUG-70760
-Change-Id: I9f01325a045d2c82c4dd2fce91a18a34e54a4bcd
-Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
----
- src/plugins/platforms/xcb/qxcbscreen.cpp | 7 -------
- src/plugins/platforms/xcb/qxcbscreen.h   | 2 +-
- 2 files changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
-index 7f2793b2b7..a696e2a311 100644
---- a/src/plugins/platforms/xcb/qxcbscreen.cpp
-+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
-@@ -118,13 +118,6 @@ QXcbVirtualDesktop::QXcbVirtualDesktop(QXcbConnection *connection, xcb_screen_t
- 
-         xcb_depth_next(&depth_iterator);
-     }
--
--    if (connection->hasXRandr()) {
--        xcb_connection_t *conn = connection->xcb_connection();
--        auto screen_info = Q_XCB_REPLY(xcb_randr_get_screen_info, conn, screen->root);
--        if (screen_info)
--            m_rotation = screen_info->rotation;
--    }
- }
- 
- QXcbVirtualDesktop::~QXcbVirtualDesktop()
-diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h
-index 6438669e7a..792aca4b06 100644
---- a/src/plugins/platforms/xcb/qxcbscreen.h
-+++ b/src/plugins/platforms/xcb/qxcbscreen.h
-@@ -220,7 +220,7 @@ private:
-     xcb_randr_crtc_t m_crtc;
-     xcb_randr_mode_t m_mode = XCB_NONE;
-     bool m_primary = false;
--    uint8_t m_rotation = XCB_RANDR_ROTATION_ROTATE_0;
-+    uint8_t m_rotation = 0;
- 
-     QString m_outputName;
-     QSizeF m_outputSizeMillimeters;
--- 
-cgit v1.2.1
-
diff --git a/version/5.13.0-8/virtualbox-focus.patch b/version/5.13.0-8/virtualbox-focus.patch
deleted file mode 100644
index cc19065..0000000
--- a/version/5.13.0-8/virtualbox-focus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
-index 9382488b74..1bf1ab268d 100644
---- a/src/plugins/platforms/xcb/qxcbwindow.cpp
-+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
-@@ -848,7 +848,7 @@ void QXcbWindow::doFocusOut()
-     connection()->setFocusWindow(nullptr);
-     relayFocusToModalWindow();
-     // Do not set the active window to nullptr if there is a FocusIn coming.
--    connection()->focusInTimer().start(400);
-+    connection()->focusInTimer().start(100);
- }
- 
- struct QtMotifWmHints {
diff --git a/version/5.13.1-3/PKGBUILD b/version/5.13.1-3/PKGBUILD
deleted file mode 100644
index 1085a63..0000000
--- a/version/5.13.1-3/PKGBUILD
+++ /dev/null
@@ -1,170 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#-----------------------------------------------------------------------------------------------
-
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.13.1
-pkgver=${_qtver/-/}
-pkgrel=3
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-		'qtbug-77364.patch')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-	
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-	cd ${_pkgfqn}
-
-	## Build qmake using Arch {C,LD}FLAGS
-	## This also sets default {C,CXX,LD}FLAGS for projects built using qmake
-	sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
-	  mkspecs/common/gcc-base.conf
-	sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
-	  mkspecs/common/g++-unix.conf
-
-	patch -p1 -i ../qtbug-77364.patch # Fix keyboard input in webengine
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-optimized-qmake \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
-}
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
-
-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
-
-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
-}
-
-package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
-
-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
-
-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-	'qtchooser')
-
-groups=(
-	'qt'
-	'qt5')
-	
-depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion')
-
-optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin')
-	
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab'
-            'dc742814ab0c1b63da5916d96e3ef01fa96007c385ed033ae5b3a8cd8608c119')
-
diff --git a/version/5.13.1-3/qtbug-77364.patch b/version/5.13.1-3/qtbug-77364.patch
deleted file mode 100644
index fd28481..0000000
--- a/version/5.13.1-3/qtbug-77364.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
-index 04290a4ce1..27773d5762 100644
---- a/src/widgets/kernel/qwidget.cpp
-+++ b/src/widgets/kernel/qwidget.cpp
-@@ -6446,7 +6446,7 @@ void QWidget::setFocusProxy(QWidget * w)
- 
-     if (changingAppFocusWidget) {
-         QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy();
--        QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this;
-+        QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason);
-     }
- }
diff --git a/version/5.13.2-2/PKGBUILD b/version/5.13.2-2/PKGBUILD
deleted file mode 100644
index b3e5373..0000000
--- a/version/5.13.2-2/PKGBUILD
+++ /dev/null
@@ -1,167 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#-----------------------------------------------------------------------------------------------
-
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.13.2
-pkgver=${_qtver/-/}
-pkgrel=2
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-	
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-	cd ${_pkgfqn}
-
-	## Build qmake using Arch {C,LD}FLAGS
-	## This also sets default {C,CXX,LD}FLAGS for projects built using qmake
-	sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
-	  mkspecs/common/gcc-base.conf
-	sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
-	  mkspecs/common/g++-unix.conf
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-optimized-qmake \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
-}
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
-
-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
-
-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
-}
-
-package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
-
-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
-
-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-	'qtchooser')
-
-groups=(
-	'qt'
-	'qt5')
-	
-depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion')
-
-optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin')
-	
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab'
-            'dc742814ab0c1b63da5916d96e3ef01fa96007c385ed033ae5b3a8cd8608c119')
-
diff --git a/version/5.13.2-3/PKGBUILD b/version/5.13.2-3/PKGBUILD
deleted file mode 100644
index 4e8164d..0000000
--- a/version/5.13.2-3/PKGBUILD
+++ /dev/null
@@ -1,167 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#-----------------------------------------------------------------------------------------------
-
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.13.2
-pkgver=${_qtver/-/}
-pkgrel=3
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-	
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-	cd ${_pkgfqn}
-
-	## Build qmake using Arch {C,LD}FLAGS
-	## This also sets default {C,CXX,LD}FLAGS for projects built using qmake
-	sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
-	  mkspecs/common/gcc-base.conf
-	sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
-	  mkspecs/common/g++-unix.conf
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-optimized-qmake \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
-}
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
-
-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
-
-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
-}
-
-package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
-
-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
-
-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-	'qtchooser')
-
-groups=(
-	'qt'
-	'qt5')
-	
-depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion')
-
-optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin')
-	
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab'
-            'dc742814ab0c1b63da5916d96e3ef01fa96007c385ed033ae5b3a8cd8608c119')
-
diff --git a/version/5.14.0-2/PKGBUILD b/version/5.14.0-2/PKGBUILD
deleted file mode 100644
index 75fea02..0000000
--- a/version/5.14.0-2/PKGBUILD
+++ /dev/null
@@ -1,169 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#-----------------------------------------------------------------------------------------------
-
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.14.0
-pkgver=${_qtver/-/}
-pkgrel=2
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-	
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-	cd ${_pkgfqn}
-
-	## Build qmake using Arch {C,LD}FLAGS
-	## This also sets default {C,CXX,LD}FLAGS for projects built using qmake
-	sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
-	  mkspecs/common/gcc-base.conf
-	sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
-	  mkspecs/common/g++-unix.conf
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-optimized-qmake \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
-}
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
-
-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
-
-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
-}
-
-package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
-
-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
-
-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-	'qtchooser')
-
-groups=(
-	'qt'
-	'qt5')
-	
-depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion'
-	'md4c')
-
-optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-wayland: to run Qt applications in a Wayland session'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin')
-	
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab'
-            'dc742814ab0c1b63da5916d96e3ef01fa96007c385ed033ae5b3a8cd8608c119')
-
diff --git a/version/5.14.1-2/PKGBUILD b/version/5.14.1-2/PKGBUILD
deleted file mode 100644
index 475461a..0000000
--- a/version/5.14.1-2/PKGBUILD
+++ /dev/null
@@ -1,169 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#-----------------------------------------------------------------------------------------------
-
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.14.1
-pkgver=${_qtver/-/}
-pkgrel=2
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-	
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-	cd ${_pkgfqn}
-
-	## Build qmake using Arch {C,LD}FLAGS
-	## This also sets default {C,CXX,LD}FLAGS for projects built using qmake
-	sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
-	  mkspecs/common/gcc-base.conf
-	sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
-	  mkspecs/common/g++-unix.conf
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-optimized-qmake \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
-}
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
-
-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
-
-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
-}
-
-package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
-
-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
-
-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-	'qtchooser')
-
-groups=(
-	'qt'
-	'qt5')
-	
-depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion'
-	'md4c')
-
-optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-wayland: to run Qt applications in a Wayland session'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin')
-	
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab'
-            'dc742814ab0c1b63da5916d96e3ef01fa96007c385ed033ae5b3a8cd8608c119')
-
diff --git a/version/5.14.1-3/PKGBUILD b/version/5.14.1-3/PKGBUILD
deleted file mode 100644
index fc7412b..0000000
--- a/version/5.14.1-3/PKGBUILD
+++ /dev/null
@@ -1,169 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#-----------------------------------------------------------------------------------------------
-
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.14.1
-pkgver=${_qtver/-/}
-pkgrel=3
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-	
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-	cd ${_pkgfqn}
-
-	## Build qmake using Arch {C,LD}FLAGS
-	## This also sets default {C,CXX,LD}FLAGS for projects built using qmake
-	sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
-	  mkspecs/common/gcc-base.conf
-	sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
-	  mkspecs/common/g++-unix.conf
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-optimized-qmake \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
-}
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
-
-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
-
-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
-}
-
-package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
-
-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
-
-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-	'qtchooser')
-
-groups=(
-	'qt'
-	'qt5')
-	
-depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion'
-	'md4c')
-
-optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-wayland: to run Qt applications in a Wayland session'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin')
-	
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab'
-            'dc742814ab0c1b63da5916d96e3ef01fa96007c385ed033ae5b3a8cd8608c119')
-
diff --git a/version/5.14.1-4/PKGBUILD b/version/5.14.1-4/PKGBUILD
deleted file mode 100644
index 29d766b..0000000
--- a/version/5.14.1-4/PKGBUILD
+++ /dev/null
@@ -1,166 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#-----------------------------------------------------------------------------------------------
-
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.14.1
-pkgver=${_qtver/-/}
-pkgrel=4
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=(
-	"http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-	'qt5-base-cflags.patch')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-	
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-	cd ${_pkgfqn}
-
-	patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
-}
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
-
-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
-
-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
-}
-
-package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
-
-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
-
-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-	'qtchooser')
-
-groups=(
-	'qt'
-	'qt5')
-	
-depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion'
-	'md4c')
-
-optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-wayland: to run Qt applications in a Wayland session'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin'
-	'perl: for fixqt4hearders and syncqt')
-	
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
-            'b8c99219e5c2d7bf51d1fe2860168fea4b439e89b40e5e56b475694a1e2039a6')
-
diff --git a/version/5.14.1-4/qt5-base-cflags.patch b/version/5.14.1-4/qt5-base-cflags.patch
deleted file mode 100644
index d8f004a..0000000
--- a/version/5.14.1-4/qt5-base-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..79f2d2fff9 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,5 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS))
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 4d82321cba..4a61fc9d25 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,8 +40,8 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
-+eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS))
-+eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS))
- QMAKE_CFLAGS_DEBUG         += -g
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
-
diff --git a/version/5.14.2-2/PKGBUILD b/version/5.14.2-2/PKGBUILD
deleted file mode 100644
index ebbb88f..0000000
--- a/version/5.14.2-2/PKGBUILD
+++ /dev/null
@@ -1,166 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#-----------------------------------------------------------------------------------------------
-
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.14.2
-pkgver=${_qtver/-/}
-pkgrel=2
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=(
-	"http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-	'qt5-base-cflags.patch')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-	
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-	cd ${_pkgfqn}
-
-	patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
-}
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
-
-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
-
-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
-}
-
-package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
-
-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
-
-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-	'qtchooser')
-
-groups=(
-	'qt'
-	'qt5')
-	
-depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion'
-	'md4c')
-
-optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-wayland: to run Qt applications in a Wayland session'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin'
-	'perl: for fixqt4hearders and syncqt')
-	
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
-
diff --git a/version/5.14.2-2/qt5-base-cflags.patch b/version/5.14.2-2/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.14.2-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.14.2-3/PKGBUILD b/version/5.14.2-3/PKGBUILD
deleted file mode 100644
index a3b53f5..0000000
--- a/version/5.14.2-3/PKGBUILD
+++ /dev/null
@@ -1,166 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#-----------------------------------------------------------------------------------------------
-
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.14.2
-pkgver=${_qtver/-/}
-pkgrel=3
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=(
-	"http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-	'qt5-base-cflags.patch')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-	
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-	cd ${_pkgfqn}
-
-	patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
-}
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
-
-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
-
-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
-}
-
-package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
-
-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
-
-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-	'qtchooser')
-
-groups=(
-	'qt'
-	'qt5')
-	
-depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion'
-	'md4c')
-
-optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-wayland: to run Qt applications in a Wayland session'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin'
-	'perl: for fixqt4hearders and syncqt')
-	
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
-
diff --git a/version/5.14.2-3/qt5-base-cflags.patch b/version/5.14.2-3/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.14.2-3/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.14.2-4/PKGBUILD b/version/5.14.2-4/PKGBUILD
deleted file mode 100644
index be9ba61..0000000
--- a/version/5.14.2-4/PKGBUILD
+++ /dev/null
@@ -1,168 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#-----------------------------------------------------------------------------------------------
-
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.14.2
-pkgver=${_qtver/-/}
-pkgrel=4
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=(
-	"http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-	"qt5-base-QTBUG-82910.patch::https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=54aa63be9b74e8de72db9efbe6809ab1a97b29a7"
-	'qt5-base-cflags.patch')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-	
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-	cd ${_pkgfqn}
-
-	patch -p1 -i ../qt5-base-QTBUG-82910.patch # https://codereview.qt-project.org/c/qt/qtbase/+/299182
-	patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
-}
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
-
-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
-
-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
-}
-
-package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
-
-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
-
-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-	'qtchooser')
-
-groups=(
-	'qt'
-	'qt5')
-	
-depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion'
-	'md4c')
-
-optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-wayland: to run Qt applications in a Wayland session'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin'
-	'perl: for fixqt4hearders and syncqt')
-	
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
-
diff --git a/version/5.14.2-4/qt5-base-cflags.patch b/version/5.14.2-4/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.14.2-4/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.0-3/PKGBUILD b/version/5.15.0-3/PKGBUILD
deleted file mode 100644
index e977f17..0000000
--- a/version/5.15.0-3/PKGBUILD
+++ /dev/null
@@ -1,168 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#----------------------------------------------------------------------------
-#--DESCRIPTION---------------------------------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.15.0
-pkgver=${_qtver/-/}
-pkgrel=3
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=(
-    "http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-    "qt5-base-QTBUG-82910.patch::https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=54aa63be9b74e8de72db9efbe6809ab1a97b29a7"
-    'qt5-base-cflags.patch'
-    'qtbug-74252.patch')
-
-#--BUILD CONFIGURATION-------------------------------------------------------
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'sqlite'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers')
-
-#--BUILD PREPARATION---------------------------------------------------------
-
-prepare() {
-    cd ${_pkgfqn}
-
-    patch -p1 -i ../qt5-base-QTBUG-82910.patch # https://codereview.qt-project.org/c/qt/qtbase/+/299182
-    patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-    patch -p1 -i ../qtbug-74252.patch # Fix displaying custom icons
-}
-
-#--BUILD---------------------------------------------------------------------
-
-build() {
-    cd ${_pkgfqn}
-
-    #echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-    #export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations
-    make
-}
-
-#--PACKAGE-------------------------------------------------------------------
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-     "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "${pkgdir}"/usr/bin/*; do
-     ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-    optdepends=()
-    groups=()
-    conflicts=()
-
-    cd ${_pkgfqn}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--INSTALL CONFIGURATION-----------------------------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-    'qtchooser')
-
-groups=(
-    'qt'
-    'qt5')
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c')
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt')
-
-#--SECURITY AND LICENCE------------------------------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha512sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
diff --git a/version/5.15.0-3/qt5-base-cflags.patch b/version/5.15.0-3/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.0-3/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.0-3/qtbug-74252.patch b/version/5.15.0-3/qtbug-74252.patch
deleted file mode 100644
index 818f859..0000000
--- a/version/5.15.0-3/qtbug-74252.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From add92a551cf601b5c9e074046326f95ccc38062e Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sat, 23 May 2020 01:35:18 +0200
-Subject: [PATCH] Do not fully initialize QIconLoader when setting the fallback
- theme
-
-We need this because without this patch you get bugs both
-if you call QIcon::setFallbackThemeName before creating the QGuiApplication and
-if you call QIcon::setFallbackThemeName after creating QGuiApplication
-
-Why do you get a bug if you call QIconLoader::setFallbackThemeName
-before creating the QGuiApplication:
- * QIcon::setFallbackThemeName calls QIconLoader::instance
- * QIconLoader::instance calls QIconLoader::ensureInitialized
- * QIconLoader::ensureInitialized calls systemThemeName
- * systemThemeName asks the current QPlatformTheme for its
-   QPlatformTheme::SystemIconThemeName
- * But since we're calling this before creating the QGuiApplication
-   there is no current QPlatformTheme yet, so systemThemeName
-   is set to empty, which is obviously not what we want
-
-Why do you get a bug if you call QIconLoader::setFallbackThemeName
-after creating the QGuiApplication:
- * QGuiApplicationPrivate::init calls
-   QGuiApplicationPrivate::createPlatformIntegration
- * QGuiApplicationPrivate::createPlatformIntegration sets the
-   current QPlatformTheme and at the end of the very same function
-   uses QIcon::fromTheme
- * Since we haven't called QIconLoader::setFallbackThemeName yet
-   there is at least one icon lookup that doesn't take
-   the fallback theme we would like to have into account
-
-This patch makes it so calling QIconLoader::setFallbackThemeName
-before creating the QGuiApplication works.
-
-The only thing we want to do from QIcon::setFallbackThemeName is set
-the internal m_userFallbackTheme, it doesn't care about doing
-further initialization of QIconLoader, if it's done, great it's done,
-if it is not initialized yet, great it will be initialized later
-when someone actually tries to use the QIconloader.
-
-So it's OK for ensureInitialized() to return early if there is no
-platform theme yet, because it will be called again later.
-
-Pick-to: 5.12
-Pick-to: 5.15
-Fixes: QTBUG-74252
-Change-Id: I65268fc3d3d0bd282d76c76cf75e495bcc9d1a30
-Done-with: Albert Astals Cid <albert.astals.cid@kdab.com>
-Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
-Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
----
- src/gui/image/qicon.cpp       |  3 +++
- src/gui/image/qiconloader.cpp | 15 ++++++++++++---
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
-index 36f499711e9..91da21c477d 100644
---- a/src/gui/image/qicon.cpp
-+++ b/src/gui/image/qicon.cpp
-@@ -1238,6 +1238,9 @@ QString QIcon::fallbackThemeName()
-     themeSearchPath() containing an index.theme
-     file describing its contents.
- 
-+    \note This should be done before creating \l QGuiApplication, to ensure
-+    correct initialization.
-+
-     \sa fallbackThemeName(), themeSearchPaths(), themeName()
- */
- void QIcon::setFallbackThemeName(const QString &name)
-diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
-index 15ab1b3cd90..3fa3bb9c598 100644
---- a/src/gui/image/qiconloader.cpp
-+++ b/src/gui/image/qiconloader.cpp
-@@ -112,10 +112,9 @@ extern QFactoryLoader *qt_iconEngineFactoryLoader(); // qicon.cpp
- void QIconLoader::ensureInitialized()
- {
-     if (!m_initialized) {
-+        if (!QGuiApplicationPrivate::platformTheme())
-+            return; // it's too early: try again later (QTBUG-74252)
-         m_initialized = true;
--
--        Q_ASSERT(qApp);
--
-         m_systemTheme = systemThemeName();
- 
-         if (m_systemTheme.isEmpty())
-@@ -125,6 +124,16 @@ void QIconLoader::ensureInitialized()
-     }
- }
- 
-+/*!
-+    \internal
-+    Gets an instance.
-+
-+    \l QIcon::setFallbackThemeName() should be called before QGuiApplication is
-+    created, to avoid a race condition (QTBUG-74252). When this function is
-+    called from there, ensureInitialized() does not succeed because there
-+    is no QPlatformTheme yet, so systemThemeName() is empty, and we don't want
-+    m_systemTheme to get intialized to the fallback theme instead of the normal one.
-+*/
- QIconLoader *QIconLoader::instance()
- {
-    iconLoaderInstance()->ensureInitialized();
--- 
-2.16.3
diff --git a/version/5.15.0-6/PKGBUILD b/version/5.15.0-6/PKGBUILD
deleted file mode 100644
index 9238cd8..0000000
--- a/version/5.15.0-6/PKGBUILD
+++ /dev/null
@@ -1,173 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#----------------------------------------------------------------------------
-#--DESCRIPTION---------------------------------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.15.0
-pkgver=${_qtver/-/}
-pkgrel=6
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=(
-    "http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-    "qt5-base-QTBUG-82910.patch::https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=54aa63be9b74e8de72db9efbe6809ab1a97b29a7"
-    'qt5-base-cflags.patch'
-    'qtbug-74252.patch'
-    qtbug-78966.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=777f2a1c"
-    qtbug-84619.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9d2b474b")
-
-#--BUILD CONFIGURATION-------------------------------------------------------
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'sqlite'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers')
-
-#--BUILD PREPARATION---------------------------------------------------------
-
-prepare() {
-    cd ${_pkgfqn}
-
-    patch -p1 -i ../qt5-base-QTBUG-82910.patch # https://codereview.qt-project.org/c/qt/qtbase/+/299182
-    patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-    patch -p1 -i ../qtbug-74252.patch # Fix displaying custom icons
-    patch -p1 -i ../qtbug-78966.patch # Fix QToolButton menus on multi-screen systems
-    patch -p1 -i ../qtbug-84619.patch # Fix deadlock
-}
-
-#--BUILD---------------------------------------------------------------------
-
-build() {
-    cd ${_pkgfqn}
-
-    #echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-    #export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip
-    make
-}
-
-#--PACKAGE-------------------------------------------------------------------
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-     "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "${pkgdir}"/usr/bin/*; do
-     ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-    optdepends=()
-    groups=()
-    conflicts=()
-
-    cd ${_pkgfqn}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--INSTALL CONFIGURATION-----------------------------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-    'qtchooser')
-
-groups=(
-    'qt'
-    'qt5')
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c')
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt')
-
-#--SECURITY AND LICENCE------------------------------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha512sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
diff --git a/version/5.15.0-6/qt5-base-cflags.patch b/version/5.15.0-6/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.0-6/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.0-6/qtbug-74252.patch b/version/5.15.0-6/qtbug-74252.patch
deleted file mode 100644
index 818f859..0000000
--- a/version/5.15.0-6/qtbug-74252.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From add92a551cf601b5c9e074046326f95ccc38062e Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sat, 23 May 2020 01:35:18 +0200
-Subject: [PATCH] Do not fully initialize QIconLoader when setting the fallback
- theme
-
-We need this because without this patch you get bugs both
-if you call QIcon::setFallbackThemeName before creating the QGuiApplication and
-if you call QIcon::setFallbackThemeName after creating QGuiApplication
-
-Why do you get a bug if you call QIconLoader::setFallbackThemeName
-before creating the QGuiApplication:
- * QIcon::setFallbackThemeName calls QIconLoader::instance
- * QIconLoader::instance calls QIconLoader::ensureInitialized
- * QIconLoader::ensureInitialized calls systemThemeName
- * systemThemeName asks the current QPlatformTheme for its
-   QPlatformTheme::SystemIconThemeName
- * But since we're calling this before creating the QGuiApplication
-   there is no current QPlatformTheme yet, so systemThemeName
-   is set to empty, which is obviously not what we want
-
-Why do you get a bug if you call QIconLoader::setFallbackThemeName
-after creating the QGuiApplication:
- * QGuiApplicationPrivate::init calls
-   QGuiApplicationPrivate::createPlatformIntegration
- * QGuiApplicationPrivate::createPlatformIntegration sets the
-   current QPlatformTheme and at the end of the very same function
-   uses QIcon::fromTheme
- * Since we haven't called QIconLoader::setFallbackThemeName yet
-   there is at least one icon lookup that doesn't take
-   the fallback theme we would like to have into account
-
-This patch makes it so calling QIconLoader::setFallbackThemeName
-before creating the QGuiApplication works.
-
-The only thing we want to do from QIcon::setFallbackThemeName is set
-the internal m_userFallbackTheme, it doesn't care about doing
-further initialization of QIconLoader, if it's done, great it's done,
-if it is not initialized yet, great it will be initialized later
-when someone actually tries to use the QIconloader.
-
-So it's OK for ensureInitialized() to return early if there is no
-platform theme yet, because it will be called again later.
-
-Pick-to: 5.12
-Pick-to: 5.15
-Fixes: QTBUG-74252
-Change-Id: I65268fc3d3d0bd282d76c76cf75e495bcc9d1a30
-Done-with: Albert Astals Cid <albert.astals.cid@kdab.com>
-Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
-Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
----
- src/gui/image/qicon.cpp       |  3 +++
- src/gui/image/qiconloader.cpp | 15 ++++++++++++---
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
-index 36f499711e9..91da21c477d 100644
---- a/src/gui/image/qicon.cpp
-+++ b/src/gui/image/qicon.cpp
-@@ -1238,6 +1238,9 @@ QString QIcon::fallbackThemeName()
-     themeSearchPath() containing an index.theme
-     file describing its contents.
- 
-+    \note This should be done before creating \l QGuiApplication, to ensure
-+    correct initialization.
-+
-     \sa fallbackThemeName(), themeSearchPaths(), themeName()
- */
- void QIcon::setFallbackThemeName(const QString &name)
-diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
-index 15ab1b3cd90..3fa3bb9c598 100644
---- a/src/gui/image/qiconloader.cpp
-+++ b/src/gui/image/qiconloader.cpp
-@@ -112,10 +112,9 @@ extern QFactoryLoader *qt_iconEngineFactoryLoader(); // qicon.cpp
- void QIconLoader::ensureInitialized()
- {
-     if (!m_initialized) {
-+        if (!QGuiApplicationPrivate::platformTheme())
-+            return; // it's too early: try again later (QTBUG-74252)
-         m_initialized = true;
--
--        Q_ASSERT(qApp);
--
-         m_systemTheme = systemThemeName();
- 
-         if (m_systemTheme.isEmpty())
-@@ -125,6 +124,16 @@ void QIconLoader::ensureInitialized()
-     }
- }
- 
-+/*!
-+    \internal
-+    Gets an instance.
-+
-+    \l QIcon::setFallbackThemeName() should be called before QGuiApplication is
-+    created, to avoid a race condition (QTBUG-74252). When this function is
-+    called from there, ensureInitialized() does not succeed because there
-+    is no QPlatformTheme yet, so systemThemeName() is empty, and we don't want
-+    m_systemTheme to get intialized to the fallback theme instead of the normal one.
-+*/
- QIconLoader *QIconLoader::instance()
- {
-    iconLoaderInstance()->ensureInitialized();
--- 
-2.16.3
diff --git a/version/5.15.1-2/PKGBUILD b/version/5.15.1-2/PKGBUILD
deleted file mode 100644
index 7926ddb..0000000
--- a/version/5.15.1-2/PKGBUILD
+++ /dev/null
@@ -1,164 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#----------------------------------------------------------------------------
-#--DESCRIPTION---------------------------------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.15.1
-pkgver=${_qtver/-/}
-pkgrel=2
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=(
-    "http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-    'qt5-base-cflags.patch'
-)
-#--BUILD CONFIGURATION-------------------------------------------------------
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'sqlite'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers')
-
-#--BUILD PREPARATION---------------------------------------------------------
-
-prepare() {
-    cd ${_pkgfqn}
-    patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-}
-
-#--BUILD---------------------------------------------------------------------
-
-build() {
-    cd ${_pkgfqn}
-
-    #echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-    #export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip
-    make
-}
-
-#--PACKAGE-------------------------------------------------------------------
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-     "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "${pkgdir}"/usr/bin/*; do
-     ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-    optdepends=()
-    groups=()
-    conflicts=()
-
-    cd ${_pkgfqn}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--INSTALL CONFIGURATION-----------------------------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-    'qtchooser')
-
-groups=(
-    'qt'
-    'qt5')
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c')
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt')
-
-#--SECURITY AND LICENCE------------------------------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha512sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
diff --git a/version/5.15.1-2/qt5-base-cflags.patch b/version/5.15.1-2/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.1-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r129-2/PKGBUILD b/version/5.15.10+kde+r129-2/PKGBUILD
deleted file mode 100644
index e14fa8b..0000000
--- a/version/5.15.10+kde+r129-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r129
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="e8d9e68d25f4bf305f8b3ca5d678594ee4681baa"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.10+kde+r129-2/qt5-base-cflags.patch b/version/5.15.10+kde+r129-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.10+kde+r129-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r129-2/qt5-base-nostrip.patch b/version/5.15.10+kde+r129-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.10+kde+r129-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.10+kde+r129-4/PKGBUILD b/version/5.15.10+kde+r129-4/PKGBUILD
deleted file mode 100644
index 6c981cc..0000000
--- a/version/5.15.10+kde+r129-4/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r129
-pkgrel=4
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="e8d9e68d25f4bf305f8b3ca5d678594ee4681baa"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -libproxy
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.10+kde+r129-4/qt5-base-cflags.patch b/version/5.15.10+kde+r129-4/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.10+kde+r129-4/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r129-4/qt5-base-nostrip.patch b/version/5.15.10+kde+r129-4/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.10+kde+r129-4/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.10+kde+r129-5/PKGBUILD b/version/5.15.10+kde+r129-5/PKGBUILD
deleted file mode 100644
index e0ac80e..0000000
--- a/version/5.15.10+kde+r129-5/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r129
-pkgrel=5
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="e8d9e68d25f4bf305f8b3ca5d678594ee4681baa"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -libproxy
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.10+kde+r129-5/qt5-base-cflags.patch b/version/5.15.10+kde+r129-5/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.10+kde+r129-5/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r129-5/qt5-base-nostrip.patch b/version/5.15.10+kde+r129-5/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.10+kde+r129-5/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.10+kde+r130-2/PKGBUILD b/version/5.15.10+kde+r130-2/PKGBUILD
deleted file mode 100644
index 0379164..0000000
--- a/version/5.15.10+kde+r130-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r130
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="05406c3f5f516d3148254c8294e8883c28a2c95a"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -libproxy
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.10+kde+r130-2/qt5-base-cflags.patch b/version/5.15.10+kde+r130-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.10+kde+r130-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r130-2/qt5-base-nostrip.patch b/version/5.15.10+kde+r130-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.10+kde+r130-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.10+kde+r135-2/PKGBUILD b/version/5.15.10+kde+r135-2/PKGBUILD
deleted file mode 100644
index f622ad8..0000000
--- a/version/5.15.10+kde+r135-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r135
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="9815348dd2fdc8c0eac8abd6f6219a3c2e1978fa"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -libproxy
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.10+kde+r135-2/qt5-base-cflags.patch b/version/5.15.10+kde+r135-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.10+kde+r135-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r135-2/qt5-base-nostrip.patch b/version/5.15.10+kde+r135-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.10+kde+r135-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.10+kde+r139-2/PKGBUILD b/version/5.15.10+kde+r139-2/PKGBUILD
deleted file mode 100644
index b2c25ad..0000000
--- a/version/5.15.10+kde+r139-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r139
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="495371f19b60f528cbf7a953d7bff5298887042a"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -libproxy
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.10+kde+r139-2/qt5-base-cflags.patch b/version/5.15.10+kde+r139-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.10+kde+r139-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r139-2/qt5-base-nostrip.patch b/version/5.15.10+kde+r139-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.10+kde+r139-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.10+kde+r145-2/PKGBUILD b/version/5.15.10+kde+r145-2/PKGBUILD
deleted file mode 100644
index 0d12fdc..0000000
--- a/version/5.15.10+kde+r145-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r145
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="c15243692a8e8290c938eb25bc2bd2902caf31d8"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -libproxy
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.10+kde+r145-2/qt5-base-cflags.patch b/version/5.15.10+kde+r145-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.10+kde+r145-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r145-2/qt5-base-nostrip.patch b/version/5.15.10+kde+r145-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.10+kde+r145-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.10+kde+r147-2/PKGBUILD b/version/5.15.10+kde+r147-2/PKGBUILD
deleted file mode 100644
index e7c812c..0000000
--- a/version/5.15.10+kde+r147-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r147
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="e24dc54b2b4054413650904288aa7a363eee23a7"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -libproxy
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.10+kde+r147-2/qt5-base-cflags.patch b/version/5.15.10+kde+r147-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.10+kde+r147-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r147-2/qt5-base-nostrip.patch b/version/5.15.10+kde+r147-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.10+kde+r147-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.10+kde+r152-2/PKGBUILD b/version/5.15.10+kde+r152-2/PKGBUILD
deleted file mode 100644
index dd5be41..0000000
--- a/version/5.15.10+kde+r152-2/PKGBUILD
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r152
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="f959f5879597d48e3d3b46d7d395717fe94c78bc"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    work-around-pyside2-brokenness.patch
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../work-around-pyside2-brokenness.patch 
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -libproxy
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha256sums=('SKIP'
-            'fbc72a7b90f104c50020879884636614e169669fc66a1705b3df6dd28ad8e5bb'
-            '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
-            '957ff2f27b64a1358f8de1273d2e2691ce9edf2ab7acef35ad8dbdd66d2a1d58')
diff --git a/version/5.15.10+kde+r152-2/qt5-base-cflags.patch b/version/5.15.10+kde+r152-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.10+kde+r152-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r152-2/qt5-base-nostrip.patch b/version/5.15.10+kde+r152-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.10+kde+r152-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.10+kde+r152-2/work-around-pyside2-brokenness.patch b/version/5.15.10+kde+r152-2/work-around-pyside2-brokenness.patch
deleted file mode 100644
index ee959bb..0000000
--- a/version/5.15.10+kde+r152-2/work-around-pyside2-brokenness.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-# Patch from OpenMandriva:
-# https://github.com/OpenMandrivaAssociation/qt5-qtbase/commit/20f97a4b#diff-c548550538903adec7a57251150fb23c61089ec82748fae900869f550aefc8f6R161
-
-diff -up qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h.5~ qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h
---- qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h.5~	2023-03-23 20:06:47.000000000 +0100
-+++ qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h	2023-04-15 23:23:40.599956996 +0200
-@@ -104,15 +104,15 @@ protected:
- class Q_GUI_EXPORT QMouseEvent : public QInputEvent
- {
- public:
--    QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton button,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, Qt::MouseButton button,
-                 Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source);
-     ~QMouseEvent();
-@@ -154,7 +154,7 @@ protected:
- class Q_GUI_EXPORT QHoverEvent : public QInputEvent
- {
- public:
--    QHoverEvent(Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-+    QHoverEvent(QEvent::Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-     ~QHoverEvent();
- 
- #ifndef QT_NO_INTEGER_EVENT_COORDINATES
-@@ -282,12 +282,12 @@ public:
- #if QT_DEPRECATED_SINCE(5, 15)
-     // Actually deprecated since 5.4, in docs
-     QT_DEPRECATED_VERSION_X_5_15("Use the other QTabletEvent constructor")
--    QTabletEvent(Type t, const QPointF &pos, const QPointF &globalPos,
-+    QTabletEvent(QEvent::Type t, const QPointF &pos, const QPointF &globalPos,
-                  int device, int pointerType, qreal pressure, int xTilt, int yTilt,
-                  qreal tangentialPressure, qreal rotation, int z,
-                  Qt::KeyboardModifiers keyState, qint64 uniqueID); // ### remove in Qt 6
- #endif
--    QTabletEvent(Type t, const QPointF &pos, const QPointF &globalPos,
-+    QTabletEvent(QEvent::Type t, const QPointF &pos, const QPointF &globalPos,
-                  int device, int pointerType, qreal pressure, int xTilt, int yTilt,
-                  qreal tangentialPressure, qreal rotation, int z,
-                  Qt::KeyboardModifiers keyState, qint64 uniqueID,
-@@ -377,9 +377,9 @@ protected:
- class Q_GUI_EXPORT QKeyEvent : public QInputEvent
- {
- public:
--    QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(),
-+    QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(),
-               bool autorep = false, ushort count = 1);
--    QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers,
-+    QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
-               quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers,
-               const QString &text = QString(), bool autorep = false, ushort count = 1);
-     ~QKeyEvent();
-@@ -399,7 +399,7 @@ public:
- 
-     // Functions for the extended key event information
- #if QT_DEPRECATED_SINCE(5, 0)
--    static inline QKeyEvent *createExtendedKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers,
-+    static inline QKeyEvent *createExtendedKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
-                                              quint32 nativeScanCode, quint32 nativeVirtualKey,
-                                              quint32 nativeModifiers,
-                                              const QString& text = QString(), bool autorep = false,
-@@ -682,7 +682,7 @@ class Q_GUI_EXPORT QDragMoveEvent : publ
- {
- public:
-     QDragMoveEvent(const QPoint &pos, Qt::DropActions actions, const QMimeData *data,
--                   Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = DragMove);
-+                   Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, QEvent::Type type = QEvent::DragMove);
-     ~QDragMoveEvent();
- 
-     inline QRect answerRect() const { return rect; }
-diff -up qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h.5~ qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h
---- qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h.5~	2023-03-23 20:06:47.000000000 +0100
-+++ qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h	2023-04-15 23:22:38.038387091 +0200
-@@ -82,7 +82,7 @@ class QGraphicsSceneMouseEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneMouseEvent(Type type = None);
-+    explicit QGraphicsSceneMouseEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneMouseEvent();
- 
-     QPointF pos() const;
-@@ -136,7 +136,7 @@ class QGraphicsSceneWheelEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneWheelEvent(Type type = None);
-+    explicit QGraphicsSceneWheelEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneWheelEvent();
- 
-     QPointF pos() const;
-@@ -171,7 +171,7 @@ class Q_WIDGETS_EXPORT QGraphicsSceneCon
- public:
-     enum Reason { Mouse, Keyboard, Other };
- 
--    explicit QGraphicsSceneContextMenuEvent(Type type = None);
-+    explicit QGraphicsSceneContextMenuEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneContextMenuEvent();
- 
-     QPointF pos() const;
-@@ -198,7 +198,7 @@ class QGraphicsSceneHoverEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneHoverEvent(Type type = None);
-+    explicit QGraphicsSceneHoverEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneHoverEvent();
- 
-     QPointF pos() const;
-@@ -231,7 +231,7 @@ class QGraphicsSceneHelpEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneHelpEvent(Type type = None);
-+    explicit QGraphicsSceneHelpEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneHelpEvent();
- 
-     QPointF scenePos() const;
-@@ -249,7 +249,7 @@ class QGraphicsSceneDragDropEventPrivate
- class Q_WIDGETS_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneDragDropEvent(Type type = None);
-+    explicit QGraphicsSceneDragDropEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneDragDropEvent();
- 
-     QPointF pos() const;
-
diff --git a/version/5.15.10+kde+r155-2/PKGBUILD b/version/5.15.10+kde+r155-2/PKGBUILD
deleted file mode 100644
index 155a9a8..0000000
--- a/version/5.15.10+kde+r155-2/PKGBUILD
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r155
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="4bb1699cf981beade4705416f1de9d9dd4ea8e99"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    work-around-pyside2-brokenness.patch
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../work-around-pyside2-brokenness.patch 
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -libproxy
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha256sums=('SKIP'
-            'fbc72a7b90f104c50020879884636614e169669fc66a1705b3df6dd28ad8e5bb'
-            '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
-            '957ff2f27b64a1358f8de1273d2e2691ce9edf2ab7acef35ad8dbdd66d2a1d58')
diff --git a/version/5.15.10+kde+r155-2/qt5-base-cflags.patch b/version/5.15.10+kde+r155-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.10+kde+r155-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r155-2/qt5-base-nostrip.patch b/version/5.15.10+kde+r155-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.10+kde+r155-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.10+kde+r155-2/work-around-pyside2-brokenness.patch b/version/5.15.10+kde+r155-2/work-around-pyside2-brokenness.patch
deleted file mode 100644
index ee959bb..0000000
--- a/version/5.15.10+kde+r155-2/work-around-pyside2-brokenness.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-# Patch from OpenMandriva:
-# https://github.com/OpenMandrivaAssociation/qt5-qtbase/commit/20f97a4b#diff-c548550538903adec7a57251150fb23c61089ec82748fae900869f550aefc8f6R161
-
-diff -up qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h.5~ qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h
---- qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h.5~	2023-03-23 20:06:47.000000000 +0100
-+++ qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h	2023-04-15 23:23:40.599956996 +0200
-@@ -104,15 +104,15 @@ protected:
- class Q_GUI_EXPORT QMouseEvent : public QInputEvent
- {
- public:
--    QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton button,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, Qt::MouseButton button,
-                 Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source);
-     ~QMouseEvent();
-@@ -154,7 +154,7 @@ protected:
- class Q_GUI_EXPORT QHoverEvent : public QInputEvent
- {
- public:
--    QHoverEvent(Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-+    QHoverEvent(QEvent::Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-     ~QHoverEvent();
- 
- #ifndef QT_NO_INTEGER_EVENT_COORDINATES
-@@ -282,12 +282,12 @@ public:
- #if QT_DEPRECATED_SINCE(5, 15)
-     // Actually deprecated since 5.4, in docs
-     QT_DEPRECATED_VERSION_X_5_15("Use the other QTabletEvent constructor")
--    QTabletEvent(Type t, const QPointF &pos, const QPointF &globalPos,
-+    QTabletEvent(QEvent::Type t, const QPointF &pos, const QPointF &globalPos,
-                  int device, int pointerType, qreal pressure, int xTilt, int yTilt,
-                  qreal tangentialPressure, qreal rotation, int z,
-                  Qt::KeyboardModifiers keyState, qint64 uniqueID); // ### remove in Qt 6
- #endif
--    QTabletEvent(Type t, const QPointF &pos, const QPointF &globalPos,
-+    QTabletEvent(QEvent::Type t, const QPointF &pos, const QPointF &globalPos,
-                  int device, int pointerType, qreal pressure, int xTilt, int yTilt,
-                  qreal tangentialPressure, qreal rotation, int z,
-                  Qt::KeyboardModifiers keyState, qint64 uniqueID,
-@@ -377,9 +377,9 @@ protected:
- class Q_GUI_EXPORT QKeyEvent : public QInputEvent
- {
- public:
--    QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(),
-+    QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(),
-               bool autorep = false, ushort count = 1);
--    QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers,
-+    QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
-               quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers,
-               const QString &text = QString(), bool autorep = false, ushort count = 1);
-     ~QKeyEvent();
-@@ -399,7 +399,7 @@ public:
- 
-     // Functions for the extended key event information
- #if QT_DEPRECATED_SINCE(5, 0)
--    static inline QKeyEvent *createExtendedKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers,
-+    static inline QKeyEvent *createExtendedKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
-                                              quint32 nativeScanCode, quint32 nativeVirtualKey,
-                                              quint32 nativeModifiers,
-                                              const QString& text = QString(), bool autorep = false,
-@@ -682,7 +682,7 @@ class Q_GUI_EXPORT QDragMoveEvent : publ
- {
- public:
-     QDragMoveEvent(const QPoint &pos, Qt::DropActions actions, const QMimeData *data,
--                   Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = DragMove);
-+                   Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, QEvent::Type type = QEvent::DragMove);
-     ~QDragMoveEvent();
- 
-     inline QRect answerRect() const { return rect; }
-diff -up qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h.5~ qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h
---- qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h.5~	2023-03-23 20:06:47.000000000 +0100
-+++ qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h	2023-04-15 23:22:38.038387091 +0200
-@@ -82,7 +82,7 @@ class QGraphicsSceneMouseEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneMouseEvent(Type type = None);
-+    explicit QGraphicsSceneMouseEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneMouseEvent();
- 
-     QPointF pos() const;
-@@ -136,7 +136,7 @@ class QGraphicsSceneWheelEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneWheelEvent(Type type = None);
-+    explicit QGraphicsSceneWheelEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneWheelEvent();
- 
-     QPointF pos() const;
-@@ -171,7 +171,7 @@ class Q_WIDGETS_EXPORT QGraphicsSceneCon
- public:
-     enum Reason { Mouse, Keyboard, Other };
- 
--    explicit QGraphicsSceneContextMenuEvent(Type type = None);
-+    explicit QGraphicsSceneContextMenuEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneContextMenuEvent();
- 
-     QPointF pos() const;
-@@ -198,7 +198,7 @@ class QGraphicsSceneHoverEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneHoverEvent(Type type = None);
-+    explicit QGraphicsSceneHoverEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneHoverEvent();
- 
-     QPointF pos() const;
-@@ -231,7 +231,7 @@ class QGraphicsSceneHelpEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneHelpEvent(Type type = None);
-+    explicit QGraphicsSceneHelpEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneHelpEvent();
- 
-     QPointF scenePos() const;
-@@ -249,7 +249,7 @@ class QGraphicsSceneDragDropEventPrivate
- class Q_WIDGETS_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneDragDropEvent(Type type = None);
-+    explicit QGraphicsSceneDragDropEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneDragDropEvent();
- 
-     QPointF pos() const;
-
diff --git a/version/5.15.10+kde+r158-2/PKGBUILD b/version/5.15.10+kde+r158-2/PKGBUILD
deleted file mode 100644
index 6c769f9..0000000
--- a/version/5.15.10+kde+r158-2/PKGBUILD
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.10
-pkgver=5.15.10+kde+r158
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="74917690e8cded41b087acfe6c58fcd3674864a4"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    work-around-pyside2-brokenness.patch
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../work-around-pyside2-brokenness.patch 
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -libproxy
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha256sums=('SKIP'
-            'fbc72a7b90f104c50020879884636614e169669fc66a1705b3df6dd28ad8e5bb'
-            '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
-            '957ff2f27b64a1358f8de1273d2e2691ce9edf2ab7acef35ad8dbdd66d2a1d58')
diff --git a/version/5.15.10+kde+r158-2/qt5-base-cflags.patch b/version/5.15.10+kde+r158-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.10+kde+r158-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.10+kde+r158-2/qt5-base-nostrip.patch b/version/5.15.10+kde+r158-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.10+kde+r158-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.10+kde+r158-2/work-around-pyside2-brokenness.patch b/version/5.15.10+kde+r158-2/work-around-pyside2-brokenness.patch
deleted file mode 100644
index ee959bb..0000000
--- a/version/5.15.10+kde+r158-2/work-around-pyside2-brokenness.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-# Patch from OpenMandriva:
-# https://github.com/OpenMandrivaAssociation/qt5-qtbase/commit/20f97a4b#diff-c548550538903adec7a57251150fb23c61089ec82748fae900869f550aefc8f6R161
-
-diff -up qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h.5~ qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h
---- qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h.5~	2023-03-23 20:06:47.000000000 +0100
-+++ qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h	2023-04-15 23:23:40.599956996 +0200
-@@ -104,15 +104,15 @@ protected:
- class Q_GUI_EXPORT QMouseEvent : public QInputEvent
- {
- public:
--    QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton button,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, Qt::MouseButton button,
-                 Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers);
--    QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-+    QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
-                 Qt::MouseButton button, Qt::MouseButtons buttons,
-                 Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source);
-     ~QMouseEvent();
-@@ -154,7 +154,7 @@ protected:
- class Q_GUI_EXPORT QHoverEvent : public QInputEvent
- {
- public:
--    QHoverEvent(Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-+    QHoverEvent(QEvent::Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-     ~QHoverEvent();
- 
- #ifndef QT_NO_INTEGER_EVENT_COORDINATES
-@@ -282,12 +282,12 @@ public:
- #if QT_DEPRECATED_SINCE(5, 15)
-     // Actually deprecated since 5.4, in docs
-     QT_DEPRECATED_VERSION_X_5_15("Use the other QTabletEvent constructor")
--    QTabletEvent(Type t, const QPointF &pos, const QPointF &globalPos,
-+    QTabletEvent(QEvent::Type t, const QPointF &pos, const QPointF &globalPos,
-                  int device, int pointerType, qreal pressure, int xTilt, int yTilt,
-                  qreal tangentialPressure, qreal rotation, int z,
-                  Qt::KeyboardModifiers keyState, qint64 uniqueID); // ### remove in Qt 6
- #endif
--    QTabletEvent(Type t, const QPointF &pos, const QPointF &globalPos,
-+    QTabletEvent(QEvent::Type t, const QPointF &pos, const QPointF &globalPos,
-                  int device, int pointerType, qreal pressure, int xTilt, int yTilt,
-                  qreal tangentialPressure, qreal rotation, int z,
-                  Qt::KeyboardModifiers keyState, qint64 uniqueID,
-@@ -377,9 +377,9 @@ protected:
- class Q_GUI_EXPORT QKeyEvent : public QInputEvent
- {
- public:
--    QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(),
-+    QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(),
-               bool autorep = false, ushort count = 1);
--    QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers,
-+    QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
-               quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers,
-               const QString &text = QString(), bool autorep = false, ushort count = 1);
-     ~QKeyEvent();
-@@ -399,7 +399,7 @@ public:
- 
-     // Functions for the extended key event information
- #if QT_DEPRECATED_SINCE(5, 0)
--    static inline QKeyEvent *createExtendedKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers,
-+    static inline QKeyEvent *createExtendedKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
-                                              quint32 nativeScanCode, quint32 nativeVirtualKey,
-                                              quint32 nativeModifiers,
-                                              const QString& text = QString(), bool autorep = false,
-@@ -682,7 +682,7 @@ class Q_GUI_EXPORT QDragMoveEvent : publ
- {
- public:
-     QDragMoveEvent(const QPoint &pos, Qt::DropActions actions, const QMimeData *data,
--                   Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = DragMove);
-+                   Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, QEvent::Type type = QEvent::DragMove);
-     ~QDragMoveEvent();
- 
-     inline QRect answerRect() const { return rect; }
-diff -up qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h.5~ qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h
---- qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h.5~	2023-03-23 20:06:47.000000000 +0100
-+++ qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h	2023-04-15 23:22:38.038387091 +0200
-@@ -82,7 +82,7 @@ class QGraphicsSceneMouseEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneMouseEvent(Type type = None);
-+    explicit QGraphicsSceneMouseEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneMouseEvent();
- 
-     QPointF pos() const;
-@@ -136,7 +136,7 @@ class QGraphicsSceneWheelEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneWheelEvent(Type type = None);
-+    explicit QGraphicsSceneWheelEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneWheelEvent();
- 
-     QPointF pos() const;
-@@ -171,7 +171,7 @@ class Q_WIDGETS_EXPORT QGraphicsSceneCon
- public:
-     enum Reason { Mouse, Keyboard, Other };
- 
--    explicit QGraphicsSceneContextMenuEvent(Type type = None);
-+    explicit QGraphicsSceneContextMenuEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneContextMenuEvent();
- 
-     QPointF pos() const;
-@@ -198,7 +198,7 @@ class QGraphicsSceneHoverEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneHoverEvent(Type type = None);
-+    explicit QGraphicsSceneHoverEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneHoverEvent();
- 
-     QPointF pos() const;
-@@ -231,7 +231,7 @@ class QGraphicsSceneHelpEventPrivate;
- class Q_WIDGETS_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneHelpEvent(Type type = None);
-+    explicit QGraphicsSceneHelpEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneHelpEvent();
- 
-     QPointF scenePos() const;
-@@ -249,7 +249,7 @@ class QGraphicsSceneDragDropEventPrivate
- class Q_WIDGETS_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent
- {
- public:
--    explicit QGraphicsSceneDragDropEvent(Type type = None);
-+    explicit QGraphicsSceneDragDropEvent(QEvent::Type type = QEvent::None);
-     ~QGraphicsSceneDragDropEvent();
- 
-     QPointF pos() const;
-
diff --git a/version/5.15.2+kde+r210-2/PKGBUILD b/version/5.15.2+kde+r210-2/PKGBUILD
deleted file mode 100644
index a7d8a1c..0000000
--- a/version/5.15.2+kde+r210-2/PKGBUILD
+++ /dev/null
@@ -1,179 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-# PkgSource     : url="https://git.obarun.org/pkg/obextra/qt5-base"
-#----------------------------------------------------------------------------
-#--DESCRIPTION---------------------------------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.15.2+kde+r210
-pkgver=${_qtver/-/}
-pkgrel=2
-
-
-url="https://www.qt.io"
-
-track="commit"
-target=663d240a18f5acac82fd2bd0fd4a33c4f47b260a
-_pkgfqn=qtbase
-source=(
-    "git+https://invent.kde.org/qt/qt/$_pkgfqn#${track}=${target}"
-    'qt5-base-cflags.patch'
-    'qt5-base-nostrip.patch'
-    'qt5-base-mariadb-10.6.patch'
-)
-#--BUILD CONFIGURATION-------------------------------------------------------
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'sqlite'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git')
-
-#--BUILD PREPARATION---------------------------------------------------------
-
-pkgver() {
-  cd $_pkgfqn
-  echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit`
-}
-
-prepare() {
-    cd ${_pkgfqn}
-    patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-    patch -p1 -i ../qt5-base-nostrip.patch # Don't strip binaries with qmake
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
-    patch -p1 < ../qt5-base-mariadb-10.6.patch # Fix broken mysql version detection with mariadb 10.6
-}
-
-#--BUILD---------------------------------------------------------------------
-
-build() {
-    cd ${_pkgfqn}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip
-    make
-}
-
-#--PACKAGE-------------------------------------------------------------------
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-     "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "${pkgdir}"/usr/bin/*; do
-     ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-    optdepends=()
-    groups=()
-    conflicts=()
-
-    cd ${_pkgfqn}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--INSTALL CONFIGURATION-----------------------------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-    'qtchooser')
-
-groups=(
-    'qt'
-    'qt5')
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c')
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt')
-
-#--SECURITY AND LICENCE------------------------------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha512sums=('a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9'
-'fa3dddfe42b7f0ade45bd0530badfc3a3800adbd3798bd814597527713c9fe360a242f7cf39312f4cc3c88e9bd7aba233bd6674c0fc78e694a1fd868474c4240'
-'3b96ca0fba36358d25643ecc999e94559ddf122ba490ef92c4587389b2162ec22835f0a64a6e3f940df511a359ae43345462722c2525c2f5f2660c65d65d3f1c'
-'afc8c44cb2fdb1b07b8e88bda102791d4f807a00acc60aad98114b5a5b78336b4e6aeff59fa2795f3f83f196635d034c571859dab7c7c0443a913012944a45a7')
diff --git a/version/5.15.2+kde+r210-2/qt5-base-cflags.patch b/version/5.15.2+kde+r210-2/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.2+kde+r210-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r210-2/qt5-base-mariadb-10.6.patch b/version/5.15.2+kde+r210-2/qt5-base-mariadb-10.6.patch
deleted file mode 100644
index cebbafd..0000000
--- a/version/5.15.2+kde+r210-2/qt5-base-mariadb-10.6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
-index a641935dc5..19e6a8286d 100644
---- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
-+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
-@@ -1355,7 +1355,7 @@ bool QMYSQLDriver::open(const QString& db,
-     }
- 
- #if MYSQL_VERSION_ID >= 50007
--    if (mysql_get_client_version() >= 50503 && mysql_get_server_version(d->mysql) >= 50503) {
-+    if (true) {
-         // force the communication to be utf8mb4 (only utf8mb4 supports 4-byte characters)
-         mysql_set_character_set(d->mysql, "utf8mb4");
- #if QT_CONFIG(textcodec)
-@@ -1371,8 +1371,7 @@ bool QMYSQLDriver::open(const QString& db,
-     }
- #endif  // MYSQL_VERSION_ID >= 50007
- 
--    d->preparedQuerysEnabled = mysql_get_client_version() >= 40108
--                        && mysql_get_server_version(d->mysql) >= 40100;
-+    d->preparedQuerysEnabled = true;
- 
- #if QT_CONFIG(thread)
-     mysql_thread_init();
diff --git a/version/5.15.2+kde+r210-2/qt5-base-nostrip.patch b/version/5.15.2+kde+r210-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r210-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r234-2/PKGBUILD b/version/5.15.2+kde+r234-2/PKGBUILD
deleted file mode 100644
index 7f98701..0000000
--- a/version/5.15.2+kde+r234-2/PKGBUILD
+++ /dev/null
@@ -1,182 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/qt5-base
-#----------------
-# Website       : https://www.qt.io/
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-pkgver=5.15.2+kde+r234
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-
-url='https://invent.kde.org/qt/qt/qtbase'
-
-track=commit
-target=cbb138f4f1292bea1243160941a27894e337beec
-
-source=("git+$url#$track=$target"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake
-}
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip
-    make
-}
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=('x86_64')
-
-depends=(
-    libjpeg-turbo
-    xcb-util-keysyms
-    xcb-util-renderutil
-    libgl
-    fontconfig
-    xdg-utils
-    shared-mime-info
-    xcb-util-wm
-    libxrender
-    libxi
-    sqlite
-    xcb-util-image
-    mesa
-    tslib
-    libinput
-    libxkbcommon-x11
-    libproxy
-    libcups
-    double-conversion
-    md4c
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    qt
-    qt5
-)
-
-conflicts=(
-    qtchooser
-)
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|${srcdir}/${pkgbase/5-}|/usr|" \
-     "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "${pkgdir}"/usr/bin/*; do
-     ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-    optdepends=()
-    groups=()
-    conflicts=()
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#-------------------------
-# LICENCE AND VALIDATION ]
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha512sums=('')
diff --git a/version/5.15.2+kde+r234-2/qt5-base-cflags.patch b/version/5.15.2+kde+r234-2/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.2+kde+r234-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r234-2/qt5-base-nostrip.patch b/version/5.15.2+kde+r234-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r234-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r243-2/PKGBUILD b/version/5.15.2+kde+r243-2/PKGBUILD
deleted file mode 100644
index c2a7648..0000000
--- a/version/5.15.2+kde+r243-2/PKGBUILD
+++ /dev/null
@@ -1,179 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/qt5-base
-#----------------
-# Website       : https://www.qt.io/
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-pkgver=5.15.2+kde+r243
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-
-url='https://invent.kde.org/qt/qt/qtbase'
-
-track=commit
-target=04475041b6e1b2a4e3edb391eeb13883f92e0db5
-
-source=("git+$url#$track=$target"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake
-}
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip
-    make
-}
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=('x86_64')
-
-depends=(
-    libjpeg-turbo
-    xcb-util-keysyms
-    xcb-util-renderutil
-    libgl
-    fontconfig
-    xdg-utils
-    shared-mime-info
-    xcb-util-wm
-    libxrender
-    libxi
-    sqlite
-    xcb-util-image
-    mesa
-    tslib
-    libinput
-    libxkbcommon-x11
-    libproxy
-    libcups
-    double-conversion
-    md4c
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    qt
-    qt5
-)
-
-conflicts=(
-    qtchooser
-)
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|${srcdir}/${pkgbase/5-}|/usr|" \
-     "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "${pkgdir}"/usr/bin/*; do
-     ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#-------------------------
-# LICENCE AND VALIDATION ]
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha512sums=('')
diff --git a/version/5.15.2+kde+r243-2/qt5-base-cflags.patch b/version/5.15.2+kde+r243-2/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.2+kde+r243-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r243-2/qt5-base-nostrip.patch b/version/5.15.2+kde+r243-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r243-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r260-2/PKGBUILD b/version/5.15.2+kde+r260-2/PKGBUILD
deleted file mode 100644
index 6c46901..0000000
--- a/version/5.15.2+kde+r260-2/PKGBUILD
+++ /dev/null
@@ -1,178 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/qt5-base
-#----------------
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgname=('qt5-base' 'qt5-xcb-private-headers')
-pkgver=5.15.2+kde+r260
-pkgrel=2
-pkgdesc='A cross-platform application and UI framework'
-
-url='https://www.qt.io'
-
-track=commit
-target=00e0ffa0297957871ad1f22626524b6bd8e87260
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#$track=$target"
-    'qt5-base-cflags.patch'
-    'qt5-base-nostrip.patch'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake
-}
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=(x86_64)
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#-------------------------
-# LICENCE AND VALIDATION ]
-
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=(' ')
diff --git a/version/5.15.2+kde+r260-2/qt5-base-cflags.patch b/version/5.15.2+kde+r260-2/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.2+kde+r260-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r260-2/qt5-base-nostrip.patch b/version/5.15.2+kde+r260-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r260-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r260-3/PKGBUILD b/version/5.15.2+kde+r260-3/PKGBUILD
deleted file mode 100644
index 265d333..0000000
--- a/version/5.15.2+kde+r260-3/PKGBUILD
+++ /dev/null
@@ -1,178 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/qt5-base
-#----------------
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgname=('qt5-base' 'qt5-xcb-private-headers')
-pkgver=5.15.2+kde+r260
-pkgrel=3
-pkgdesc='A cross-platform application and UI framework'
-
-url='https://www.qt.io'
-
-track=commit
-target=00e0ffa0297957871ad1f22626524b6bd8e87260
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#$track=$target"
-    'qt5-base-cflags.patch'
-    'qt5-base-nostrip.patch'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake
-}
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=(x86_64)
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#-------------------------
-# LICENCE AND VALIDATION ]
-
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=(' ')
diff --git a/version/5.15.2+kde+r260-3/qt5-base-cflags.patch b/version/5.15.2+kde+r260-3/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.2+kde+r260-3/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r260-3/qt5-base-nostrip.patch b/version/5.15.2+kde+r260-3/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r260-3/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r268-2/PKGBUILD b/version/5.15.2+kde+r268-2/PKGBUILD
deleted file mode 100644
index aeffe66..0000000
--- a/version/5.15.2+kde+r268-2/PKGBUILD
+++ /dev/null
@@ -1,184 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/qt5-base
-#----------------
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgname=('qt5-base' 'qt5-xcb-private-headers')
-pkgver=5.15.2+kde+r268
-pkgrel=2
-pkgdesc='A cross-platform application and UI framework'
-
-url='https://www.qt.io'
-
-track=commit
-target=edb0f568ca1380623325cb18365b0af81cbf65bf
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#$track=$target"
-    'qt5-base-cflags.patch'
-    'qt5-base-nostrip.patch'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake
-}
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=(x86_64)
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-    depends+=(qt5-translations)
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#-------------------------
-# LICENCE AND VALIDATION ]
-
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=(' ')
diff --git a/version/5.15.2+kde+r268-2/qt5-base-cflags.patch b/version/5.15.2+kde+r268-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.2+kde+r268-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r268-2/qt5-base-nostrip.patch b/version/5.15.2+kde+r268-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r268-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r274-3/PKGBUILD b/version/5.15.2+kde+r274-3/PKGBUILD
deleted file mode 100644
index fa513fb..0000000
--- a/version/5.15.2+kde+r274-3/PKGBUILD
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgver=5.15.2+kde+r274
-pkgrel=3
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track=commit
-target=98aa64af7e1e677bd107bfb0c432cabf7c3a5e32
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#$track=$target"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 ## Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.2+kde+r274-3/qt5-base-cflags.patch b/version/5.15.2+kde+r274-3/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.2+kde+r274-3/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r274-3/qt5-base-nostrip.patch b/version/5.15.2+kde+r274-3/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r274-3/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r277-2/PKGBUILD b/version/5.15.2+kde+r277-2/PKGBUILD
deleted file mode 100644
index f019397..0000000
--- a/version/5.15.2+kde+r277-2/PKGBUILD
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgver=5.15.2+kde+r277
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track=commit
-target=e8b9f4c28d3ab5e960dc54f2dc0c4b749b0b50e0
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#$track=$target"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 ## Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.2+kde+r277-2/qt5-base-cflags.patch b/version/5.15.2+kde+r277-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.2+kde+r277-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r277-2/qt5-base-nostrip.patch b/version/5.15.2+kde+r277-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r277-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r289-2/PKGBUILD b/version/5.15.2+kde+r289-2/PKGBUILD
deleted file mode 100644
index 1d95ac5..0000000
--- a/version/5.15.2+kde+r289-2/PKGBUILD
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgver=5.15.2+kde+r289
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track=commit
-target=38ad2f39daec09168728033969265834b6a2d924
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#$track=$target"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 ## Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.2+kde+r289-2/qt5-base-cflags.patch b/version/5.15.2+kde+r289-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.2+kde+r289-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r289-2/qt5-base-nostrip.patch b/version/5.15.2+kde+r289-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r289-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r294-2/PKGBUILD b/version/5.15.2+kde+r294-2/PKGBUILD
deleted file mode 100644
index 3397069..0000000
--- a/version/5.15.2+kde+r294-2/PKGBUILD
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgver=5.15.2+kde+r294
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track=commit
-target=366350c2e4a7eccbda0f3936e69c6b9c4fa28f55
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#$track=$target"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 ## Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.2+kde+r294-2/qt5-base-cflags.patch b/version/5.15.2+kde+r294-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.2+kde+r294-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r294-2/qt5-base-nostrip.patch b/version/5.15.2+kde+r294-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r294-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r296-3/PKGBUILD b/version/5.15.2+kde+r296-3/PKGBUILD
deleted file mode 100644
index a011629..0000000
--- a/version/5.15.2+kde+r296-3/PKGBUILD
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgver=5.15.2+kde+r296
-pkgrel=3
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track=commit
-target=53a047c212af7fbded6505651f648172f9d7a34d
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#$track=$target"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 ## Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-options=(debug)
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.2+kde+r296-3/qt5-base-cflags.patch b/version/5.15.2+kde+r296-3/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.2+kde+r296-3/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r296-3/qt5-base-nostrip.patch b/version/5.15.2+kde+r296-3/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r296-3/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r297-2/PKGBUILD b/version/5.15.2+kde+r297-2/PKGBUILD
deleted file mode 100644
index 68e2eaf..0000000
--- a/version/5.15.2+kde+r297-2/PKGBUILD
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At Disroot Dot Org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgver=5.15.2+kde+r297
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="d16bf02a11953dcac01dca73e6f3778f293adefe"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=(debug)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 ## Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.2+kde+r297-2/qt5-base-cflags.patch b/version/5.15.2+kde+r297-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.2+kde+r297-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r297-2/qt5-base-nostrip.patch b/version/5.15.2+kde+r297-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r297-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2+kde+r301-2/PKGBUILD b/version/5.15.2+kde+r301-2/PKGBUILD
deleted file mode 100644
index 5565d3d..0000000
--- a/version/5.15.2+kde+r301-2/PKGBUILD
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgver=5.15.2+kde+r301
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="f36c2233fad0bfddf9350305a6bdc6de022d3635"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-    git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 ## Revert version bump
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.2+kde+r301-2/qt5-base-cflags.patch b/version/5.15.2+kde+r301-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.2+kde+r301-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2+kde+r301-2/qt5-base-nostrip.patch b/version/5.15.2+kde+r301-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2+kde+r301-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2-2/PKGBUILD b/version/5.15.2-2/PKGBUILD
deleted file mode 100644
index 01c1b51..0000000
--- a/version/5.15.2-2/PKGBUILD
+++ /dev/null
@@ -1,164 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#----------------------------------------------------------------------------
-#--DESCRIPTION---------------------------------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=(
-    "http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-    'qt5-base-cflags.patch'
-)
-#--BUILD CONFIGURATION-------------------------------------------------------
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'sqlite'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers')
-
-#--BUILD PREPARATION---------------------------------------------------------
-
-prepare() {
-    cd ${_pkgfqn}
-    patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-}
-
-#--BUILD---------------------------------------------------------------------
-
-build() {
-    cd ${_pkgfqn}
-
-    #echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-    #export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip
-    make
-}
-
-#--PACKAGE-------------------------------------------------------------------
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-     "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "${pkgdir}"/usr/bin/*; do
-     ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-    optdepends=()
-    groups=()
-    conflicts=()
-
-    cd ${_pkgfqn}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--INSTALL CONFIGURATION-----------------------------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-    'qtchooser')
-
-groups=(
-    'qt'
-    'qt5')
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c')
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt')
-
-#--SECURITY AND LICENCE------------------------------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha512sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
diff --git a/version/5.15.2-2/qt5-base-cflags.patch b/version/5.15.2-2/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.2-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2-3/PKGBUILD b/version/5.15.2-3/PKGBUILD
deleted file mode 100644
index b4b6e8c..0000000
--- a/version/5.15.2-3/PKGBUILD
+++ /dev/null
@@ -1,164 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#----------------------------------------------------------------------------
-#--DESCRIPTION---------------------------------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=3
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=(
-    "http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-    'qt5-base-cflags.patch'
-)
-#--BUILD CONFIGURATION-------------------------------------------------------
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'sqlite'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers')
-
-#--BUILD PREPARATION---------------------------------------------------------
-
-prepare() {
-    cd ${_pkgfqn}
-    patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-}
-
-#--BUILD---------------------------------------------------------------------
-
-build() {
-    cd ${_pkgfqn}
-
-    #echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-    #export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip
-    make
-}
-
-#--PACKAGE-------------------------------------------------------------------
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-     "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "${pkgdir}"/usr/bin/*; do
-     ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-    optdepends=()
-    groups=()
-    conflicts=()
-
-    cd ${_pkgfqn}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--INSTALL CONFIGURATION-----------------------------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-    'qtchooser')
-
-groups=(
-    'qt'
-    'qt5')
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c')
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt')
-
-#--SECURITY AND LICENCE------------------------------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha512sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
diff --git a/version/5.15.2-3/qt5-base-cflags.patch b/version/5.15.2-3/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.2-3/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2-6/PKGBUILD b/version/5.15.2-6/PKGBUILD
deleted file mode 100644
index fdfd7fa..0000000
--- a/version/5.15.2-6/PKGBUILD
+++ /dev/null
@@ -1,169 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#----------------------------------------------------------------------------
-#--DESCRIPTION---------------------------------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=6
-
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=(
-    "http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-    'qt5-base-cflags.patch'
-    'qt5-base-nostrip.patch'
-    kdebug-428095.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch?id=c5336057"
-)
-#--BUILD CONFIGURATION-------------------------------------------------------
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'sqlite'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers')
-
-#--BUILD PREPARATION---------------------------------------------------------
-
-prepare() {
-    cd ${_pkgfqn}
-    patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-    patch -p1 -i ../qt5-base-nostrip.patch # Don't strip binaries with qmake
-    patch -p1 -i ../kdebug-428095.patch # Fix black border on some menus with Breeze
-}
-
-#--BUILD---------------------------------------------------------------------
-
-build() {
-    cd ${_pkgfqn}
-
-    #echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-    #export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip
-    make
-}
-
-#--PACKAGE-------------------------------------------------------------------
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-     "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "${pkgdir}"/usr/bin/*; do
-     ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-    optdepends=()
-    groups=()
-    conflicts=()
-
-    cd ${_pkgfqn}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--INSTALL CONFIGURATION-----------------------------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-    'qtchooser')
-
-groups=(
-    'qt'
-    'qt5')
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c')
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt')
-
-#--SECURITY AND LICENCE------------------------------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha512sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
diff --git a/version/5.15.2-6/qt5-base-cflags.patch b/version/5.15.2-6/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.2-6/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2-6/qt5-base-nostrip.patch b/version/5.15.2-6/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2-6/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.2-7/PKGBUILD b/version/5.15.2-7/PKGBUILD
deleted file mode 100644
index 97358ba..0000000
--- a/version/5.15.2-7/PKGBUILD
+++ /dev/null
@@ -1,172 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer	: YianIris <yianiris At Disroot Dot Org>
-# PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#----------------------------------------------------------------------------
-#--DESCRIPTION---------------------------------------------------------------
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-
-pkgdesc="A cross-platform application and UI framework"
-
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=7
-
-
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-url="https://www.qt.io"
-source=(
-    "http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-    'qt5-base-cflags.patch'
-    'qt5-base-nostrip.patch'
-    kdebug-428095.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch?id=c5336057"
-)
-#--BUILD CONFIGURATION-------------------------------------------------------
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'sqlite'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers')
-
-#--BUILD PREPARATION---------------------------------------------------------
-
-prepare() {
-    cd ${_pkgfqn}
-    patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
-    patch -p1 -i ../qt5-base-nostrip.patch # Don't strip binaries with qmake
-    patch -p1 -i ../kdebug-428095.patch # Fix black border on some menus with Breeze
-}
-
-#--BUILD---------------------------------------------------------------------
-
-build() {
-    cd ${_pkgfqn}
-
-    #echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-    #export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -reduce-relocations \
-        -no-strip
-    make
-}
-
-#--PACKAGE-------------------------------------------------------------------
-
-package_qt5-base() {
-    pkgdesc='A cross-platform application and UI framework'
-
-    cd ${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-     "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "${pkgdir}"/usr/bin/*; do
-     ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc='Private headers for Qt5 Xcb'
-
-    depends=("qt5-base=$pkgver")
-    optdepends=()
-    groups=()
-    conflicts=()
-
-    cd ${_pkgfqn}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--INSTALL CONFIGURATION-----------------------------------------------------
-
-arch=('x86_64')
-
-conflicts=(
-    'qtchooser')
-
-groups=(
-    'qt'
-    'qt5')
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c')
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt')
-
-#--SECURITY AND LICENCE------------------------------------------------------
-
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-
-sha512sums=('a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9'
-'fa3dddfe42b7f0ade45bd0530badfc3a3800adbd3798bd814597527713c9fe360a242f7cf39312f4cc3c88e9bd7aba233bd6674c0fc78e694a1fd868474c4240'
-'3b96ca0fba36358d25643ecc999e94559ddf122ba490ef92c4587389b2162ec22835f0a64a6e3f940df511a359ae43345462722c2525c2f5f2660c65d65d3f1c'
-'afc8c44cb2fdb1b07b8e88bda102791d4f807a00acc60aad98114b5a5b78336b4e6aeff59fa2795f3f83f196635d034c571859dab7c7c0443a913012944a45a7')
diff --git a/version/5.15.2-7/qt5-base-cflags.patch b/version/5.15.2-7/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/version/5.15.2-7/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.2-7/qt5-base-nostrip.patch b/version/5.15.2-7/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.2-7/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.3+kde+r132-2/PKGBUILD b/version/5.15.3+kde+r132-2/PKGBUILD
deleted file mode 100644
index d839269..0000000
--- a/version/5.15.3+kde+r132-2/PKGBUILD
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.3
-pkgver=5.15.3+kde+r132
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="e6c19422a25890b5e9a728f4acb9166a6a11527e"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.3+kde+r132-2/qt5-base-cflags.patch b/version/5.15.3+kde+r132-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.3+kde+r132-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.3+kde+r132-2/qt5-base-nostrip.patch b/version/5.15.3+kde+r132-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.3+kde+r132-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.3+kde+r137-2/PKGBUILD b/version/5.15.3+kde+r137-2/PKGBUILD
deleted file mode 100644
index 5c27248..0000000
--- a/version/5.15.3+kde+r137-2/PKGBUILD
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.3
-pkgver=5.15.3+kde+r137
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="ee7a89b2c4750bc3cabe4aeb466645d6ac2a872b"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.3+kde+r137-2/qt5-base-cflags.patch b/version/5.15.3+kde+r137-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.3+kde+r137-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.3+kde+r137-2/qt5-base-nostrip.patch b/version/5.15.3+kde+r137-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.3+kde+r137-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.3+kde+r137-3/PKGBUILD b/version/5.15.3+kde+r137-3/PKGBUILD
deleted file mode 100644
index 25e0050..0000000
--- a/version/5.15.3+kde+r137-3/PKGBUILD
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.3
-pkgver=5.15.3+kde+r137
-pkgrel=3
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="ee7a89b2c4750bc3cabe4aeb466645d6ac2a872b"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.3+kde+r137-3/qt5-base-cflags.patch b/version/5.15.3+kde+r137-3/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.3+kde+r137-3/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.3+kde+r137-3/qt5-base-nostrip.patch b/version/5.15.3+kde+r137-3/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.3+kde+r137-3/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.3+kde+r145-2/PKGBUILD b/version/5.15.3+kde+r145-2/PKGBUILD
deleted file mode 100644
index aff9a33..0000000
--- a/version/5.15.3+kde+r145-2/PKGBUILD
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.3
-pkgver=5.15.3+kde+r145
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="ee7a89b2c4750bc3cabe4aeb466645d6ac2a872b"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.3+kde+r145-2/qt5-base-cflags.patch b/version/5.15.3+kde+r145-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.3+kde+r145-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.3+kde+r145-2/qt5-base-nostrip.patch b/version/5.15.3+kde+r145-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.3+kde+r145-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.4+kde+r135-2/PKGBUILD b/version/5.15.4+kde+r135-2/PKGBUILD
deleted file mode 100644
index d51675c..0000000
--- a/version/5.15.4+kde+r135-2/PKGBUILD
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgver=5.15.4+kde+r135
-_qtver=5.15.4
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="e0a15c11b853954d4189b2e30aa2450184de0987"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_qtver+kde+r"`git rev-list --count v$_qtver-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.4+kde+r135-2/qt5-base-cflags.patch b/version/5.15.4+kde+r135-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.4+kde+r135-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.4+kde+r135-2/qt5-base-nostrip.patch b/version/5.15.4+kde+r135-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.4+kde+r135-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.4+kde+r139-2/PKGBUILD b/version/5.15.4+kde+r139-2/PKGBUILD
deleted file mode 100644
index 1d6ee5a..0000000
--- a/version/5.15.4+kde+r139-2/PKGBUILD
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.4
-pkgver=5.15.4+kde+r139
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="2ffb7ad8a1079a0444b9c72affe3d19b089b60de"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_qtver+kde+r"`git rev-list --count v$_qtver-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    ./configure \
-        -confirm-license -opensource -v \
-        -prefix /usr \
-        -docdir /usr/share/doc/qt \
-        -headerdir /usr/include/qt \
-        -archdatadir /usr/lib/qt \
-        -datadir /usr/share/qt \
-        -sysconfdir /etc/xdg \
-        -examplesdir /usr/share/doc/qt/examples \
-        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-        -system-sqlite \
-        -openssl-linked \
-        -nomake examples \
-        -no-rpath \
-        -dbus-linked \
-        -system-harfbuzz \
-        -no-mimetype-database \
-        -no-use-gold-linker \
-        -no-reduce-relocations \
-        -no-strip \
-        -ltcg
-
-    # No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.4+kde+r139-2/qt5-base-cflags.patch b/version/5.15.4+kde+r139-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.4+kde+r139-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.4+kde+r139-2/qt5-base-nostrip.patch b/version/5.15.4+kde+r139-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.4+kde+r139-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.4+kde+r144-2/PKGBUILD b/version/5.15.4+kde+r144-2/PKGBUILD
deleted file mode 100644
index f474844..0000000
--- a/version/5.15.4+kde+r144-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-pkgver=5.15.4+kde+r144
-_qtver=5.15.4
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="0b45b0e13a87f08f5a3f452000aa26734d3c2bdf"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_qtver+kde+r"`git rev-list --count v$_qtver-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.4+kde+r144-2/qt5-base-cflags.patch b/version/5.15.4+kde+r144-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.4+kde+r144-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.4+kde+r144-2/qt5-base-nostrip.patch b/version/5.15.4+kde+r144-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.4+kde+r144-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.4+kde+r146-2/PKGBUILD b/version/5.15.4+kde+r146-2/PKGBUILD
deleted file mode 100644
index 4c6f5a4..0000000
--- a/version/5.15.4+kde+r146-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.4
-pkgver=5.15.4+kde+r146
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="a19d88a641e09e1fa5532c73b86df3bf75acc741"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_qtver+kde+r"`git rev-list --count v$_qtver-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.4+kde+r146-2/qt5-base-cflags.patch b/version/5.15.4+kde+r146-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.4+kde+r146-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.4+kde+r146-2/qt5-base-nostrip.patch b/version/5.15.4+kde+r146-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.4+kde+r146-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.4+kde+r146-3/PKGBUILD b/version/5.15.4+kde+r146-3/PKGBUILD
deleted file mode 100644
index 9645d6e..0000000
--- a/version/5.15.4+kde+r146-3/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.4
-pkgver=5.15.4+kde+r146
-pkgrel=3
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="a19d88a641e09e1fa5532c73b86df3bf75acc741"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.4+kde+r146-3/qt5-base-cflags.patch b/version/5.15.4+kde+r146-3/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.4+kde+r146-3/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.4+kde+r146-3/qt5-base-nostrip.patch b/version/5.15.4+kde+r146-3/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.4+kde+r146-3/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.5+kde+r161-2/PKGBUILD b/version/5.15.5+kde+r161-2/PKGBUILD
deleted file mode 100644
index fe2aa34..0000000
--- a/version/5.15.5+kde+r161-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.5
-pkgver=5.15.5+kde+r161
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="ac023936446acbd66de73b1fd680e6010c99a692"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.5+kde+r161-2/qt5-base-cflags.patch b/version/5.15.5+kde+r161-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.5+kde+r161-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.5+kde+r161-2/qt5-base-nostrip.patch b/version/5.15.5+kde+r161-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.5+kde+r161-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.5+kde+r163-2/PKGBUILD b/version/5.15.5+kde+r163-2/PKGBUILD
deleted file mode 100644
index 5a7b26a..0000000
--- a/version/5.15.5+kde+r163-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.5
-pkgver=5.15.5+kde+r163
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="c772781e57db1da8ac2ed9036aee39137c216017"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.5+kde+r163-2/qt5-base-cflags.patch b/version/5.15.5+kde+r163-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.5+kde+r163-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.5+kde+r163-2/qt5-base-nostrip.patch b/version/5.15.5+kde+r163-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.5+kde+r163-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.5+kde+r170-2/PKGBUILD b/version/5.15.5+kde+r170-2/PKGBUILD
deleted file mode 100644
index 53744d7..0000000
--- a/version/5.15.5+kde+r170-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.5
-pkgver=5.15.5+kde+r170
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="aa0c6db334cf6f0887f42cbd82e4af258126bdc5"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.5+kde+r170-2/qt5-base-cflags.patch b/version/5.15.5+kde+r170-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.5+kde+r170-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.5+kde+r170-2/qt5-base-nostrip.patch b/version/5.15.5+kde+r170-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.5+kde+r170-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.5+kde+r174-2/PKGBUILD b/version/5.15.5+kde+r174-2/PKGBUILD
deleted file mode 100644
index f82d9a9..0000000
--- a/version/5.15.5+kde+r174-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.5
-pkgver=5.15.5+kde+r174
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="742cc6db31bff8e506bfb8db699a843ce60627e4"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.5+kde+r174-2/qt5-base-cflags.patch b/version/5.15.5+kde+r174-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.5+kde+r174-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.5+kde+r174-2/qt5-base-nostrip.patch b/version/5.15.5+kde+r174-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.5+kde+r174-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.5+kde+r180-2/PKGBUILD b/version/5.15.5+kde+r180-2/PKGBUILD
deleted file mode 100644
index 3fdca5c..0000000
--- a/version/5.15.5+kde+r180-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.5
-pkgver=5.15.5+kde+r180
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="663c277cab488c9fd3e0759900a59b87244fde3e"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.5+kde+r180-2/qt5-base-cflags.patch b/version/5.15.5+kde+r180-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.5+kde+r180-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.5+kde+r180-2/qt5-base-nostrip.patch b/version/5.15.5+kde+r180-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.5+kde+r180-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.5+kde+r184-2/PKGBUILD b/version/5.15.5+kde+r184-2/PKGBUILD
deleted file mode 100644
index 6de4799..0000000
--- a/version/5.15.5+kde+r184-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.5
-pkgver=5.15.5+kde+r184
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="96cb9b20c080591f153bad8716f32bf37e36fdc5"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.5+kde+r184-2/qt5-base-cflags.patch b/version/5.15.5+kde+r184-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.5+kde+r184-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.5+kde+r184-2/qt5-base-nostrip.patch b/version/5.15.5+kde+r184-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.5+kde+r184-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.6+kde+r163-2/PKGBUILD b/version/5.15.6+kde+r163-2/PKGBUILD
deleted file mode 100644
index 30ad69a..0000000
--- a/version/5.15.6+kde+r163-2/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.6
-pkgver=5.15.6+kde+r163
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="eeadc036d77b75bec5b7c41869688c7db9a2e221"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'qt5-translations: for some native UI translations'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.6+kde+r163-2/qt5-base-cflags.patch b/version/5.15.6+kde+r163-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.6+kde+r163-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.6+kde+r163-2/qt5-base-nostrip.patch b/version/5.15.6+kde+r163-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.6+kde+r163-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.6+kde+r177-2/PKGBUILD b/version/5.15.6+kde+r177-2/PKGBUILD
deleted file mode 100644
index 9b4f9fc..0000000
--- a/version/5.15.6+kde+r177-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.6
-pkgver=5.15.6+kde+r177
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="411b90bfe5a0c57f526b93f2c01cf089e70266ad"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.6+kde+r177-2/qt5-base-cflags.patch b/version/5.15.6+kde+r177-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.6+kde+r177-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.6+kde+r177-2/qt5-base-nostrip.patch b/version/5.15.6+kde+r177-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.6+kde+r177-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.6+kde+r180-2/PKGBUILD b/version/5.15.6+kde+r180-2/PKGBUILD
deleted file mode 100644
index f2c416f..0000000
--- a/version/5.15.6+kde+r180-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.6
-pkgver=5.15.6+kde+r180
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="23996edc504e9e5b5b0ec907380598bbe4bf591c"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.6+kde+r180-2/qt5-base-cflags.patch b/version/5.15.6+kde+r180-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.6+kde+r180-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.6+kde+r180-2/qt5-base-nostrip.patch b/version/5.15.6+kde+r180-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.6+kde+r180-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.6+kde+r181-2/PKGBUILD b/version/5.15.6+kde+r181-2/PKGBUILD
deleted file mode 100644
index 706b174..0000000
--- a/version/5.15.6+kde+r181-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.6
-pkgver=5.15.6+kde+r181
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="724ef4a9a5d8f982645fda6457515ba160d56dda"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target`
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.6+kde+r181-2/qt5-base-cflags.patch b/version/5.15.6+kde+r181-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.6+kde+r181-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.6+kde+r181-2/qt5-base-nostrip.patch b/version/5.15.6+kde+r181-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.6+kde+r181-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.7+kde+r167-2/PKGBUILD b/version/5.15.7+kde+r167-2/PKGBUILD
deleted file mode 100644
index 65257cd..0000000
--- a/version/5.15.7+kde+r167-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.7
-pkgver=5.15.7+kde+r167
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="98c727f273fc83c24550274bd2728e1aafbd213a"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.7+kde+r167-2/qt5-base-cflags.patch b/version/5.15.7+kde+r167-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.7+kde+r167-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.7+kde+r167-2/qt5-base-nostrip.patch b/version/5.15.7+kde+r167-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.7+kde+r167-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.7+kde+r168-2/PKGBUILD b/version/5.15.7+kde+r168-2/PKGBUILD
deleted file mode 100644
index 4afc94c..0000000
--- a/version/5.15.7+kde+r168-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.7
-pkgver=5.15.7+kde+r168
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="08be11284246455bce4455138ebe396d2d8732a1"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.7+kde+r168-2/qt5-base-cflags.patch b/version/5.15.7+kde+r168-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.7+kde+r168-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.7+kde+r168-2/qt5-base-nostrip.patch b/version/5.15.7+kde+r168-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.7+kde+r168-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.7+kde+r174-2/PKGBUILD b/version/5.15.7+kde+r174-2/PKGBUILD
deleted file mode 100644
index a514a9a..0000000
--- a/version/5.15.7+kde+r174-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.7
-pkgver=5.15.7+kde+r174
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="51258629f2cf37fff8406bf705d79c07fc7135ca"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.7+kde+r174-2/qt5-base-cflags.patch b/version/5.15.7+kde+r174-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.7+kde+r174-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.7+kde+r174-2/qt5-base-nostrip.patch b/version/5.15.7+kde+r174-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.7+kde+r174-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.7+kde+r177-2/PKGBUILD b/version/5.15.7+kde+r177-2/PKGBUILD
deleted file mode 100644
index d4e37d6..0000000
--- a/version/5.15.7+kde+r177-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.7
-pkgver=5.15.7+kde+r177
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="a9e67318e6a8924c4b5461656bcc6a80720ae899"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.7+kde+r177-2/qt5-base-cflags.patch b/version/5.15.7+kde+r177-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.7+kde+r177-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.7+kde+r177-2/qt5-base-nostrip.patch b/version/5.15.7+kde+r177-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.7+kde+r177-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.8+kde+r157-2/PKGBUILD b/version/5.15.8+kde+r157-2/PKGBUILD
deleted file mode 100644
index b0ea642..0000000
--- a/version/5.15.8+kde+r157-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.8
-pkgver=5.15.8+kde+r157
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="9cf586d629a04040c9414c4f9e17abbc65c644eb"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.8+kde+r157-2/qt5-base-cflags.patch b/version/5.15.8+kde+r157-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.8+kde+r157-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.8+kde+r157-2/qt5-base-nostrip.patch b/version/5.15.8+kde+r157-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.8+kde+r157-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.8+kde+r162-2/PKGBUILD b/version/5.15.8+kde+r162-2/PKGBUILD
deleted file mode 100644
index 614c708..0000000
--- a/version/5.15.8+kde+r162-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.8
-pkgver=5.15.8+kde+r162
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="dec44589403c99f96705b607d6fa5423b40463b6"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.8+kde+r162-2/qt5-base-cflags.patch b/version/5.15.8+kde+r162-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.8+kde+r162-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.8+kde+r162-2/qt5-base-nostrip.patch b/version/5.15.8+kde+r162-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.8+kde+r162-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.8+kde+r174-2/PKGBUILD b/version/5.15.8+kde+r174-2/PKGBUILD
deleted file mode 100644
index 4db7863..0000000
--- a/version/5.15.8+kde+r174-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.8
-pkgver=5.15.8+kde+r174
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="e40c42e4910574fd8d1b16e92e438bbbd03cf2d4"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.8+kde+r174-2/qt5-base-cflags.patch b/version/5.15.8+kde+r174-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.8+kde+r174-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.8+kde+r174-2/qt5-base-nostrip.patch b/version/5.15.8+kde+r174-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.8+kde+r174-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.8+kde+r181-2/PKGBUILD b/version/5.15.8+kde+r181-2/PKGBUILD
deleted file mode 100644
index a475c36..0000000
--- a/version/5.15.8+kde+r181-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.8
-pkgver=5.15.8+kde+r181
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="ec1c9c116a16f2cd15587dc861e5d178010b3f99"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.8+kde+r181-2/qt5-base-cflags.patch b/version/5.15.8+kde+r181-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.8+kde+r181-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.8+kde+r181-2/qt5-base-nostrip.patch b/version/5.15.8+kde+r181-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.8+kde+r181-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.8+kde+r183-2/PKGBUILD b/version/5.15.8+kde+r183-2/PKGBUILD
deleted file mode 100644
index c325da8..0000000
--- a/version/5.15.8+kde+r183-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.8
-pkgver=5.15.8+kde+r183
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="38c54b3ff58972fa16810740fc43933620b6dc0d"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.8+kde+r183-2/qt5-base-cflags.patch b/version/5.15.8+kde+r183-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.8+kde+r183-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.8+kde+r183-2/qt5-base-nostrip.patch b/version/5.15.8+kde+r183-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.8+kde+r183-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.8+kde+r185-2/PKGBUILD b/version/5.15.8+kde+r185-2/PKGBUILD
deleted file mode 100644
index 7c025cc..0000000
--- a/version/5.15.8+kde+r185-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.8
-pkgver=5.15.8+kde+r185
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="6c09620dc84900c31a2d307a8640dbc15b1fcfdd"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.8+kde+r185-2/qt5-base-cflags.patch b/version/5.15.8+kde+r185-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.8+kde+r185-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.8+kde+r185-2/qt5-base-nostrip.patch b/version/5.15.8+kde+r185-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.8+kde+r185-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.9+kde+r151-2/PKGBUILD b/version/5.15.9+kde+r151-2/PKGBUILD
deleted file mode 100644
index 51346e0..0000000
--- a/version/5.15.9+kde+r151-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.9
-pkgver=5.15.9+kde+r151
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="84152777a48af444a902bbf4df8b38146171c20d"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.9+kde+r151-2/qt5-base-cflags.patch b/version/5.15.9+kde+r151-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.9+kde+r151-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.9+kde+r151-2/qt5-base-nostrip.patch b/version/5.15.9+kde+r151-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.9+kde+r151-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.9+kde+r152-2/PKGBUILD b/version/5.15.9+kde+r152-2/PKGBUILD
deleted file mode 100644
index fa61ea7..0000000
--- a/version/5.15.9+kde+r152-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.9
-pkgver=5.15.9+kde+r152
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="2103f2487f709dd9546c503820d9ad509e9a63b3"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.9+kde+r152-2/qt5-base-cflags.patch b/version/5.15.9+kde+r152-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.9+kde+r152-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.9+kde+r152-2/qt5-base-nostrip.patch b/version/5.15.9+kde+r152-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.9+kde+r152-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.9+kde+r153-2/PKGBUILD b/version/5.15.9+kde+r153-2/PKGBUILD
deleted file mode 100644
index d1e8af4..0000000
--- a/version/5.15.9+kde+r153-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.9
-pkgver=5.15.9+kde+r153
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="e6c8aa2426ef5bd575f85aae530322b145b49006"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.9+kde+r153-2/qt5-base-cflags.patch b/version/5.15.9+kde+r153-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.9+kde+r153-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.9+kde+r153-2/qt5-base-nostrip.patch b/version/5.15.9+kde+r153-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.9+kde+r153-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.9+kde+r154-2/PKGBUILD b/version/5.15.9+kde+r154-2/PKGBUILD
deleted file mode 100644
index f5c642c..0000000
--- a/version/5.15.9+kde+r154-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.9
-pkgver=5.15.9+kde+r154
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="a196623892558623e467f20b67edb78794252a09"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.9+kde+r154-2/qt5-base-cflags.patch b/version/5.15.9+kde+r154-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.9+kde+r154-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.9+kde+r154-2/qt5-base-nostrip.patch b/version/5.15.9+kde+r154-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.9+kde+r154-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/version/5.15.9+kde+r155-2/PKGBUILD b/version/5.15.9+kde+r155-2/PKGBUILD
deleted file mode 100644
index 4e123fb..0000000
--- a/version/5.15.9+kde+r155-2/PKGBUILD
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/qt5-base
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=qt5-base
-_basever=5.15.9
-pkgver=5.15.9+kde+r155
-pkgrel=2
-pkgdesc="A cross-platform application and UI framework"
-url='https://www.qt.io'
-
-pkgname=(
-    'qt5-base'
-    'qt5-xcb-private-headers'
-)
-
-track="commit"
-target="df809fd0b505b61d718fe1dc7fe19a79f9336cd9"
-source=(
-    "git+https://invent.kde.org/qt/qt/${pkgbase/5-/}#${track}=${target}"
-    qt5-base-cflags.patch
-    qt5-base-nostrip.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'libfbclient'
-    'mariadb-libs'
-    'unixodbc'
-    'postgresql-libs'
-    'alsa-lib'
-    'gst-plugins-base-libs'
-    'gtk3'
-    'libpulse'
-    'cups'
-    'freetds'
-    'vulkan-headers'
-    'git'
-)
-
-#options=('debug')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-depends=(
-    'libjpeg-turbo'
-    'xcb-util-keysyms'
-    'xcb-util-renderutil'
-    'libgl'
-    'fontconfig'
-    'xdg-utils'
-    'shared-mime-info'
-    'xcb-util-wm'
-    'libxrender'
-    'libxi'
-    'sqlite'
-    'xcb-util-image'
-    'mesa'
-    'tslib'
-    'libinput'
-    'libxkbcommon-x11'
-    'libproxy'
-    'libcups'
-    'double-conversion'
-    'md4c'
-)
-
-optdepends=(
-    'qt5-svg: to use SVG icon themes'
-    'qt5-wayland: to run Qt applications in a Wayland session'
-    'postgresql-libs: PostgreSQL driver'
-    'mariadb-libs: MariaDB driver'
-    'unixodbc: ODBC driver'
-    'libfbclient: Firebird/iBase driver'
-    'freetds: MS SQL driver'
-    'gtk3: GTK platform plugin'
-    'perl: for fixqt4hearders and syncqt'
-)
-
-groups=(
-    'qt'
-    'qt5'
-)
-
-conflicts=(
-    'qtchooser'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-pkgver() {
-    cd ${pkgbase/5-}
-    echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$target` | sed -e 's|+kde+r0||'
-}
-
-prepare() {
-    cd ${pkgbase/5-}
-
-    patch -p1 < ../qt5-base-cflags.patch ## Use system CFLAGS in qmake
-    patch -p1 < ../qt5-base-nostrip.patch ## Don't strip binaries with qmake
-}
-
-#--------
-# BUILD ]
-
-build() {
-    cd ${pkgbase/5-}
-
-    local configure_options=(
-        -confirm-license -opensource -v
-        -prefix /usr
-        -docdir /usr/share/doc/qt
-        -headerdir /usr/include/qt
-        -archdatadir /usr/lib/qt
-        -datadir /usr/share/qt
-        -sysconfdir /etc/xdg
-        -examplesdir /usr/share/doc/qt/examples
-        -plugin-sql-sqlite
-        -plugin-sql-mysql
-        -plugin-sql-psql
-        -plugin-sql-odbc
-        -plugin-sql-ibase
-        -system-sqlite
-        -openssl-linked
-        -nomake examples
-        -no-rpath
-        -dbus-linked
-        -system-harfbuzz
-        -no-mimetype-database
-        -no-use-gold-linker
-        -no-reduce-relocations
-        -no-strip
-        -ltcg
-    )
-
-    ./configure "${configure_options[@]}"
-
-    ## No configure flag for fat static libs with lto
-    bin/qmake CONFIG+=fat-static-lto -- -redo
-
-    make
-}
-
-#----------
-# PACKAGE ]
-
-package_qt5-base() {
-    pkgdesc="A cross-platform application and UI framework"
-    depends+=(
-        'qt5-translations'
-    )
-
-    cd ${pkgbase/5-}
-    make INSTALL_ROOT="$pkgdir" install
-
-    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir"/usr/lib -type f -name '*.prl' \
-     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-    ## Fix wrong qmake path in pri file
-    sed -i "s|$srcdir/${pkgbase/5-}|/usr|" \
-     "$pkgdir"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-    ## Symlinks for backwards compatibility
-    for b in "$pkgdir"/usr/bin/*; do
-     ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-    done
-}
-
-package_qt5-xcb-private-headers() {
-    pkgdesc="Private headers for Qt5 Xcb"
-    depends=(
-        "qt5-base=$pkgver"
-    )
-
-    cd ${pkgbase/5-}
-    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
-
-#--------------------
-# ARCH LICENSE AUTH ]
-
-arch=(x86_64)
-license=(GPL3 LGPL3 FDL custom)
-
-sha512sums=('')
diff --git a/version/5.15.9+kde+r155-2/qt5-base-cflags.patch b/version/5.15.9+kde+r155-2/qt5-base-cflags.patch
deleted file mode 100644
index 3325016..0000000
--- a/version/5.15.9+kde+r155-2/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/version/5.15.9+kde+r155-2/qt5-base-nostrip.patch b/version/5.15.9+kde+r155-2/qt5-base-nostrip.patch
deleted file mode 100644
index 9aead7f..0000000
--- a/version/5.15.9+kde+r155-2/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
-
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
-- 
GitLab