gentoo resync : 12.05.2022

6 files changed, 2 insertions, 479 deletions

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 0488ce3d93b0..f598d6af9a4c 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,10 +1,5 @@
-AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
-AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2
-AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097
 AUX qtcore-5.15.3-pthread.patch 1570 BLAKE2B f484f7aab89ba92bc33861abc1a4c5fe5f15139a7b14bb6a84a02d8f064dd6465d6ad3ea39ee35cdbb2dae6a2879a824b23068b8e94d3a6ebb2e6639b11a1612 SHA512 492199fdd7f7252c9ec03ed735a015df51e8de7aa2b20b2a4bb391a133e1dd0d88ce9dbafb600071e07abc9b426a9040f64a738361b71dd891186a59087515e4
-DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtcore-5.15.2-r14.ebuild 2325 BLAKE2B afb40aecf1e4889e4ddb266b6798c926d5485989248f4af3565759956c93a77aad0209a015ccacb5368b0085292029c641720235ea2276849f123d698a933677 SHA512 daba0cc3491ae99ac71aab82f56666dca233c69005d600a69fb4f59b82a7c561dc84fcd8d8ebcaa96bb808488d59343abc7f3b259bb4aecbc86334032e95575a
-EBUILD qtcore-5.15.3.ebuild 2220 BLAKE2B 74f834c680f4d78f651fe49a7347e5705d8374552a82aa42721b39f0de93e2e14208742f715175751a412a87550b5eee3ad16fc9bb49e6ff67d2b33e3c81395b SHA512 02ee6c200fba07082dd92fae3edfb99c77695754286aec801cd0436b3f09a2feaa4edc4b075d416db3ebf6c5cd1421073dfa2b866ee74bb05d9f8e4002665da2
+EBUILD qtcore-5.15.3.ebuild 2218 BLAKE2B a3ec0dc1be8d59c8b5ef97e68b42b68311f1658ee1ddebf3abaef05838bbdb388eec2823e9d057222e9f0d3e4de6355de4c9c5f37678443f411fdfbb7509dd58 SHA512 19f5af7688e875dd7a029034c45a13b1bfde5d9a9fa190d4cea9cb5f6fc7d7e7cfcd237e0852c9fde15184fd6ad26791d70599905a9df976c5b6d3c562d38f78
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
deleted file mode 100644
index 30b5abc39759..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 9 Feb 2020 11:45:00 +0100
-Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14
-
-In upstream commit:
-
-https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
-
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument
-IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for
-QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland.
-During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some
-reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
-cmake files regenerated, leading to cmake errors like:
-
-https://bugs.gentoo.org/703306
-https://bugs.gentoo.org/705198
-
-From mkspecs/features/create_cmake.prf:
-
-# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
-# functions whether a Configuration specific generator expression needs to be added to the values
-# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
-# configuration specific values. For singular builds (only release or only debug), we want the
-# values to be applied regardless of the configuration.
-# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
-# build a Debug configuration of an application, even if Qt was built in a Release configuration.
-
-qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
-optional and default to FALSE.
-
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-01-23 13:37:32.000000000 +0100
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-02-09 15:15:21.156219814 +0100
-@@ -538,8 +538,14 @@
- 
-     file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
- 
--    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
--          IsDebugAndRelease)
-+    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
-+        set(IsDebugAndRelease FALSE)
-+        set (list_var ${ARGN})
-+        list(LENGTH list_var num_extra_arg)
-+        if (${num_extra_arg} GREATER 0)
-+            list(GET list_var 0 IsDebugAndRelease)
-+        endif()
-+
-         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
deleted file mode 100644
index 1c8f1e89e7d5..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-From c337f6fae51b987ce7dbed1fd9bea41e6073efbb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sat, 10 Oct 2020 19:26:13 +0200
-Subject: [PATCH 1/2] Revert "Cache system zone ID when fetched from the
- file-system"
-
-This reverts commit c70ce3d042025c858faffe661f85d2482a2a0d8c.
----
- src/corelib/time/qtimezoneprivate_tz.cpp | 205 +++++++----------------
- 1 file changed, 64 insertions(+), 141 deletions(-)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index c5c70b7364..01f9a6cce0 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -1,6 +1,5 @@
- /****************************************************************************
- **
--** Copyright (C) 2020 The Qt Company Ltd.
- ** Copyright (C) 2019 Crimson AS <info@crimson.no>
- ** Copyright (C) 2013 John Layt <jlayt@kde.org>
- ** Contact: https://www.qt.io/licensing/
-@@ -43,19 +42,18 @@
- #include "qtimezoneprivate_p.h"
- #include "private/qlocale_tools_p.h"
- 
--#include <QtCore/QDataStream>
--#include <QtCore/QDateTime>
- #include <QtCore/QFile>
--#include <QtCore/QHash>
- #include <QtCore/QMutex>
-+#include <QtCore/QHash>
-+#include <QtCore/QDataStream>
-+#include <QtCore/QDateTime>
- 
- #include <qdebug.h>
--#include <qplatformdefs.h>
- 
- #include <algorithm>
- #include <errno.h>
- #include <limits.h>
--#ifndef Q_OS_INTEGRITY
-+#if !defined(Q_OS_INTEGRITY)
- #include <sys/param.h> // to use MAXSYMLINKS constant
- #endif
- #include <unistd.h>    // to use _SC_SYMLOOP_MAX constant
-@@ -1102,146 +1100,28 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::previousTransition(qint64 beforeMSecs
-     return last > tranCache().cbegin() ? dataForTzTransition(*--last) : invalidData();
- }
- 
--bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const
--{
--    return tzZones->contains(ianaId);
--}
--
--QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const
--{
--    QList<QByteArray> result = tzZones->keys();
--    std::sort(result.begin(), result.end());
--    return result;
--}
--
--QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const
-+static long getSymloopMax()
- {
--    // TODO AnyCountry
--    QList<QByteArray> result;
--    for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) {
--        if (it.value().country == country)
--            result << it.key();
--    }
--    std::sort(result.begin(), result.end());
--    return result;
--}
--
--// Getting the system zone's ID:
--
--namespace {
--class ZoneNameReader : public QObject
--{
--public:
--    QByteArray name()
--    {
--        /* Assumptions:
--           a) Systems don't change which of localtime and TZ they use without a
--              reboot.
--           b) When they change, they use atomic renames, hence a new device and
--              inode for the new file.
--           c) If we change which *name* is used for a zone, while referencing
--              the same final zoneinfo file, we don't care about the change of
--              name (e.g. if Europe/Oslo and Europe/Berlin are both symlinks to
--              the same CET file, continuing to use the old name, after
--              /etc/localtime changes which of the two it points to, is
--              harmless).
--
--           The alternative would be to use a file-system watcher, but they are a
--           scarce resource.
--         */
--        const StatIdent local = identify("/etc/localtime");
--        const StatIdent tz = identify("/etc/TZ");
--        if (!m_name.isEmpty() && m_last.isValid() && (m_last == local || m_last == tz))
--            return m_name;
--
--        m_name = etcLocalTime();
--        if (!m_name.isEmpty()) {
--            m_last = local;
--            return m_name;
--        }
--
--        m_name = etcTZ();
--        m_last = m_name.isEmpty() ? StatIdent() : tz;
--        return m_name;
--    }
--
--
--private:
--    QByteArray m_name;
--    struct StatIdent
--    {
--        static constexpr unsigned long bad = ~0ul;
--        unsigned long m_dev, m_ino;
--        StatIdent() : m_dev(bad), m_ino(bad) {}
--        StatIdent(const QT_STATBUF &data) : m_dev(data.st_dev), m_ino(data.st_ino) {}
--        bool isValid() { return m_dev != bad || m_ino != bad; }
--        bool operator==(const StatIdent &other)
--        { return other.m_dev == m_dev && other.m_ino == m_ino; }
--    };
--    StatIdent m_last;
--
--    static StatIdent identify(const char *path)
--    {
--        QT_STATBUF data;
--        return QT_STAT(path, &data) == -1 ? StatIdent() : StatIdent(data);
--    }
--
--    static QByteArray etcLocalTime()
--    {
--        // On most distros /etc/localtime is a symlink to a real file so extract
--        // name from the path
--        const QLatin1String zoneinfo("/zoneinfo/");
--        QString path = QStringLiteral("/etc/localtime");
--        long iteration = getSymloopMax();
--        // Symlink may point to another symlink etc. before being under zoneinfo/
--        // We stop on the first path under /zoneinfo/, even if it is itself a
--        // symlink, like America/Montreal pointing to America/Toronto
--        do {
--            path = QFile::symLinkTarget(path);
--            int index = path.indexOf(zoneinfo);
--            if (index >= 0) // Found zoneinfo file; extract zone name from path:
--                return path.midRef(index + zoneinfo.size()).toUtf8();
--        } while (!path.isEmpty() && --iteration > 0);
--
--        return QByteArray();
--    }
--
--    static QByteArray etcTZ()
--    {
--        // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
--        const QString path = QStringLiteral("/etc/TZ");
--        QFile zone(path);
--        if (zone.open(QIODevice::ReadOnly))
--            return zone.readAll().trimmed();
--
--        return QByteArray();
--    }
--
--    // Any chain of symlinks longer than this is assumed to be a loop:
--    static long getSymloopMax()
--    {
--#ifdef SYMLOOP_MAX
--        // If defined, at runtime it can only be greater than this, so this is a safe bet:
--        return SYMLOOP_MAX;
-+#if defined(SYMLOOP_MAX)
-+    return SYMLOOP_MAX; // if defined, at runtime it can only be greater than this, so this is a safe bet
- #else
--        errno = 0;
--        long result = sysconf(_SC_SYMLOOP_MAX);
--        if (result >= 0)
--            return result;
--        // result is -1, meaning either error or no limit
--        Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX
--
--        // therefore we can make up our own limit
--#  ifdef MAXSYMLINKS
--        return MAXSYMLINKS;
-+    errno = 0;
-+    long result = sysconf(_SC_SYMLOOP_MAX);
-+    if (result >= 0)
-+        return result;
-+    // result is -1, meaning either error or no limit
-+    Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX
-+
-+    // therefore we can make up our own limit
-+#  if defined(MAXSYMLINKS)
-+    return MAXSYMLINKS;
- #  else
--        return 8;
-+    return 8;
- #  endif
- #endif
--    }
--};
- }
- 
-+// TODO Could cache the value and monitor the required files for any changes
- QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
- {
-     // Check TZ env var first, if not populated try find it
-@@ -1256,9 +1136,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
-     else if (ianaId.startsWith(':'))
-         ianaId = ianaId.mid(1);
- 
-+    // On most distros /etc/localtime is a symlink to a real file so extract name from the path
-+    if (ianaId.isEmpty()) {
-+        const QLatin1String zoneinfo("/zoneinfo/");
-+        QString path = QFile::symLinkTarget(QStringLiteral("/etc/localtime"));
-+        int index = -1;
-+        long iteration = getSymloopMax();
-+        // Symlink may point to another symlink etc. before being under zoneinfo/
-+        // We stop on the first path under /zoneinfo/, even if it is itself a
-+        // symlink, like America/Montreal pointing to America/Toronto
-+        while (iteration-- > 0 && !path.isEmpty() && (index = path.indexOf(zoneinfo)) < 0)
-+            path = QFile::symLinkTarget(path);
-+        if (index >= 0) {
-+            // /etc/localtime is a symlink to the current TZ file, so extract from path
-+            ianaId = path.midRef(index + zoneinfo.size()).toUtf8();
-+        }
-+    }
-+
-+    // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
-     if (ianaId.isEmpty()) {
--        thread_local static ZoneNameReader reader;
--        ianaId = reader.name();
-+        QFile zone(QStringLiteral("/etc/TZ"));
-+        if (zone.open(QIODevice::ReadOnly))
-+            ianaId = zone.readAll().trimmed();
-     }
- 
-     // Give up for now and return UTC
-@@ -1268,4 +1167,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
-     return ianaId;
- }
- 
-+bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const
-+{
-+    return tzZones->contains(ianaId);
-+}
-+
-+QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const
-+{
-+    QList<QByteArray> result = tzZones->keys();
-+    std::sort(result.begin(), result.end());
-+    return result;
-+}
-+
-+QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const
-+{
-+    // TODO AnyCountry
-+    QList<QByteArray> result;
-+    for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) {
-+        if (it.value().country == country)
-+            result << it.key();
-+    }
-+    std::sort(result.begin(), result.end());
-+    return result;
-+}
-+
- QT_END_NAMESPACE
--- 
-2.28.0
-
diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch
deleted file mode 100644
index 611c979a469c..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ffc9093a199a542791920b30d1835c3248920aa0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sat, 10 Oct 2020 19:26:35 +0200
-Subject: [PATCH 2/2] Revert "Purge two old time-zone lookup fallbacks"
-
-This reverts commit b0383cbd388336f698ceeac11a4f50cdff931dd9.
----
- src/corelib/time/qtimezoneprivate_tz.cpp | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index 01f9a6cce0..eea6f5e962 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -1153,6 +1153,29 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
-         }
-     }
- 
-+    // On Debian Etch up to Jessie, /etc/localtime is a copy of the relevant
-+    // zoneinfo file, whose name is recorded in /etc/timezone:
-+    if (ianaId.isEmpty()) {
-+        QFile tzif(QStringLiteral("/etc/timezone"));
-+        if (tzif.open(QIODevice::ReadOnly))
-+            ianaId = tzif.readAll().trimmed();
-+    }
-+
-+    // On some Red Hat distros /etc/localtime is real file with name held in /etc/sysconfig/clock
-+    // in a line like ZONE="Europe/Oslo" or TIMEZONE="Europe/Oslo"
-+    if (ianaId.isEmpty()) {
-+        QFile tzif(QStringLiteral("/etc/sysconfig/clock"));
-+        if (tzif.open(QIODevice::ReadOnly)) {
-+            while (ianaId.isEmpty() && !tzif.atEnd()) {
-+                const QByteArray line(tzif.readLine().trimmed());
-+                if (line.startsWith("ZONE="))
-+                    ianaId = line.mid(6, line.length() - 7);
-+                else if (line.startsWith("TIMEZONE="))
-+                    ianaId = line.mid(10, line.length() - 11);
-+            }
-+        }
-+    }
-+
-     // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
-     if (ianaId.isEmpty()) {
-         QFile zone(QStringLiteral("/etc/TZ"));
--- 
-2.28.0
-
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
deleted file mode 100644
index 3ad237c5094d..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtchooser-66-r1
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
-	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-)
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtcore/qtcore-5.15.3.ebuild b/dev-qt/qtcore/qtcore-5.15.3.ebuild
index 5de04b73f1f6..fca2881a9617 100644
--- a/dev-qt/qtcore/qtcore-5.15.3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="icu old-kernel systemd"