gentoo auto-resync : 18:12:2024 - 06:30:11

29 files changed, 18 insertions, 870 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 27216c5e4c28..5ca558b463f6 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index e9b60fc06842..13be24091eba 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.8.10.tar.xz 1839380 BLAKE2B 72ff400e1aad5bcb04e5dd3fb43f7767fad47e38cf628382cd5ffd5a204efc4de4f626027dddbbc7e10f80f8eaee0bcdf9792d9d012256366920f7ae0cffcb15 SHA512 f801f5b77cbc55074f73dc95b29fff7b5e1b13b99641f6e397788ad9f31a29793ed4e8e5bd373122c790ef90627e8f9d6d5e271051c1767a479a85c55cd82bc1
-EBUILD compose-tables-1.8.10.ebuild 1017 BLAKE2B d64e72d6507cb1139ad45634de8165a4cc6cc4ed8bd01eabd6d307f4ee91e6c1ed45e56e68698d66ac6e71183c4e4f1632d32d0e38631939fff5ac767dd89ed3 SHA512 59da239f50fa1c7c2679bfb4a5a19a87e744ea29629fe19b38131d5dd42d8964179adaf229f5bc2359ab0943fef219506ea1c90cf207f2dc86a5cb46e63fe2b0
+EBUILD compose-tables-1.8.10.ebuild 994 BLAKE2B 22c9275efabffb0e4694f77998b355d5f527ab7dba5a023f868aafde0a4bc4599540faee6b10a8c0c4869ff046dc74f487a59232536f376043f426d603df67c9 SHA512 633767ff4b236e31e428b6f7c2c8e8e9b3ae0659f3060e60f91f91e243e55e9c48f97c5eb485a116ad9d618cbd6f2fcf1544d924e13ba64a981cb72635aafe80
 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-misc/compose-tables/compose-tables-1.8.10.ebuild b/x11-misc/compose-tables/compose-tables-1.8.10.ebuild
index 53c4e8c44bce..3e5342f52cfc 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.10.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.10.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 XORG_MULTILIB=no
-XORG_TARBALL_SUFFIX=xz
 inherit xorg-3
 
 # Note: please bump this with x11-libs/libX11
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index 317afcdca9ae..222fa2f2e52f 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -1,9 +1,4 @@
-AUX copyq-7.1.0-fix-gpg-2.1-support.patch 20025 BLAKE2B faab876bfd8813afea0ed2f9e822e4604cf1813233af86bd9a49ee54ff0fc121333b9a7e8aa549c9a39751cd9cb4f12b73c7b8bfd714f00715a93a8acc7a553f SHA512 d1022e3141273d1bcd1bf85822e1113cc03503c740e27f38453d1e29c8d5524e8f9dc3be4b41b82db9e5cdb845f66dcf234aac207556ca80275c63e1bda87d66
-AUX copyq-7.1.0-fix-qt-6.6.0-build.patch 1671 BLAKE2B f5e563ff590ee05ae09f37887e2ce6e72000ac13f37ccfcff7a7f9cfece2d83160fa2e8c462087f2eed377601f87bb5bc8469d2ef6734e375e662838b889356c SHA512 773b31a7976358be31a09aed93d2eca12768f8c3a8541b822e833cef409f39eb26819db2fd49ce7e2eec7b8419e0ed60bbe92c25f69de2f15a9a15fd6fa812aa
-AUX copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch 3822 BLAKE2B f95dfe294136907ee0f22d8f9810989928da18642ab674da9725daa029d75adebe4b8c5fd9d71a92298bd46b464ed9b20a6a12c2689f6f96c09742c1fda5d96b SHA512 415a24815233668e51303b3188bde028f0cfcb9483f92ec143a4350d2130f2b4752f704aa5ee27997be1ce44c3dabf2a384a7fb97756367a6be1029a10e04ec0
 AUX copyq-7.1.0-support-plugin-dir-envvar-r1.patch 782 BLAKE2B 9cb80e575a08dad54c54e8144fa06f45691ed5914d42af07073e3882930a636a0ac1557563d2c559d20f73525374c79d3a2523b6d5f24807b9032f33e3f0b362 SHA512 3d03c47873a3a2940ce5a239d620a46d63bb28a3f0ff0f547af247f74365403b52e1a91b402cbb64921c31bc4d6fff2f7e725b71edd3ea298058ad3a2d514a25
-DIST copyq-7.1.0.tar.gz 3351093 BLAKE2B 758271f6bb54760372b8b5ab84de7c91af874bd72a22c8c22d338705869eab5500fde90808b4bf1288f8bdbad11163283637b81d85c09ccf0d734286dee605b6 SHA512 4320095ab75c361cc3d553c7817951eb6e74d47223f62bf6c1722e0f0b0d3ff59a1762354cf46fe0de064d516d60a467bff9ad9143b12016fc3f9e62139d3909
 DIST copyq-9.1.0.tar.gz 3417507 BLAKE2B 582b532cdc0c01976fa52b01b3656902fc392ce5785145230efe7f42da8920553161e8bd44b1fcbd9ba2f7d4a8169ac017474f1dd8a34874aec1919e442326a6 SHA512 d87964b876de28be860a17490d9816f5224a25565f84916ee4ca39f83d2e7c5d57dafdf9f54667c43fd93d232e1e1f1f32064e6435aad6abab086398e6ae246d
-EBUILD copyq-7.1.0-r1.ebuild 3630 BLAKE2B 1524647e6231a99ed85be4c954a36092a2318321938617b1a8a4f93de1cf3c3f7bdbca4541d92fb8f6c84cad125b2565105fb53c44a668b4605a4acbd4e75483 SHA512 8d86cfb0d90fb9a9facd2648bfd69786a98a260758724f192e154c1eb02389ec7685a9c8aec77283b20dd196bb724b33951d568d5c2949daadd707cd09516529
 EBUILD copyq-9.1.0.ebuild 2258 BLAKE2B 2a325a51af0ec3a5ba11fca33286732876da4191fcc21cecb1071aec86bed7905b475b9b3363d0d52024dbf3de8f5c7dd0af403a4a51bccc9d5aa4622a1cf7fb SHA512 7eced274eb6dc839098a1b2682babe5707fd83460fb5e41dfb2bec3a9faffc0315a6bfb0be7990b3be10aef90b078dc2824c6f1b72d441577d43b5b50a389941
 MISC metadata.xml 429 BLAKE2B 22f09cc6c63f32d0d0bcc5dc2cf7fb8d437653e0358ba30aeb3ab79978cafd9ea971fb0f56931744146e5ab7a16401e5f366d31f91ffba52ca6c2c26c1ba5931 SHA512 32f0a4a4c0065463ae826511758b42f7a2c815a6d49657dec47560b9510f21d44fe0d6f397922998fd3ad022e9b4fa88c45babdd9aa3874d8db0cfdbab7813d8
diff --git a/x11-misc/copyq/copyq-7.1.0-r1.ebuild b/x11-misc/copyq/copyq-7.1.0-r1.ebuild
deleted file mode 100644
index 85ed9029ecee..000000000000
--- a/x11-misc/copyq/copyq-7.1.0-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake optfeature virtualx xdg
-
-DESCRIPTION="Clipboard manager with advanced features"
-HOMEPAGE="
-	https://hluk.github.io/CopyQ/
-	https://github.com/hluk/CopyQ/
-"
-SRC_URI="https://github.com/hluk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/CopyQ-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="notification qt6 test"
-# Native notifications are not supported with Qt 6
-# (Bumpers please check when this requirement is lifted).
-# src/notifications.cmake
-REQUIRED_USE="notification? ( !qt6 )"
-
-RDEPEND="
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXtst
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwayland:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		notification? ( kde-frameworks/knotifications:5 )
-		test? ( dev-qt/qttest:5 )
-	)
-	qt6? (
-		dev-qt/qtbase:6=[X,gui,network,widgets,xml(+)]
-		dev-qt/qtdeclarative:6
-		dev-qt/qtsvg:6
-		dev-qt/qtwayland:6
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:0
-	!qt6? (
-		dev-qt/linguist-tools:5
-		dev-qt/qtwaylandscanner:5
-	)
-	qt6? (
-		dev-qt/qttools:6[linguist]
-		dev-util/wayland-scanner
-	)
-	test? (
-		app-crypt/gnupg
-		x11-wm/openbox
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/copyq-7.1.0-fix-qt-6.6.0-build.patch"
-	"${FILESDIR}/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch"
-	"${FILESDIR}/copyq-7.1.0-fix-gpg-2.1-support.patch"
-	"${FILESDIR}/copyq-7.1.0-support-plugin-dir-envvar-r1.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# FAIL!  : Tests::actionDialogAccept() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE.
-	# FAIL!  : Tests::actionDialogSelection() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE.
-	# FAIL!  : Tests::actionDialogSelectionInputOutput() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE.
-	# FAIL!  : Tests::commandShowAt() 'NO_ERRORS(m_test->waitOnOutput((Args() << "visible"), toByteArray("true\n")))' returned FALSE.
-	sed -Ei -e '
-	/Tests::(actionDialog(Accept|Selection(|InputOutput))|commandShow)/,/}/ {
-	/^\s*\{/ a \
-	#if QT_VERSION < QT_VERSION_CHECK(6,0,0)\
-	SKIP("Broken on qt5");\
-	#endif
-	}' src/tests/tests.cpp || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPLUGIN_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins"
-		-DWITH_NATIVE_NOTIFICATIONS=$(usex notification)
-		-DWITH_QT6=$(usex qt6)
-		-DWITH_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-my_src_test() {
-	# Don't rerun tests and more logs
-	local -x COPYQ_TESTS_RERUN_FAILED=0
-	local -x COPYQ_LOG_LEVEL=DEBUG
-
-	# Skip test that require network
-	local -x COPYQ_TESTS_NO_NETWORK=1
-
-	# Less noise from trying the wayland plugin
-	local -x QT_QPA_PLATFORM=xcb
-
-	# Make sure copyq doesn't use system installed plugins which may be incompatible.
-	local -x COPYQ_PLUGIN_DIR="${BUILD_DIR}/plugins"
-
-	# In case the users current system confuses the notification integration
-	unset KDE_FULL_SESSION XDG_CURRENT_DESKTOP
-
-	mkdir "${HOME}"/.gnupg || die
-
-	ebegin "Starting Openbox"
-	openbox & # upstream uses Openbox and it doesn't fail like IceWM
-	sleep 5
-	eend 0
-
-	"${BUILD_DIR}"/copyq tests
-
-	return $?
-}
-
-src_test() {
-	virtx my_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "encryption support" app-crypt/gnupg
-}
diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch
deleted file mode 100644
index b06e7e759b84..000000000000
--- a/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch
+++ /dev/null
@@ -1,558 +0,0 @@
-https://github.com/hluk/CopyQ/pull/2471
-https://github.com/hluk/CopyQ/issues/2463
-https://github.com/hluk/CopyQ/commit/a7a891e1f84c6c046a7bfc904c5fc6ebb98dec94
-
-From a7a891e1f84c6c046a7bfc904c5fc6ebb98dec94 Mon Sep 17 00:00:00 2001
-From: Lukas Holecek <hluk@email.cz>
-Date: Wed, 20 Sep 2023 19:42:08 +0200
-Subject: [PATCH] itemencrypted: Fix managing keys with gpg 2.1 and above
- (#2471)
-
-* itemencrypted: Fix managing keys with gpg 2.1 and above
-
-Fixes #2463, #1208
-
-* Tests: Avoid skipping itemencrypted tests if gpg is not found
-
-* Windows: Fix running itemencrypted plugin tests
-
-* itemencrypted: Fix error logging
-
-* Ensure config directory exists
-
-* itemencrypted: Fix handling native/non-native key paths
-
-* Appveyor: Fix stuck job waiting on gpg-agent
---- a/plugins/itemencrypted/itemencrypted.cpp
-+++ b/plugins/itemencrypted/itemencrypted.cpp
-@@ -57,20 +57,23 @@ bool waitOrTerminate(QProcess *p, int timeoutMs)
- bool verifyProcess(QProcess *p, int timeoutMs = 30000)
- {
-     if ( !waitOrTerminate(p, timeoutMs) ) {
--        log( "ItemEncrypt ERROR: Process timed out; stderr: " + p->readAllStandardError(), LogError );
-+        log( QStringLiteral("ItemEncrypt: Process timed out; stderr: %1")
-+             .arg(QString::fromUtf8(p->readAllStandardError())), LogError );
-         return false;
-     }
- 
-     const int exitCode = p->exitCode();
-     if ( p->exitStatus() != QProcess::NormalExit ) {
--        log( "ItemEncrypt ERROR: Failed to run GnuPG: " + p->errorString(), LogError );
-+        log( QStringLiteral("ItemEncrypt: Failed to run GnuPG: %1")
-+             .arg(p->errorString()), LogError );
-         return false;
-     }
- 
-     if (exitCode != 0) {
-         const QString errors = p->readAllStandardError();
-         if ( !errors.isEmpty() )
--            log( "ItemEncrypt ERROR: GnuPG stderr:\n" + errors, LogError );
-+            log( QStringLiteral("ItemEncrypt: GnuPG stderr:\n%1")
-+                 .arg(errors), LogError );
-         return false;
-     }
- 
-@@ -88,55 +91,106 @@ QString getGpgVersionOutput(const QString &executable) {
-     return p.readAllStandardOutput();
- }
- 
--bool checkGpgExecutable(const QString &executable)
-+struct GpgVersion {
-+    int major;
-+    int minor;
-+};
-+
-+GpgVersion parseVersion(const QString &versionOutput)
- {
--    const auto versionOutput = getGpgVersionOutput(executable);
--    return versionOutput.contains(" 2.");
-+    const int lineEndIndex = versionOutput.indexOf('\n');
-+#if QT_VERSION < QT_VERSION_CHECK(5,15,2)
-+    const QStringRef firstLine = versionOutput.midRef(0, lineEndIndex);
-+#else
-+    const auto firstLine = QStringView{versionOutput}.mid(0, lineEndIndex);
-+#endif
-+    const QRegularExpression versionRegex(QStringLiteral(R"( (\d+)\.(\d+))"));
-+    const QRegularExpressionMatch match = versionRegex.match(firstLine);
-+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
-+    const int major = match.hasMatch() ? match.capturedView(1).toInt() : 0;
-+    const int minor = match.hasMatch() ? match.capturedView(2).toInt() : 0;
-+#else
-+    const int major = match.hasMatch() ? match.capturedRef(1).toInt() : 0;
-+    const int minor = match.hasMatch() ? match.capturedRef(2).toInt() : 0;
-+#endif
-+    return GpgVersion{major, minor};
- }
- 
-+class GpgExecutable {
-+public:
-+    GpgExecutable() = default;
-+
-+    explicit GpgExecutable(const QString &executable)
-+        : m_executable(executable)
-+    {
-+        const auto versionOutput = getGpgVersionOutput(executable);
-+        if ( !versionOutput.isEmpty() ) {
-+            COPYQ_LOG_VERBOSE(
-+                QStringLiteral("ItemEncrypt INFO: '%1 --version' output: %2")
-+                .arg(executable, versionOutput) );
-+
-+            const GpgVersion version = parseVersion(versionOutput);
-+            m_isSupported = version.major >= 2;
-+            COPYQ_LOG( QStringLiteral("ItemEncrypt INFO: %1 gpg version: %2.%3")
-+                    .arg(m_isSupported ? "Supported" : "Unsupported")
-+                    .arg(version.major)
-+                    .arg(version.minor) );
-+
-+            const bool needsSecring = version.major == 2 && version.minor == 0;
-+
-+            const QString path = getConfigurationFilePath("");
-+            m_pubring = path + ".pub";
-+            m_pubringNative = QDir::toNativeSeparators(m_pubring);
-+            if (needsSecring) {
-+                m_secring = path + ".sec";
-+                m_secringNative = QDir::toNativeSeparators(m_secring);
-+            }
-+
- #ifdef Q_OS_WIN
--bool checkUnixGpg(const QString &executable)
--{
--    static const auto unixGpg = getGpgVersionOutput(executable).contains("Home: /c/");
--    return unixGpg;
--}
-+            const bool isUnixGpg = versionOutput.contains("Home: /c/");
-+            if (isUnixGpg) {
-+                m_pubringNative = QString(m_pubring).replace(":", "").insert(0, '/');
-+                if (needsSecring)
-+                    m_secringNative = QString(m_secring).replace(":", "").insert(0, '/');
-+            }
- #endif
-+        }
-+    }
-+
-+    const QString &executable() const { return m_executable; }
-+    bool isSupported() const { return m_isSupported; }
-+    bool needsSecring() const { return !m_secring.isEmpty(); }
-+    const QString &pubring() const { return m_pubring; }
-+    const QString &secring() const { return m_secring; }
-+    const QString &pubringNative() const { return m_pubringNative; }
-+    const QString &secringNative() const { return m_secringNative; }
-+
-+private:
-+    QString m_executable;
-+    QString m_pubring;
-+    QString m_secring;
-+    QString m_pubringNative;
-+    QString m_secringNative;
-+    bool m_isSupported = false;
-+};
- 
--QString findGpgExecutable()
-+GpgExecutable findGpgExecutable()
- {
-     for (const auto &executable : {"gpg2", "gpg"}) {
--        if ( checkGpgExecutable(executable) )
--            return executable;
-+        GpgExecutable gpg(executable);
-+        if ( gpg.isSupported() )
-+            return gpg;
-     }
- 
--    return QString();
-+    return GpgExecutable();
- }
- 
--const QString &gpgExecutable()
-+const GpgExecutable &gpgExecutable()
- {
-     static const auto gpg = findGpgExecutable();
-     return gpg;
- }
- 
--struct KeyPairPaths {
--    KeyPairPaths()
--    {
--        const QString path = getConfigurationFilePath("");
--        sec = QDir::toNativeSeparators(path + ".sec");
--        pub = QDir::toNativeSeparators(path + ".pub");
--
--#ifdef Q_OS_WIN
--        if (checkUnixGpg(gpgExecutable())) {
--            pub = QDir::fromNativeSeparators(pub).replace(":", "").insert(0, '/');
--            sec = QDir::fromNativeSeparators(sec).replace(":", "").insert(0, '/');
--        }
--#endif
--    }
--
--    QString sec;
--    QString pub;
--};
--
- QStringList getDefaultEncryptCommandArguments(const QString &publicKeyPath)
- {
-     return QStringList() << "--trust-model" << "always" << "--recipient" << "copyq"
-@@ -146,16 +200,18 @@ QStringList getDefaultEncryptCommandArguments(const QString &publicKeyPath)
- 
- void startGpgProcess(QProcess *p, const QStringList &args, QIODevice::OpenModeFlag mode)
- {
--    KeyPairPaths keys;
--    p->start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) + args, mode);
-+    const auto &gpg = gpgExecutable();
-+    p->start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) + args, mode);
- }
- 
- QString importGpgKey()
- {
--    KeyPairPaths keys;
-+    const auto &gpg = gpgExecutable();
-+    if ( !gpg.needsSecring() )
-+        return QString();
- 
-     QProcess p;
--    p.start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) << "--import" << keys.sec);
-+    p.start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) << "--import" << gpg.secringNative());
-     if ( !verifyProcess(&p) )
-         return "Failed to import private key (see log).";
- 
-@@ -164,18 +220,20 @@ QString importGpgKey()
- 
- QString exportGpgKey()
- {
--    KeyPairPaths keys;
-+    const auto &gpg = gpgExecutable();
-+    if ( !gpg.needsSecring() )
-+        return QString();
- 
-     // Private key already created or exported.
--    if ( QFile::exists(keys.sec) )
-+    if ( QFile::exists(gpg.secring()) )
-         return QString();
- 
-     QProcess p;
--    p.start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) << "--export-secret-key" << "copyq");
-+    p.start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) << "--export-secret-key" << gpg.secringNative());
-     if ( !verifyProcess(&p) )
-         return "Failed to export private key (see log).";
- 
--    QFile secKey(keys.sec);
-+    QFile secKey(gpg.secring());
-     if ( !secKey.open(QIODevice::WriteOnly) )
-         return "Failed to create private key.";
- 
-@@ -240,7 +298,7 @@ bool encryptMimeData(const QVariantMap &data, const QModelIndex &index, QAbstrac
- 
- void startGenerateKeysProcess(QProcess *process, bool useTransientPasswordlessKey = false)
- {
--    const KeyPairPaths keys;
-+    const auto &gpg = gpgExecutable();
- 
-     auto args = QStringList() << "--batch" << "--gen-key";
- 
-@@ -253,15 +311,19 @@ void startGenerateKeysProcess(QProcess *process, bool useTransientPasswordlessKe
-     }
- 
-     startGpgProcess(process, args, QIODevice::ReadWrite);
--    process->write( "\nKey-Type: RSA"
--             "\nKey-Usage: encrypt"
--             "\nKey-Length: 4096"
--             "\nName-Real: copyq"
--             + transientOptions +
--             "\n%secring " + keys.sec.toUtf8() +
--             "\n%pubring " + keys.pub.toUtf8() +
--             "\n%commit"
--             "\n" );
-+    process->write(
-+        "\nKey-Type: RSA"
-+        "\nKey-Usage: encrypt"
-+        "\nKey-Length: 4096"
-+        "\nName-Real: copyq"
-+        + transientOptions +
-+        "\n%pubring " + gpg.pubringNative().toUtf8()
-+    );
-+
-+    if ( gpg.needsSecring() )
-+        process->write("\n%secring " + gpg.secringNative().toUtf8());
-+
-+    process->write("\n%commit\n");
-     process->closeWriteChannel();
- }
- 
-@@ -276,7 +338,7 @@ QString exportImportGpgKeys()
- 
- bool isGpgInstalled()
- {
--    return !gpgExecutable().isEmpty();
-+    return gpgExecutable().isSupported();
- }
- 
- } // namespace
-@@ -314,7 +376,7 @@ bool ItemEncryptedSaver::saveItems(const QString &, const QAbstractItemModel &mo
-     bytes = readGpgOutput(QStringList("--encrypt"), bytes);
-     if ( bytes.isEmpty() ) {
-         emitEncryptFailed();
--        COPYQ_LOG("ItemEncrypt ERROR: Failed to read encrypted data");
-+        log("ItemEncrypt: Failed to read encrypted data", LogError);
-         return false;
-     }
- 
-@@ -325,7 +387,7 @@ bool ItemEncryptedSaver::saveItems(const QString &, const QAbstractItemModel &mo
- 
-     if ( stream.status() != QDataStream::Ok ) {
-         emitEncryptFailed();
--        COPYQ_LOG("ItemEncrypt ERROR: Failed to write encrypted data");
-+        log("ItemEncrypt: Failed to write encrypted data", LogError);
-         return false;
-     }
- 
-@@ -510,17 +572,22 @@ void ItemEncryptedScriptable::pasteEncryptedItems()
- 
- QString ItemEncryptedScriptable::generateTestKeys()
- {
--    const KeyPairPaths keys;
--    for ( const auto &keyFileName : {keys.sec, keys.pub} ) {
-+    const auto &gpg = gpgExecutable();
-+
-+    const QStringList keys = gpg.needsSecring()
-+        ? QStringList{gpg.pubring(), gpg.secring()}
-+        : QStringList{gpg.pubring()};
-+
-+    for (const auto &keyFileName : keys) {
-         if ( QFile::exists(keyFileName) && !QFile::remove(keyFileName) )
--            return QString("Failed to remove \"%1\"").arg(keys.sec);
-+            return QString("Failed to remove \"%1\"").arg(keyFileName);
-     }
- 
-     QProcess process;
-     startGenerateKeysProcess(&process, true);
- 
-     if ( !verifyProcess(&process) ) {
--        return QString("ItemEncrypt ERROR: %1; stderr: %2")
-+        return QString("ItemEncrypt: %1; stderr: %2")
-                 .arg( process.errorString(),
-                       QString::fromUtf8(process.readAllStandardError()) );
-     }
-@@ -529,9 +596,9 @@ QString ItemEncryptedScriptable::generateTestKeys()
-     if ( !error.isEmpty() )
-         return error;
- 
--    for ( const auto &keyFileName : {keys.sec, keys.pub} ) {
-+    for (const auto &keyFileName : keys) {
-         if ( !QFile::exists(keyFileName) )
--            return QString("Failed to create \"%1\"").arg(keys.sec);
-+            return QString("Failed to create \"%1\"").arg(keyFileName);
-     }
- 
-     return QString();
-@@ -606,19 +673,29 @@ QWidget *ItemEncryptedLoader::createSettingsWidget(QWidget *parent)
-         m_encryptTabs.join('\n') );
- 
-     if (status() != GpgNotInstalled) {
--        KeyPairPaths keys;
-+        const auto &gpg = gpgExecutable();
-         ui->labelShareInfo->setTextFormat(Qt::RichText);
--        ui->labelShareInfo->setText( ItemEncryptedLoader::tr(
--                    "To share encrypted items on other computer or"
--                    " session, you'll need public and secret key files:"
--                    "<ul>"
--                    "<li>%1</li>"
--                    "<li>%2<br />(Keep this secret key in a safe place.)</li>"
--                    "</ul>"
--                    )
--                .arg( quoteString(keys.pub),
--                    quoteString(keys.sec) )
--                );
-+        QString text = ItemEncryptedLoader::tr(
-+            "To share encrypted items on other computer or"
-+            " session, you'll need these secret key files (keep them in a safe place):"
-+        );
-+        if (gpg.needsSecring()) {
-+            text.append( QStringLiteral(
-+                "<ul>"
-+                "<li>%1</li>"
-+                "<li>%2</li>"
-+                "</ul>"
-+                ).arg(quoteString(gpg.pubringNative()), quoteString(gpg.secringNative()))
-+            );
-+        } else {
-+            text.append( QStringLiteral(
-+                "<ul>"
-+                "<li>%1</li>"
-+                "</ul>"
-+                ).arg(quoteString(gpg.pubringNative()))
-+            );
-+        }
-+        ui->labelShareInfo->setText(text);
-     }
- 
-     updateUi();
-@@ -689,7 +766,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel
-         const int bytesRead = stream.readRawData(encryptedBytes, 4096);
-         if (bytesRead == -1) {
-             emitDecryptFailed();
--            COPYQ_LOG("ItemEncrypted ERROR: Failed to read encrypted data");
-+            log("ItemEncrypted: Failed to read encrypted data", LogError);
-             return nullptr;
-         }
-         p.write(encryptedBytes, bytesRead);
-@@ -708,7 +785,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel
-     const QByteArray bytes = p.readAllStandardOutput();
-     if ( bytes.isEmpty() ) {
-         emitDecryptFailed();
--        COPYQ_LOG("ItemEncrypt ERROR: Failed to read encrypted data.");
-+        log("ItemEncrypt: Failed to read encrypted data", LogError);
-         verifyProcess(&p);
-         return nullptr;
-     }
-@@ -719,7 +796,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel
-     stream2 >> length;
-     if ( stream2.status() != QDataStream::Ok ) {
-         emitDecryptFailed();
--        COPYQ_LOG("ItemEncrypt ERROR: Failed to parse item count!");
-+        log("ItemEncrypt: Failed to parse item count", LogError);
-         return nullptr;
-     }
-     length = qMin(length, static_cast<quint64>(maxItems)) - static_cast<quint64>(model->rowCount());
-@@ -728,7 +805,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel
-     for ( int i = 0; i < count && stream2.status() == QDataStream::Ok; ++i ) {
-         if ( !model->insertRow(i) ) {
-             emitDecryptFailed();
--            COPYQ_LOG("ItemEncrypt ERROR: Failed to insert item!");
-+            log("ItemEncrypt: Failed to insert item", LogError);
-             return nullptr;
-         }
-         QVariantMap dataMap;
-@@ -738,7 +815,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel
- 
-     if ( stream2.status() != QDataStream::Ok ) {
-         emitDecryptFailed();
--        COPYQ_LOG("ItemEncrypt ERROR: Failed to decrypt item!");
-+        log("ItemEncrypt: Failed to decrypt item", LogError);
-         return nullptr;
-     }
- 
---- a/plugins/itemencrypted/tests/itemencryptedtests.cpp
-+++ b/plugins/itemencrypted/tests/itemencryptedtests.cpp
-@@ -25,6 +25,8 @@ void ItemEncryptedTests::cleanupTestCase()
- void ItemEncryptedTests::init()
- {
-     TEST(m_test->init());
-+
-+    QVERIFY(isGpgInstalled());
- }
- 
- void ItemEncryptedTests::cleanup()
-@@ -34,13 +36,10 @@ void ItemEncryptedTests::cleanup()
- 
- void ItemEncryptedTests::encryptDecryptData()
- {
--    if ( !isGpgInstalled() )
--        SKIP("gpg2 is required to run the test");
--
--    RUN("-e" << "plugins.itemencrypted.generateTestKeys()", "\n");
-+    RUN("plugins.itemencrypted.generateTestKeys()", "\n");
- 
-     // Test gpg errors first.
--    RUN("-e" << "plugins.itemencrypted.encrypt(input());print('')", "");
-+    RUN("plugins.itemencrypted.encrypt(input());print('')", "");
- 
-     const QByteArray input("\x00\x01\x02\x03\x04", 5);
-     QByteArray stdoutActual;
-@@ -60,10 +59,7 @@ void ItemEncryptedTests::encryptDecryptItems()
-     SKIP("Ctrl+L shortcut doesn't seem work on OS X");
- #endif
- 
--    if ( !isGpgInstalled() )
--        SKIP("gpg2 is required to run the test");
--
--    RUN("-e" << "plugins.itemencrypted.generateTestKeys()", "\n");
-+    RUN("plugins.itemencrypted.generateTestKeys()", "\n");
- 
-     // Load commands from the plugin generating keys.
-     RUN("keys" << "Ctrl+P" << "ENTER", "");
---- a/src/app/clipboardserver.cpp
-+++ b/src/app/clipboardserver.cpp
-@@ -124,6 +124,8 @@ ClipboardServer::ClipboardServer(QApplication *app, const QString &sessionName)
- 
-     QApplication::setQuitOnLastWindowClosed(false);
- 
-+    ensureSettingsDirectoryExists();
-+
-     m_sharedData = std::make_shared<ClipboardBrowserShared>();
-     m_sharedData->itemFactory = new ItemFactory(this);
-     m_sharedData->notifications = new NotificationDaemon(this);
---- a/src/common/config.cpp
-+++ b/src/common/config.cpp
-@@ -157,6 +157,20 @@ QString getConfigurationFilePathHelper()
- 
- } // namespace
- 
-+bool ensureSettingsDirectoryExists()
-+{
-+    QDir settingsDir( settingsDirectoryPath() );
-+    if ( !settingsDir.mkpath(".") ) {
-+        log( QStringLiteral("Failed to create the directory for settings: %1")
-+             .arg(settingsDir.path()),
-+             LogError );
-+
-+        return false;
-+    }
-+
-+    return true;
-+}
-+
- const QString &getConfigurationFilePath()
- {
-     static const QString path = getConfigurationFilePathHelper();
---- a/src/common/config.h
-+++ b/src/common/config.h
-@@ -9,6 +9,8 @@ class QString;
- class QVariant;
- class QWidget;
- 
-+bool ensureSettingsDirectoryExists();
-+
- const QString &getConfigurationFilePath();
- 
- QString getConfigurationFilePath(const char *suffix);
---- a/src/item/itemstore.cpp
-+++ b/src/item/itemstore.cpp
-@@ -22,20 +22,6 @@ QString itemFileName(const QString &id)
-     return getConfigurationFilePath("_tab_") + part + QLatin1String(".dat");
- }
- 
--bool createItemDirectory()
--{
--    QDir settingsDir( settingsDirectoryPath() );
--    if ( !settingsDir.mkpath(".") ) {
--        log( QString("Cannot create directory for settings %1!")
--             .arg(quoteString(settingsDir.path()) ),
--             LogError );
--
--        return false;
--    }
--
--    return true;
--}
--
- void printItemFileError(
-         const QString &action, const QString &id, const QFileDevice &file)
- {
-@@ -83,9 +69,6 @@ ItemSaverPtr createTab(
- 
- ItemSaverPtr loadItems(const QString &tabName, QAbstractItemModel &model, ItemFactory *itemFactory, int maxItems)
- {
--    if ( !createItemDirectory() )
--        return nullptr;
--
-     const QString tabFileName = itemFileName(tabName);
-     if ( !QFile::exists(tabFileName) )
-         return createTab(tabName, model, itemFactory, maxItems);
-@@ -107,7 +90,7 @@ bool saveItems(const QString &tabName, const QAbstractItemModel &model, const It
- {
-     const QString tabFileName = itemFileName(tabName);
- 
--    if ( !createItemDirectory() )
-+    if ( !ensureSettingsDirectoryExists() )
-         return false;
- 
-     // Save tab data to a new temporary file.
diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch
deleted file mode 100644
index 2b149ab843bf..000000000000
--- a/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://bugs.gentoo.org/916129
-https://github.com/hluk/CopyQ/pull/2508
-https://github.com/hluk/CopyQ/commit/19e9dd1c2ecb49b14a24159c5ac3bc1b77fdf250
-
-From 19e9dd1c2ecb49b14a24159c5ac3bc1b77fdf250 Mon Sep 17 00:00:00 2001
-From: Nick Cao <nickcao@nichi.co>
-Date: Tue, 17 Oct 2023 02:08:51 -0400
-Subject: [PATCH] itemfakevim: fix build with qt 6.6.0 (#2508)
-
-Reference: https://github.com/qt-creator/qt-creator/commit/e56e3b6f374e00179eb0537198437864dddc47f2
---- a/plugins/itemfakevim/fakevim/fakevimhandler.cpp
-+++ b/plugins/itemfakevim/fakevim/fakevimhandler.cpp
-@@ -1057,14 +1057,6 @@ inline QString msgMarkNotSet(const QString &text)
-     return Tr::tr("Mark \"%1\" not set.").arg(text);
- }
- 
--static void initSingleShotTimer(QTimer *timer, int interval, FakeVimHandler::Private *receiver,
--                                void (FakeVimHandler::Private::*slot)())
--{
--    timer->setSingleShot(true);
--    timer->setInterval(interval);
--    QObject::connect(timer, &QTimer::timeout, receiver, slot);
--}
--
- class Input
- {
- public:
-@@ -2424,6 +2416,16 @@ class FakeVimHandler::Private : public QObject
-     FakeVimSettings &s = *fakeVimSettings();
- };
- 
-+static void initSingleShotTimer(QTimer *timer,
-+                                int interval,
-+                                FakeVimHandler::Private *receiver,
-+                                void (FakeVimHandler::Private::*slot)())
-+{
-+    timer->setSingleShot(true);
-+    timer->setInterval(interval);
-+    QObject::connect(timer, &QTimer::timeout, receiver, slot);
-+}
-+
- FakeVimHandler::Private::GlobalData FakeVimHandler::Private::g;
- 
- FakeVimHandler::Private::Private(FakeVimHandler *parent, QWidget *widget)
diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch
deleted file mode 100644
index e526f3a89f0b..000000000000
--- a/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-https://github.com/hluk/CopyQ/commit/42c02f2dc74b188ea7982a30c38acaf668bbf76a
-
-From 42c02f2dc74b188ea7982a30c38acaf668bbf76a Mon Sep 17 00:00:00 2001
-From: Lukas Holecek <hluk@email.cz>
-Date: Mon, 4 Sep 2023 21:12:44 +0200
-Subject: [PATCH] Avoid showing warnings about invalid regex
-
---- a/src/scriptable/scriptableitemselection.cpp
-+++ b/src/scriptable/scriptableitemselection.cpp
-@@ -46,10 +46,6 @@ QVector<int> toIntVector(const QJSValue &value)
- 
- QRegularExpression toRegularExpression(const QJSValue &value)
- {
--    // If argument is invalid/not-regexp, create an invalid regex to match nothing.
--    if ( !value.isRegExp() )
--        return QRegularExpression("(");
--
-     const QVariant variant = value.toVariant();
-     QRegularExpression regexp = variant.toRegularExpression();
- 
-@@ -136,7 +132,7 @@ QJSValue ScriptableItemSelection::selectAll()
- 
- QJSValue ScriptableItemSelection::select(const QJSValue &re, const QString &mimeFormat)
- {
--    const QVariant regexp = re.isUndefined() ? QVariant() : toRegularExpression(re);
-+    const QVariant regexp = re.isRegExp() ? toRegularExpression(re) : QVariant();
-     m_proxy->selectionSelect(m_id, regexp, mimeFormat);
-     return m_self;
- }
---- a/src/tests/testinterface.h
-+++ b/src/tests/testinterface.h
-@@ -85,9 +85,6 @@ class TestInterface {
-     /// Clean up tabs and items. Return error string on error.
-     virtual QByteArray cleanup() = 0;
- 
--    /// Ignore given text in logs for current unit test.
--    virtual void setIgnoreError(const QByteArray &ignoreError) = 0;
--
-     /// Platform specific key to remove (usually Delete, Backspace on OS X).
-     virtual QString shortcutToRemove() = 0;
- 
---- a/src/tests/tests.cpp
-+++ b/src/tests/tests.cpp
-@@ -150,8 +150,6 @@ bool testStderr(const QByteArray &stderrData, TestInterface::ReadStderrFlag flag
-     // Ignore exceptions and errors from clients in application log
-     // (these are expected in some tests).
-     static const std::vector<QRegularExpression> ignoreList{
--        plain("[EXPECTED-IN-TEST]"),
--
-         regex(R"(CopyQ Note \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}\] <Client-[^\n]*)"),
- 
-         // X11 (Linux)
-@@ -520,8 +518,6 @@ class TestInterfaceImpl final : public TestInterface {
-         if (m_server) {
-             QCoreApplication::processEvents();
-             QByteArray output = readLogFile(maxReadLogSize);
--            if ( !m_ignoreError.isEmpty() )
--                output.replace(m_ignoreError, "[EXPECTED-IN-TEST] " + m_ignoreError);
-             if ( flag == ReadAllStderr || !testStderr(output, flag) )
-               return decorateOutput("Server STDERR", output);
-         }
-@@ -645,16 +641,10 @@ class TestInterfaceImpl final : public TestInterface {
- 
-     QByteArray cleanup() override
-     {
--        m_ignoreError.clear();
-         addFailedTest();
-         return QByteArray();
-     }
- 
--    void setIgnoreError(const QByteArray &ignoreError) override
--    {
--        m_ignoreError = ignoreError;
--    }
--
-     QString shortcutToRemove() override
-     {
-         return ::shortcutToRemove();
-@@ -771,8 +761,6 @@ class TestInterfaceImpl final : public TestInterface {
-     QStringList m_failed;
- 
-     PlatformClipboardPtr m_clipboard;
--
--    QByteArray m_ignoreError;
- };
- 
- QString keyNameFor(QKeySequence::StandardKey standardKey)
-@@ -2272,9 +2260,8 @@ void Tests::classItemSelection()
-     RUN(args << "ItemSelection().select(undefined, mimeItemNotes).str()", outRows.arg("0,2"));
- 
-     // Match nothing if select() argument is not a regular expression.
--    m_test->setIgnoreError("QtWarning: QString::contains: invalid QRegularExpression object");
-+    RUN(args << "add" << "", "");
-     RUN(args << "ItemSelection().select('A').str()", outRows.arg(""));
--    m_test->setIgnoreError(QByteArray());
- }
- 
- void Tests::classItemSelectionGetCurrent()
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index 30c02cf22ae3..267feff8bb21 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,3 +1,3 @@
 DIST gccmakedep-1.0.4.tar.xz 102704 BLAKE2B 2efb17475bb2d4b36f5387483b189dcc62cdddc9ed66d4c737ffa4726ea94480c67e498aaf65762dac6cdeab6596c30249aeb78703dd3e6c808b78196956f79b SHA512 7665923de51256720e7ae73c09f3c8c908c5cda2e204afac60e3c1ef45c7211cee303629ab9e53171df2a37765944a8a85a654bb1b2e90df9f497dff7d9d29a8
-EBUILD gccmakedep-1.0.4.ebuild 350 BLAKE2B db789f84723d9fad417b371c4b05ef4508d80e0133c6834a6a2e01fe2e4f5eeb41fdff0270d1641902668d15c0e5d7a3760f0f0d2a609f428122a84b56b56340 SHA512 204b53d090a9d39508f01d93f99e7e916ca2b74b9914469c4c441e6f2a0b1e28b4b76fdd46ec647d1284abcf06c50dfc7955b5d5c3dd3ad64b343bfdd86510ee
+EBUILD gccmakedep-1.0.4.ebuild 325 BLAKE2B dd99ded665876fb641a619cec44f8e75e80db0426faf3ff7360329fdd564f0f6827619f1ef363f8cb6babcb26d5591d7ca6879b0dee7a7a81c54bfe1f930b005 SHA512 5270a892129ebfacbb0231c1cfff313e1f25e552bd4b6db30e68590fa1c3b5d93b8abf038b9767274a3904d4eed9e141b62e822407de8840c3b2af92695986d2
 MISC metadata.xml 342 BLAKE2B 8a918dbed8adc0ca2dd4fb47840a2a13199f26ea3cacc46391974a9b797006bd710f5d4fcbc265361f3e23cb5cb8f7f9358d27549f7ff21ef0381a11f5fe2346 SHA512 ccb760eec62a031973b2e5d9a553833430d7dd51b71a91943b30ff58352a9838fa303e146150cb9e460e0121c61c3d293a1588fac5b5c610aabb5e3f091a18c5
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild
index 6ef363fe516d..8d739a0fac51 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 609b13284149..7fb1959ba593 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -3,5 +3,5 @@ AUX imake-1.0.8-respect-LD.patch 379 BLAKE2B 1b031fc8cbc884cd975b338f57ef9de554a
 AUX imake-1.0.8-xmkmf-pass-cc-ld.patch 461 BLAKE2B 643264da121725cd2424e3e6d3dc7af05d9068ada3a53ca5b92f6af7beb17caf7eb7de5bc4187a7ebdfed508f242d13bcba9876533d2d7cc52dbd0f9c80ab701 SHA512 c73feb329adcda1f08051965a0ce0ba6031a8b8aceef19d10d11e475a603337da661ff4af72620924e1efb76ed9347fc0535b31ac3e98707aee298a36e715bdf
 AUX imake-1.0.9-no-get-gcc.patch 1048 BLAKE2B 0ff949e2e12afcb59cefc81b60e9801d14bf9b98f19ebe62b6a5ad857ea3b1e1bd3244309953eb450b7f3e29ae9663c695ff790fbaa6a8d202dc062734c21381 SHA512 67f5e4789b739c4d53d331592e83b9455a1e01ff29f9b95db04a25225f70549ced920010dd09b6f9f6e1b70017e1864f7b344fdc4fcd8962f2a9a2853e0b0644
 DIST imake-1.0.10.tar.xz 155284 BLAKE2B 85ea5d14280b0e4e3d07f806b1ebc777f1c6f431af05e94571e1d7908028f1497c4b5edb6e808c858429e98f314fe6c3cee84e265a30fce02d7ebeaa2111ab8d SHA512 ea96db27a6da13ea2d64652936e508b5e3d5d712347a2eb248376dc1f262c18720d9934b8ae69b4c0fc65b135c847be42da084fe924e4825ce1d359f4ef7e60f
-EBUILD imake-1.0.10.ebuild 693 BLAKE2B 6e4d90e276f7711aef3d389f1eb9c49b58941258720d6d1494d464e097ccb1cce6b191d96a36f204e1b9fd4add752fe1565132137e4c0c90005f4d813f0964e4 SHA512 d99d1442066e30a1e1a15ad46318c9022470cd0761be71443d51bd232f84aeeb5d202a75118b2134554bbdb0e718cdcca2da6d83528ba8d8f23195eddf87f6d8
+EBUILD imake-1.0.10.ebuild 668 BLAKE2B 3e712d1f33ed55534cf43fc7b1b99c445d34f02302423449feb67d359fcf387fa5346ada9d57803bc6458067848cfd38841a6029b174d1a86b7936a0fdf11812 SHA512 852b6056cb9cc07cba6c2f57d0db534fa424de3992b57fa3623c539874790a361d3042c6708014c425b9058c51ab8a8da28436c1cb8b200d8037c45b0369048c
 MISC metadata.xml 337 BLAKE2B 33b94ed7ed8c8068a9fa1e2e3a49b51760e5e19003102a8ff5b76a0f449cc77fbf2aacaa8351a39caf2ab538645eca7862a383e7e4413a59efa69dabf8950c32 SHA512 9e59ae6ff8bef63e98e08ce8eff2d35a1ed3b815b60140523f07f85ea62a3bad952deea65a822393628db1605f2a8ac5ba35c3bb277e85a3cb64dba74936f470
diff --git a/x11-misc/imake/imake-1.0.10.ebuild b/x11-misc/imake/imake-1.0.10.ebuild
index 7d54508637cd..7db15ae359a3 100644
--- a/x11-misc/imake/imake-1.0.10.ebuild
+++ b/x11-misc/imake/imake-1.0.10.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-XORG_TARBALL_SUFFIX="xz"
 inherit toolchain-funcs xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest
index 75498f710820..1543aae05904 100644
--- a/x11-misc/lndir/Manifest
+++ b/x11-misc/lndir/Manifest
@@ -1,3 +1,3 @@
 DIST lndir-1.0.5.tar.xz 121460 BLAKE2B 1d51789c47e8958bcfca9f356e6cbc34916a6164024c3d33e684479b50773e806f85d0aad3558ab2704115f10408a69d709043543fd7adeafd28f354a2edca20 SHA512 f6c1498ed0d867d4aa98ef098a9ab57027ac4e852f688b2c1695a3c9ca571b927bc401925e3bd7951fbf0db54798a55f838c4a4ad113dafd95d811ba61551061
-EBUILD lndir-1.0.5.ebuild 433 BLAKE2B f8d64804d8489a5fa80cb80f054b995e5709446c45a11e0a22021099cb5e9c5e4db95bb407d67862348662efebc1cb2faee644be58257623c3761c93c9b9eb9f SHA512 092c0e8f151fe76330573f9f345b8789bdf5c41192b40a8f95dd65733261282f97fabcda5da98669aa6f79a56d8a240a16aefe4fa8e3522095ead85dcad3f6bd
+EBUILD lndir-1.0.5.ebuild 408 BLAKE2B beefd72b164b694a16fe9a3892db44a7cb2d0e71103eb62d6bfda57a3b10aa092162efd72dc320ccbd543c697a659bd605150357e2bd1df901e9290a36e4ee77 SHA512 ad0b844e7ab3af9bcd376c105256b425347e1d1516884ed5c174e93205af9a663eb064090e197fc682e48c13d936a3715eac35dfee728f078b6fadf18b633414
 MISC metadata.xml 337 BLAKE2B 1385412391438bffb9150bb67b5d5f3c5dd67c820e57ea859ad0dae6e2bb0a61df54469d0b44534b9248010ac7244c350116f7f2f22c484a43d97f269c2708c0 SHA512 b882f390c8dec906f76c2e05f89639d1afa89b3a03475631911d25b46c1df6fbb3df8a35ac341c0845fcfd690668a211f3cbf2e3fd72238c25242bd1347b764c
diff --git a/x11-misc/lndir/lndir-1.0.5.ebuild b/x11-misc/lndir/lndir-1.0.5.ebuild
index 784bc50925af..4d60b0008fc7 100644
--- a/x11-misc/lndir/lndir-1.0.5.ebuild
+++ b/x11-misc/lndir/lndir-1.0.5.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 5bdefc0e22dd..5760c2718cf6 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,3 @@
 DIST makedepend-1.0.9.tar.xz 145080 BLAKE2B 7f8b2c0a3992a7c87a37f152eb5df1e6a881c0523f4cc4e69fd0ec3aa9aee37b6a0b32c548ad246151c938596b6d4a6c32d956aa9be1ed6c81978d313644f9a3 SHA512 68d289656314dc9f12c792d0e394cfbc95404a0d01155dbcb38313d451b506da48a3d44183f568a2cbb2b1d1da9e26703a0d92f2bb658f72fc968eeb03bf2fe8
-EBUILD makedepend-1.0.9.ebuild 334 BLAKE2B c2fbe67167c1cf5a582dfc8dcecf6454f9246ed9bd73ab3384414941f0e25706ade4060b363bf054e29beebf1ce75a0e54b16c45ca3e22233cba18367eef6dd8 SHA512 17672613ca8337850b81c32d68013c1cd2b851f9217c16f727752afff469246af8c4b345dd26882bd6a7045d1eec2c9fd26f227f6e384b3394a346d056c916ff
+EBUILD makedepend-1.0.9.ebuild 309 BLAKE2B 5d01c82d1f28cde3a6625b247f116f47634923693bb61d4b49a17ce35a10632b5f8adbc7cc6a2c6b5c05597ff58630d79621a1f28ab9ac6e9429a8aa41832ee1 SHA512 3e40136bb25c3713816e40869a8be77c27d28d4bf84404afa7aa77303a92aca4adad16ee0e7626eef997b140a335c22deb2a8c21a35e09e53764d428531b0904
 MISC metadata.xml 342 BLAKE2B a49c408048104b512588271539321c424bfc08a8f54bb82437429662bf85b3f5a09e3a93e0eb1c3a980d571cb08c1fbce58ab5f97f160923ff253c0608206056 SHA512 d2bab9cef77003c68547c0ccf1a454953d0d55edea087963d67f7b6e8ecfc78b811f8f740aa1a7d6374d5a417c66963427b9fe2b1fc1b88d2d1d669eae583d3a
diff --git a/x11-misc/makedepend/makedepend-1.0.9.ebuild b/x11-misc/makedepend/makedepend-1.0.9.ebuild
index 964073a1af4e..1611a60eca9a 100644
--- a/x11-misc/makedepend/makedepend-1.0.9.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.9.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
diff --git a/x11-misc/rendercheck/Manifest b/x11-misc/rendercheck/Manifest
index 2d52a5afec56..f59615d3f81d 100644
--- a/x11-misc/rendercheck/Manifest
+++ b/x11-misc/rendercheck/Manifest
@@ -1,4 +1,4 @@
 DIST rendercheck-1.6.tar.xz 23996 BLAKE2B 981095f88d70320ba22b15ceeb33182c88fb5c4ca1df323e016a6750812dc7b0154e95c76619926bfe945a80243de5ea0921e04d94b70992b8be512d70a437d3 SHA512 0cc5372a318d4a28d63d82a2efc42f15b810186ce91b226bc5b962520637b628b1ae991a9e7745f8239c4fd100bf8f8eab79bc3803a01cad6827022af49be1a3
-EBUILD rendercheck-1.6.ebuild 671 BLAKE2B 414a3c235218f698ffefb91bc6e973d2a7fd299754d43a508db8c0419bf93d4ef210e3c6ed470cb128f998460ffc5a8bcc14ee31a57c70ea4b4756162088172f SHA512 f2a34f1e00db8ceb9bba1fe2f2396f053eb2bcaec6c662c987f4f1a34c35f4800ec274fb92eca1b312ec8962b3efc5c02ace661d3c3e04d5b9149eb7fa0fab76
-EBUILD rendercheck-9999.ebuild 677 BLAKE2B 81900d5fbeb902f0fae17d3606d752a5f9d920201bf54f7eaa88555f645855ca28b76b02574e4dfa5a4c05f314554dc65b91b6e5c36ef10492ea2a6a31a3b355 SHA512 3369ffdb81bdb0a1fdf01e6e61166452c5535fe7f48b0738163fe0c851699d8645bd16e4b5fecef16d86f531c000c3975aeb7c664fbfa091632fb69665a4aceb
+EBUILD rendercheck-1.6.ebuild 646 BLAKE2B 4b4734112e5cc7cdafe08203ad11d86d7956cd3d8e4e1c70c803ef82b23cdf933c407da3a9397f2f1ba806ec138fd7eafc05baa5030170e62e773a32006e51a6 SHA512 c13f942aba73118bd7d733380cafe3dc9d5f96d38f66237f758605306b93a43d08bbce7018dd2871afd248f7ddb86e1fe8d7b98fb208d5edcaad3b985d4403a6
+EBUILD rendercheck-9999.ebuild 652 BLAKE2B 05c83067f5ece1903b90342200316eeb495ec9cea30480b562af76be952469cb51eee1fd6a4fe5ade32da948301dfaf5180bf357a3f209e2d160a8d1486d247f SHA512 c18d85ba351d19764ceb9f6bf1a4832783e7d8c953c20677deadddca622ef37d145b90df21a23c2aaf176b0b0af1a08492e1bd733ec5757fd1dc99cb03923d39
 MISC metadata.xml 343 BLAKE2B 5711a00b6084d146b6f8631927d2d3ea9c2764b3d63b6ecfe890d0fb3a25e95573d3237c8113559e0743b0c602af9d8861fdf66c41156908ab405910baa858cf SHA512 e9637d2eb5c421d3ea06f97a45e731d7717c1ee731ee325a138f1fec885addaf86405de1d212f7edbac59ab2e56fd4dc473a4cd4f6062d591f702eb0bdc9ff3f
diff --git a/x11-misc/rendercheck/rendercheck-1.6.ebuild b/x11-misc/rendercheck/rendercheck-1.6.ebuild
index 46d943b16e27..9d5943e0a598 100644
--- a/x11-misc/rendercheck/rendercheck-1.6.ebuild
+++ b/x11-misc/rendercheck/rendercheck-1.6.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 XORG_MODULE=test/
-XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson
 
 if [[ ${PV} != *9999* ]]; then
diff --git a/x11-misc/rendercheck/rendercheck-9999.ebuild b/x11-misc/rendercheck/rendercheck-9999.ebuild
index e42d18b33391..c9265373ea8b 100644
--- a/x11-misc/rendercheck/rendercheck-9999.ebuild
+++ b/x11-misc/rendercheck/rendercheck-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 XORG_MODULE=test/
-XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson
 
 if [[ ${PV} != *9999* ]]; then
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index a8f0ebc099be..b0ce693f39cc 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -2,5 +2,5 @@ AUX synergy-1.14.1.32-gcc13.patch 1746 BLAKE2B e3537422b63ba65f0090c0e1842dabe77
 DIST googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 876756 BLAKE2B f51050e656a449e7d8b7d4d920439825dc5857a8fac637b96191bbf668b6353b0e83c5221395f761ca8d1d29a20596ced4d8b4e08b3ce364a866cf7bcc977e4c SHA512 f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880
 DIST synergy-1.12.0.png 31383 BLAKE2B 228487058d09ee4fe7d3c909a3aee567b63c0d1aeaecf0e724a7bc9c59e48abecac71f8074902fd4f02ff9347fe8f6488b0554fb78a253339b04fe8d2e958d24 SHA512 7044395b41a0d2e49d308c599710fa32398d11584e70da32d4a1ccb292b02437c09860ed14f7bdd113a646daf696988fd3c0b80f3ab52ebbcaddf4c846cdd7ab
 DIST synergy-core-1.14.1.32-stable.tar.gz 4617994 BLAKE2B c015ddff44175ea6b0436ab0d7eccfc4e693d7697a67a1b256d310784d794589b1f1815c95fc5948b9987b2c8d11b6bd0685efe08fc87291835fb03b7dcce970 SHA512 c0835d9f1b3f05a994d8340c7abdeb4ed7ab68739d3c0f05e61f639924978d2de1ed1ded58b398287aa29d013a73114b71a578572d2ad6f96e3fce3e0e1a8bc6
-EBUILD synergy-1.14.1.32.ebuild 2508 BLAKE2B a94a515d9483a78cd1a09faa161e5c097035f3a2b723c660c50c6c9fc0cb7d0e738b217567d9985a3595a475f4fbfbd7e84b56ec6b234e6e45c7345065a3eeab SHA512 9f5a3334369125650a5cec31cf6f41f764f3f718c2a36c537cd5234f960d250bba405f8fd59a2b8ab96927b2a7e1cf12365e98d51e6b8e6c63aa5d8a6af49373
+EBUILD synergy-1.14.1.32.ebuild 2501 BLAKE2B c93acb39cbc624b6b8db1bb49e9b90773c8556d114172f0e3a6219587f61bdf28ed97753d34b67528359d0c99e56d0d920524caf19e0d8db78a112b67e9a30ad SHA512 109483b9922c1baba06a176447cae772fe75516c2cd6e5d775336519751fa2d9d07b67e7a228f3b3da00e65d78b36fcd62ef23f436daff440a951cddd7bdbdef
 MISC metadata.xml 253 BLAKE2B 292b1b20a01320b1ba0052bd4a7cf499185927595330234f4d6d52af72cf3e89f1760cba8fc2318cb9bc18e61d2251d55726da4b9f5db965a715283f4b01172e SHA512 b5f0c70817e0d820b23a0fb792664ea05b8b47aacec7c501993dabf8abe7d841f0f5bd8d9d95a82c651bcfe2c847d06589d2abc2e2d029e56c26325ebb02dc11
diff --git a/x11-misc/synergy/synergy-1.14.1.32.ebuild b/x11-misc/synergy/synergy-1.14.1.32.ebuild
index f12853d6d34b..42315613f3b0 100644
--- a/x11-misc/synergy/synergy-1.14.1.32.ebuild
+++ b/x11-misc/synergy/synergy-1.14.1.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="gui test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index 285f46f60532..9fe4db59751a 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -5,7 +5,7 @@ DIST xaos-3.6.tar.gz 2040707 BLAKE2B 7f8bd0e34e6ef81b57d3ac7203f590efb7bea4f6878
 DIST xaos-4.2.1_p20210828.tar.gz 10918756 BLAKE2B c1431596b503d9b99c880945edae577c493ff4061020052d16dafe79f3abce0b137b789493b103a35d96ac954a47d76aa47d32972feaab0406d2cedc0e685504 SHA512 847315566c72d6b793f32b2c468b0c90e69877d9e9620f1f871e768cfdaf5b156c0d5b568274f3fb89b58ffb74c990108a96a94c21a753965b682adc5e99dbf3
 DIST xaos-4.3.3.tar.gz 11083152 BLAKE2B 2fcbeb73806cda6882b60597bf70747e3e70f3e4a3d7c22fda1c0c4c33696b5430f3b1b726ad99d59454d3531e698d7e3911e5844740261861da6aedb8a5347b SHA512 1bfbe929ddb7ac6d5120a5be2e312fe759b0013303a4baa6c11ae29195596025511771e7360ce7cd2e0f27afbaaac9a961327ebfe135997db34db7113eeec7d7
 DIST xaos.png.tar 10240 BLAKE2B 5c925f00d19f6b74ff12c8910fbbfd9d108191d1454be82f8bb0d243001d004f2c10b84d93383bff8214f6192766fb8b4f84435ae129a822d0c2f10accb27f9d SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262
-EBUILD xaos-3.6.ebuild 1903 BLAKE2B fc342be25fbac9097536ea18955b6cc6a02d5d7ec4ca7bb18c8261499aba8c9e7f8f38cb56b3f4e9c018137f17e6685e8cd088c053389bb76037ca30492ffec4 SHA512 d4f75b1fbe117ab2955389ed43fa34d273ef739aa7ab671cf37a48b51e93ccf9bd1b595f2c0328723aca9eac68b3545816d0501e5a6f04203a6888c079078d62
-EBUILD xaos-4.2.1_p20210828.ebuild 1178 BLAKE2B 15a8df39714f1dfee1bcfe4627a41b7c616141cdb2f350f6e08928c3220906b0d751ad4c93c781201e2f39991abc840138a66af42693bd8c180dbe16a22d0858 SHA512 02a5e76096a1f33c1ef95e3da9ab80ba7bd76aad400100855d062bab597b323be2125efa3c1746771811b3ce71b6c93093de8a6b97ef1c1b650e85faef41e02a
-EBUILD xaos-4.3.3.ebuild 1127 BLAKE2B 4865f9510f88d67858d76e6f119ed625ba041a242b5cc44fd28f9fb33f85fd50152144a17b9d6eb7c2e81caf86a562b207a688b8dabb5ec62b70a9ec246eed41 SHA512 06e1229b6d170d33d8b5dd97adafbb6ec615cca92dbbdf62e80b5ea9321000b460ab7bd68fc190fa8a145915d2573ee6eb4aa9626b3573c4c0a499d7a7872b48
+EBUILD xaos-3.6.ebuild 1897 BLAKE2B f60cea1cf0b190c86690c9d5eab9551bc947cd557997f2efbb27c8fd4fb054e64588d4b1a6151548c443a5cd38058cd037818135eab9f8fdb32c78032a0b9ecf SHA512 70e5acc459cd39b07586a1c5127f5aa43683866b8f02c2ff660caacd4030a921ea4838c7888ff4add743e161b922b8c2b037e5a723d09b798e6629d948d75134
+EBUILD xaos-4.2.1_p20210828.ebuild 1171 BLAKE2B 0876ea5c726b1620058ff0f2743c27ed8e24cf78a05549775d66301961674e4f0f3079695b5529c994367360148e5557cbaeb0f676f2fbf319ca7e86d2e7f036 SHA512 1aacb563e6a4e2d40517afb830c22bdbe698bf7d3e31d0877df0c043610806be83fee6fce268e5a2cc2b639e71fca5ae76eeaf54437e240e5014e3ae640ccdd4
+EBUILD xaos-4.3.3.ebuild 1120 BLAKE2B 91a580a7dbba9b579ec59a9847daea4b1d39fe7ec4fa3b72a3a264ef5145d978e905d56c26b1a460377ccacaa87f1933b1ebbfe90477ebc2ad6d3e6635e2f77c SHA512 bea1ca6eedabf63fc5b02a11947dfd0cc56db6ac6458cab4253d8173bf3e200840486e6422bbcecab37a209dfd4b167f35b63652db27c65d8eb7775e67d6f5c0
 MISC metadata.xml 828 BLAKE2B 96aa8d81622a01ab93d37dcea2b82fc9055f022f17d5775b9c30abaf6463d40b441427ce2b1be902b14b38094e39e074f07ab8d57fc659e4ab9692ad848d4e78 SHA512 44a2eafb7198cfb88d4745bdbbf0bb41eca4b8ec770b244a76c26247c79593283823482ff1a6ee0eccfa1cd4a40a6269b4ecc08e84728bb1f6f1f0f73ff63ad9
diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
index c0f0a8423529..d55e9b6375dd 100644
--- a/x11-misc/xaos/xaos-3.6.ebuild
+++ b/x11-misc/xaos/xaos-3.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="aalib doc gtk nls png svga threads X"
 
 RDEPEND="
diff --git a/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild b/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild
index 7f63476c20d0..e8f3ad9ae299 100644
--- a/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild
+++ b/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/XaoS-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-qt/qtgui:5
diff --git a/x11-misc/xaos/xaos-4.3.3.ebuild b/x11-misc/xaos/xaos-4.3.3.ebuild
index 3d24bbaf29d9..7672189023bb 100644
--- a/x11-misc/xaos/xaos-4.3.3.ebuild
+++ b/x11-misc/xaos/xaos-4.3.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/XaoS-release-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-qt/qtbase:6[gui,widgets]"
 DEPEND="${RDEPEND}"
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 3e25984ec882..08eef7e2d8c4 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,3 +1,3 @@
 DIST xbitmaps-1.1.3.tar.xz 109772 BLAKE2B e5ffeed910131fafe7346bc26920dc27a9ef55b069a36cc969183cc7b02a732a781e1fd295ec2577fbb472efc566f18aa2d534e18e94d4a8abc66db0177bd26e SHA512 b9a7340385fcce2dcd0204f14a462685b14b72ff58f3ec53cd76695bef2b02af902bdac809622dcb27fd4075d5ba13587b5d059530aff502cd5288d161352814
-EBUILD xbitmaps-1.1.3.ebuild 521 BLAKE2B cf0e0380e23ee8582fcd1aabaedefc4a6550350d9d08083890b5c9546fdc4e58e8d58ada380b94e2169abd44725b848f91e70ae87e478996f2a3849604eccd1c SHA512 94780ac1b0061ea4029e21fc091ac1502497fdc2f7bcf39ecf1c5f4b06ad5fdb6148245ccec74b2190f394fd80ae7e2e76ed4e42a3c933464e6f854d87a3a638
+EBUILD xbitmaps-1.1.3.ebuild 496 BLAKE2B 43d923f6344f9072d278402b118d625ff2e08cac9a4010cb35acf346c24f56e86c6d927b92d268ad83e2161493562af2aabd728aaaae626b23c05208b47dd99a SHA512 d68fdb5ed888b1ba9471a1cfa2636c327a244d592593b68db91f10df0e2cc19989245c164a4a7c92360befd5306560463756cce1df5acef1c1d36ea65b982865
 MISC metadata.xml 322 BLAKE2B ebf88c647c8d6a49be6116a66d6c6b9e5a0609752c31d0ef96daedc9064b57fb25051f0e02dc171c20afe78b050d6c8f4218c2408003feff98275576a7265853 SHA512 a3e122f01de815db03f2cd96d588e0b37313e224e837356affd162825ceddcebc62c435f0d0beb378fa8eaabdf41b2a5fac6f2ad5d7105bae1a12ffe55e14712
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
index c19674962174..1e5ff6169e47 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 XORG_MODULE=data/
-XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="X.Org bitmaps data"
diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index 6e95d9483674..cf702a615d08 100644
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1,3 +1,3 @@
 DIST xcompmgr-1.1.10.tar.xz 133224 BLAKE2B 277f81cde9ae6a79b81e58754c4dc7baeec5b7e6b47abae044a13be5973b4c30968e7961720e831ad86e0a2b1d282d8529a607a2e510c7090658a1b288cf315b SHA512 6dd5c72d6859489580dabdb96e3b572931cec7c426022213007c92df2d805a8f01a7f3dc5e8493f6e550bb809f71a50ca1630f50555d47b8d5b4b2726d7b8b12
-EBUILD xcompmgr-1.1.10.ebuild 425 BLAKE2B c4444c6e9eff8584a3d4181e76480275500b4495a3d437229da9c104a900da6154232565eb581837eec236c3c720e3ad3e8a6a1fee539cdc5c794d268243282d SHA512 866fea6cfd1882f126166b3163356ea4c19693d6e84bdaa4714ef75478d2719232b45a136a56eb562118076755e0149a2916da0f141da0c41dbbeee2154ac267
+EBUILD xcompmgr-1.1.10.ebuild 400 BLAKE2B 0d015ef2b4d355ceb516d84dd0279b8e720a509ab44cee88927e0cf206bc646eb1f1e3553e31417aab7424e7c7e4ddf78a51cc6df7e46b508453448d3ebe5609 SHA512 5efa015f46d3b2e158ad8b067efb40c2be3f203ce7dd41f30997e90bd10d4a2c8d47f53d3767672d711791a09a0754e1998c4750af5bbeb75b9aa1912d1d8269
 MISC metadata.xml 339 BLAKE2B 344267991a80cdfd83e7f2b4dc747eff82e4ec48ca3a90bb38114c290793c5987ec5ebff932b2473fddaf6ae3cbbe20e4323566dc9fc81ab09599aee7b9ff515 SHA512 f808390c96e49240f17fd38ca76503560ea8e80bf3dbb96d9c213c6a5a818513a171572234160053912cddafecff1b45920b023d48a1acc3c541194d3ded340c
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild
index 7ce5787fd441..33b2bf7bd238 100644
--- a/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 XORG_MODULE=app/
-XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="X Compositing manager"