gentoo resync : 17.02.2021

16 files changed, 279 insertions, 60 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 414b3ae434b8..fec974710c0c 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index 049b40fc9636..be8b21a4d758 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -1,4 +1,7 @@
 AUX QGnomePlatform-0.6.1-qt5.15.patch 682 BLAKE2B 418b0c478d191e58186625cd2a307daa8f3771ee284283d84b25be2af797116f991ceac819a9e5f0258a6c3f6933c13ae66bd6912979f8d8bd847c5b7aa8d873 SHA512 c0f364f9aae6d268b410a9aa97d9442f9ec949b0dedb19836146ba9c600e2fde9bd645613c7a2bd35c960746986172258bf3fbe315e42c37be9dc14f2df8b3cb
+AUX QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch 2915 BLAKE2B d485fafae9f15abeb79a44cf30a4926972aa3f1fc7bc69d1ea007ce97c30901eecbead9667b4f78619ae2d1d45a2bc6c70adbeece61ca7fcbd4b775fa896ecdc SHA512 a062330fb6ecc26e2c9d75dc8f11d1de207832fe0d15559aeccec79c4e62e4f866d848648f632595e6dfed4f8024a16dbb14d76d53815e000b064bd6b2bf24f7
 DIST QGnomePlatform-0.6.1.tar.gz 28996 BLAKE2B 3d0da37fcc8e85bd59263dffb19865666d25dd50d2c1e00b4d6358d745eb7079f415058ffb75a8228c9c7ed956003a656b3e10a3467d9fc9dcd5eee2c14bf7cd SHA512 5e0bab45a8ff4c56e6e34d636ed719ce1a087f116942dd356253403d4be40aac348ccbdbfc917f65f6cc4df8619e1031734f0a46a36d4d9b7bb4838ded61570c
+DIST QGnomePlatform-0.7.0.tar.gz 33398 BLAKE2B 28cd8c070465074f137c669c6bf5835ced26e53ebb2ae4fe96f5bf9ddabd5df6adf947499d51fa8700d5a77a35f5715711f4ccc117fe1613ec70cbfacde501fd SHA512 9bca42a79e536ec2ff03ff2ed89dac572ea15d8a1a7fc72ac564208a82dd5ac442f1a3eb4ef54ac466a754fbc66f078105ef9bea5b0206d20be63c0f942da243
 EBUILD QGnomePlatform-0.6.1-r1.ebuild 697 BLAKE2B ea7d467da40c27d288cb803bcad0146cc10d4564f87e267d59af94716cc9fedab98b84e23cc77010310c8240a6af5679934053f4776c28e059bcd6c15dbe4b8c SHA512 4a7c1e0559ca73ca961fc00e8b68663b37e62bec019875ce4e4b921fb7730e935dce5b2dad77198d6c6b6e607d4e7d0dba1421322a15222aceccac3128a190fa
+EBUILD QGnomePlatform-0.7.0.ebuild 820 BLAKE2B 23d1c18c80f7552727cff8b2d0f4a8aa601137c41abc4fda17c3252bf1a1cb9a3ec17db89debb2b30ac8fc9e0755577e6591c3c26dda4cba6be596469bb0d929 SHA512 b24b7b1f2c36b97ee219ce9e359fcc98e1315ea67722c45b420ba13b148ff5a65de5fc7e502df410de66e1a105e0d62687af6f172e2bb9fd53a19845ccac9431
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.7.0.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.7.0.ebuild
new file mode 100644
index 000000000000..26e756b1b51e
--- /dev/null
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qmake-utils
+
+DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings"
+HOMEPAGE="https://github.com/FedoraQt/QGnomePlatform"
+SRC_URI="https://github.com/FedoraQt/QGnomePlatform/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtdbus:5=
+	>=dev-qt/qtwidgets-5.12:5=
+	dev-qt/qtwayland:5=
+	dev-qt/qtx11extras:5=
+	sys-apps/xdg-desktop-portal
+	x11-libs/gtk+:3[X]
+	>=x11-themes/adwaita-qt-1.2.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+	# From Fedora, fixed in next version
+	"${FILESDIR}/${P}-qxdgdesktopfiledialog-fixes.patch"
+)
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	INSTALL_ROOT="${D}" default
+}
diff --git a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch
new file mode 100644
index 000000000000..db43a69d0b17
--- /dev/null
+++ b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch
@@ -0,0 +1,63 @@
+From e244e003b68f660dbb0795d18ad70e8a11689712 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Mon, 4 Jan 2021 11:43:36 +0100
+Subject: QXdgDesktopPortalFileDialog: backport upstream fixes
+
+
+diff --git a/common/qxdgdesktopportalfiledialog.cpp b/common/qxdgdesktopportalfiledialog.cpp
+index 7502a6e..c4dc2da 100644
+--- a/common/qxdgdesktopportalfiledialog.cpp
++++ b/common/qxdgdesktopportalfiledialog.cpp
+@@ -210,7 +210,7 @@ void QXdgDesktopPortalFileDialog::openPortal()
+     qDBusRegisterMetaType<FilterList>();
+ 
+     FilterList filterList;
+-    Filter* selectedFilter = nullptr;
++    auto selectedFilterIndex = filterList.size() - 1;
+ 
+     d->userVisibleToNameFilter.clear();
+ 
+@@ -236,7 +236,7 @@ void QXdgDesktopPortalFileDialog::openPortal()
+             filterList << filter;
+ 
+             if (!d->selectedMimeTypeFilter.isEmpty() && d->selectedMimeTypeFilter == mimeTypefilter)
+-                selectedFilter = &filterList.last();
++                selectedFilterIndex = filterList.size() - 1;
+         }
+     } else if (!d->nameFilters.isEmpty()) {
+         for (const QString &nameFilter : d->nameFilters) {
+@@ -246,7 +246,12 @@ void QXdgDesktopPortalFileDialog::openPortal()
+             QRegularExpressionMatch match = regexp.match(nameFilter);
+             if (match.hasMatch()) {
+                 QString userVisibleName = match.captured(1);
+-                QStringList filterStrings = match.captured(2).split(QLatin1Char(' '), QString::SkipEmptyParts);
++                QStringList filterStrings = match.captured(2).split(QLatin1Char(' '), Qt::SkipEmptyParts);
++
++                if (filterStrings.isEmpty()) {
++                    qWarning() << "Filter " << userVisibleName << " is empty and will be ignored.";
++                    continue;
++                }
+ 
+                 FilterConditionList filterConditions;
+                 for (const QString &filterString : filterStrings) {
+@@ -265,7 +270,7 @@ void QXdgDesktopPortalFileDialog::openPortal()
+                 d->userVisibleToNameFilter.insert(userVisibleName, nameFilter);
+ 
+                 if (!d->selectedNameFilter.isEmpty() && d->selectedNameFilter == nameFilter)
+-                    selectedFilter = &filterList.last();
++                    selectedFilterIndex = filterList.size() - 1;
+             }
+         }
+     }
+@@ -273,9 +278,8 @@ void QXdgDesktopPortalFileDialog::openPortal()
+     if (!filterList.isEmpty())
+         options.insert(QLatin1String("filters"), QVariant::fromValue(filterList));
+ 
+-    if (selectedFilter) {
+-        options.insert(QLatin1String("current_filter"), QVariant::fromValue(*selectedFilter));
+-    }
++    if (selectedFilterIndex != -1)
++        options.insert(QLatin1String("current_filter"), QVariant::fromValue(filterList[selectedFilterIndex]));
+ 
+     options.insert(QLatin1String("handle_token"), QStringLiteral("qt%1").arg(QRandomGenerator::global()->generate()));
+ 
diff --git a/x11-themes/adwaita-qt/Manifest b/x11-themes/adwaita-qt/Manifest
index c48ec62723ee..56c9127d17c0 100644
--- a/x11-themes/adwaita-qt/Manifest
+++ b/x11-themes/adwaita-qt/Manifest
@@ -1,5 +1,5 @@
-DIST adwaita-qt-1.1.1.tar.gz 435566 BLAKE2B c8ca8df84ce06311b0937d994a859bb6e71a4a45570c179bdf3ded144bee06c93d8d80b300db3786b1bcc8db7f2b1d78423c8d8b0456079c4563924b2a036abc SHA512 6d11fc8eecc94da4f2e3798ee5147258f277032b23a82d5bf8d3414943ac89c5ebd056d519338959c72a8a45d1638ab8cfeac01b3f3fd1118b4c89eb0c8b5608
 DIST adwaita-qt-1.1.4.tar.gz 436392 BLAKE2B 2a8ab80a2189cc7bbc21bb83c409b16c8824364cc768765246876dedab8ac4073f0325d28dd916b2173bb3cd7396bb2c4b19b07c8932d589200d91f3ea48e2b9 SHA512 78390787c4b080608036605c6c713bbd5d482b039796e76974ca8c034e0d8af694704e063d53f99a3e5e7ac4d48f6325ff1c90d67fbeb4bc9e49792485e11cb1
-EBUILD adwaita-qt-1.1.1.ebuild 872 BLAKE2B d560355c9a638a9d4d261091761d07374a51592b6fad05f75894335499d4ccc1b8a00e54d7f3519598efeaf86fef6fa852a8c94dddc84b3f09f9f4d0f9479fa0 SHA512 426e8787277aff420a4871a9f4b865a6353f221baa26dc308681f2315cce5e46e87c916c10b5a8ee7d2c2d170a28d4f49741c76d0014830bbf88074679b4ab80
+DIST adwaita-qt-1.2.0.tar.gz 438425 BLAKE2B 752d00197f107b0c94d15dd3c0a1f5f55f5b388b077ce8cfaac5dd01651bea6b97e24e85e600298aa9d19bb6c0ea1cfbecef41248eb78a8cb60b284a5ede10e4 SHA512 313697ad6474dc15eae8e6650cd6eb2e31dc3005978c6de5aa92003f3c426f9a04523bb839922f9acaca35495566dedb049df9582d1a6666dcf97e8429a7a778
 EBUILD adwaita-qt-1.1.4.ebuild 872 BLAKE2B d560355c9a638a9d4d261091761d07374a51592b6fad05f75894335499d4ccc1b8a00e54d7f3519598efeaf86fef6fa852a8c94dddc84b3f09f9f4d0f9479fa0 SHA512 426e8787277aff420a4871a9f4b865a6353f221baa26dc308681f2315cce5e46e87c916c10b5a8ee7d2c2d170a28d4f49741c76d0014830bbf88074679b4ab80
+EBUILD adwaita-qt-1.2.0.ebuild 583 BLAKE2B 31ef4fadf0887d5926585b11731d65b9048c064c043d9c451e871f44c6459fbc5340bc472fc409002ed52bfef2c99d7a8a1c1128dcca002cce1e0d74fc0131d4 SHA512 237f0c254619affb7d7c778483e085a5b9a2b0d00bd51520a7049673dfaf0038d427fc0122d112741950cd53fd68fd353520af0a0ab2a9284f1e8e560575564f
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.1.1.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.1.1.ebuild
deleted file mode 100644
index 662921101d5a..000000000000
--- a/x11-themes/adwaita-qt/adwaita-qt-1.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A style to bend Qt applications to look like they belong into GNOME Shell"
-HOMEPAGE="https://github.com/FedoraQt/adwaita-qt"
-SRC_URI="https://github.com/FedoraQt/${PN}/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="gnome"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	gnome? ( x11-themes/QGnomePlatform )
-"
-
-src_configure() {
-	BUILD_DIR="${WORKDIR}/${PN}_qt5"
-	local mycmakeargs=( -DUSE_QT4=OFF )
-	cmake_src_configure
-}
-
-src_compile() {
-	local _d
-	for _d in "${WORKDIR}"/${PN}_qt*; do
-		cmake_src_compile -C "${_d}"
-	done
-}
-
-src_install() {
-	local _d
-	for _d in "${WORKDIR}"/${PN}_qt*; do
-		cmake_src_install -C "${_d}"
-	done
-}
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.2.0.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.2.0.ebuild
new file mode 100644
index 000000000000..008c282fd64b
--- /dev/null
+++ b/x11-themes/adwaita-qt/adwaita-qt-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A style to bend Qt applications to look like they belong into GNOME Shell"
+HOMEPAGE="https://github.com/FedoraQt/adwaita-qt"
+SRC_URI="https://github.com/FedoraQt/${PN}/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="gnome"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+"
+RDEPEND="${DEPEND}"
+PDEPEND="gnome? ( x11-themes/QGnomePlatform )"
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index b434ffae93a0..7b9d7bf38185 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -1,3 +1,3 @@
 DIST fvwm-crystal-3.6.5.tar.gz 5899049 BLAKE2B addd82dbbab9b457a94715a969a27ff6ef2be07cddd33a379dc4d5348c9565d3a19943828b068ec5ef5f6d032f51b77a1990316ee7b3e16e5dc98ddf32f98c7d SHA512 45cd99b83342e5e5f0de89edc92dbba3311efc7ef431d509490e3fd5b49420e94d1cef55865f45e731fd4c13172c6e2d26fbd10107cdb4a4f525379e17b94e6d
-EBUILD fvwm-crystal-3.6.5.ebuild 2523 BLAKE2B 05510e0de8c935237f6ec6dc380479f4174f129beb3fd362b1055b8ad728b4608969da86ffa2f444fa5cb34da2c1e293f17c1d0940ff413cc48b833a2fb3b34a SHA512 1a2ec5b41e9ee816db14dae94c926093fb1171a4d08396569faaec9a404e50caf04db16d56dc9a9b84474975dc00eae137fd95c0b403d5c5e2673a9710929f73
+EBUILD fvwm-crystal-3.6.5.ebuild 2501 BLAKE2B 3565b7c949aec2d4c1882b43c14c1e209ddfee8c87cac04027745b0848e8aaf920eeddc53b20a359c66ff59a6632c3fbf201d2ff5e74079e1b9706f40953ab51 SHA512 f396b264b5955cce2f139f911d16892e11395607772917221ad0638e0605d91ec2ec377ccaad1c8b3d24c1cdc885003b68a50ad76a108b661d815b02c5137a81
 MISC metadata.xml 1139 BLAKE2B af56bf2214314c067f3b6f913e882eb7951397d388dd3f51616a658c71100b7df8a8ba7eae451252ba146f3af5c69678d35a999b9390f8f8e5ff587d1d8842a7 SHA512 4e4ac9d975627fe48eaac181570c023fef881d573237bdc634bbfd6a4308d4e38e4636c8aa805e74a54f0a84c0a649f6db1dd7bb7dc5ea0bdd0b01d9c8fd2f87
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild
index c3d5fd91bd7f..5bf7b8131c43 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,6 @@ case ${PV} in
 	inherit subversion
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/fvwm-crystal/code"
 	SRC_URI=""
-	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}"
 	src_unpack() {
 		subversion_src_unpack
diff --git a/x11-themes/gtk-engines-experience/Manifest b/x11-themes/gtk-engines-experience/Manifest
index 2b6f1691a0d4..19ea2be4355c 100644
--- a/x11-themes/gtk-engines-experience/Manifest
+++ b/x11-themes/gtk-engines-experience/Manifest
@@ -1,3 +1,4 @@
+AUX gtk-engines-experience-0.10.5-fno-common.patch 4319 BLAKE2B 1fde87f595e5101425b211f8b85a6bcf75371a659db5bfe9be6926187d54eb474bf1e781c928627efb735f606a1bd9e9aa1557d8a72828bcde97dcc52e3e30fb SHA512 944798c2fb9d5a23cef8e32c430e7bca8a4f44044b8857aee171fd56f1a100928a91fc33f29429f0c0fe8a5d034ab98dbaffac43de7e98fbd3c8a2d8e6fd5150
 DIST gtk-engine-experience-0.10.5.tar.bz2 266776 BLAKE2B d4f0e09af661aa486d26711fc563aab581cbef68874a8324d4a30e70649a6666b3a8dd98aab6cb7c13f48f7889747d3f5c0dd74d3c00003b116d4a285914b650 SHA512 c783b5bb19cbdda202cdc5294b27fad5b9854bdebb2ffce28ba675d743ab385dc82fa63dcfc1818207847de4be37daea9177affa179339edcfe622c9fd2a6604
-EBUILD gtk-engines-experience-0.10.5.ebuild 683 BLAKE2B c5dc3f0d3d02dbe51991dbec8290464c924e911171e9ed5261f47e528628cdaec68ef71dd885927bd16d653ae8d4679f5ed812840fc3e65e9ed0d51df9bacbd4 SHA512 c27a19e20394557c865f3da61071ab0eab2231ca27ca4f6b8e0fd163b5f1c962031dd53fdca1cf33de931ec3a065b305c0c9ca159517ea5b25a3a8b7c232087f
+EBUILD gtk-engines-experience-0.10.5.ebuild 732 BLAKE2B 62fc0239ca6afb87f1b49687d25bb0fd5fea93a54708d975e2e583b69ace525aa60e5621375fe48aba2632ce76a0d9f28edfa17d3d41ebc66636c69720e3dbfa SHA512 95c6f945253aa4ec0ab67b48dccf836d742d0cdfca1f71a1bd3a8f4da477ba73706fb978bbf8e4b359a5777e3b44e00f06d9595221e5349bc8223a4354de409b
 MISC metadata.xml 572 BLAKE2B f85f505d2b4a2f3bab87d3ad20b402fbfbd864bacc16d69c057f79e894614642e433730f0ea19ff710a09e2616749ced6708584c2d702eecd3b4b40d7cb8558f SHA512 6d6d6ef0f4f55cc64ba6543acbb4d761ac1e56ea9d646b0f93f2027a0458d0f5a57f1fa17f13679a9f1630bf4d15acdaf28bfc8b2c7afe6ea8a80b0e770c885b
diff --git a/x11-themes/gtk-engines-experience/files/gtk-engines-experience-0.10.5-fno-common.patch b/x11-themes/gtk-engines-experience/files/gtk-engines-experience-0.10.5-fno-common.patch
new file mode 100644
index 000000000000..f93fc1c3b3ce
--- /dev/null
+++ b/x11-themes/gtk-engines-experience/files/gtk-engines-experience-0.10.5-fno-common.patch
@@ -0,0 +1,131 @@
+--- a/src/experience.h
++++ b/src/experience.h
+@@ -39,17 +39,18 @@
+ 
+ #define CLAMP_COLOR(color) CLAMP(color, 0, GDK_COLOR_MAX)
+ 
+-enum {
++typedef enum {
+ 	NONE,
+ 	PARSING,
+ 	RUNNING
+-} experience_engine_state EXPERIENCE_INTERNAL;
++} experience_engine_state_type;
++extern experience_engine_state_type experience_engine_state EXPERIENCE_INTERNAL;
+ 
+-GQuark experience_g_quark EXPERIENCE_INTERNAL;
++extern GQuark experience_g_quark EXPERIENCE_INTERNAL;
+ 
+-gboolean experience_print_widget_path EXPERIENCE_INTERNAL;
++extern gboolean experience_print_widget_path EXPERIENCE_INTERNAL;
+ /* gboolean warn_invalid_gtype; */
+-gboolean experience_parser_error EXPERIENCE_INTERNAL;
++extern gboolean experience_parser_error EXPERIENCE_INTERNAL;
+ 
+ /* All GTK drawing functions: */
+ typedef enum {
+--- a/src/fill.c
++++ b/src/fill.c
+@@ -22,6 +22,8 @@
+ #include <string.h>
+ #include "fill.h"
+ 
++eXperienceDrawableClass * experience_fill_class EXPERIENCE_INTERNAL;
++
+ void
+ experience_fill_set_color (eXperienceFill * fill, eXperienceDynamicColor color)
+ {
+--- a/src/fill.h
++++ b/src/fill.h
+@@ -25,7 +25,7 @@
+ #include "drawable.h"
+ #include "dynamic_color.h"
+ 
+-eXperienceDrawableClass * experience_fill_class EXPERIENCE_INTERNAL;
++extern eXperienceDrawableClass * experience_fill_class EXPERIENCE_INTERNAL;
+ 
+ typedef struct {
+ 	eXperienceDrawable drawable;
+--- a/src/image.c
++++ b/src/image.c
+@@ -26,6 +26,8 @@
+ #include "filter.h"
+ #include "image_loading.h"
+ 
++eXperienceDrawableClass * experience_image_class EXPERIENCE_INTERNAL;
++
+ #define CHECK_AND_SET_OPTION(image, option, message) { \
+ 	if (image->options_set & option) { \
+ 			g_printerr ("Error in image #%i in group %s: %s\n", image->drawable.number, image->drawable.group_name, message); \
+--- a/src/image.h
++++ b/src/image.h
+@@ -25,7 +25,7 @@
+ #include <gdk/gdk.h>
+ #include "drawable.h"
+ 
+-eXperienceDrawableClass * experience_image_class EXPERIENCE_INTERNAL;
++extern eXperienceDrawableClass * experience_image_class EXPERIENCE_INTERNAL;
+ 
+ typedef enum
+ {
+--- a/src/main.c
++++ b/src/main.c
+@@ -29,6 +29,10 @@
+ #include "image.h"
+ #include "fill.h"
+ 
++GQuark experience_g_quark EXPERIENCE_INTERNAL;
++gboolean experience_parser_error EXPERIENCE_INTERNAL;
++gboolean experience_print_widget_path EXPERIENCE_INTERNAL;
++
+ G_MODULE_EXPORT void theme_init (GTypeModule *module);
+ G_MODULE_EXPORT void theme_exit (void);
+ G_MODULE_EXPORT GtkRcStyle * theme_create_rc_style (void);
+--- a/src/rcstyle.c
++++ b/src/rcstyle.c
+@@ -31,6 +31,9 @@
+ #include "image_loading.h"
+ #include "render.h"
+ 
++GType experience_type_rc_style EXPERIENCE_INTERNAL;
++experience_engine_state_type experience_engine_state EXPERIENCE_INTERNAL;
++
+ static void      experience_rc_style_init         (eXperienceRcStyle      *style);
+ static void      experience_rc_style_class_init   (eXperienceRcStyleClass *klass);
+ static GtkStyle *experience_rc_style_create_style (GtkRcStyle         *rc_style);
+--- a/src/rcstyle.h
++++ b/src/rcstyle.h
+@@ -29,7 +29,7 @@
+ typedef struct _eXperienceRcStyle eXperienceRcStyle;
+ typedef struct _eXperienceRcStyleClass eXperienceRcStyleClass;
+ 
+-GType experience_type_rc_style EXPERIENCE_INTERNAL;
++extern GType experience_type_rc_style EXPERIENCE_INTERNAL;
+ 
+ #define EXPERIENCE_TYPE_RC_STYLE              experience_type_rc_style
+ #define EXPERIENCE_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), EXPERIENCE_TYPE_RC_STYLE, eXperienceRcStyle))
+--- a/src/style.c
++++ b/src/style.c
+@@ -24,6 +24,9 @@
+ #include "style.h"
+ #include "drawing_functions.h"
+ 
++GType experience_type_style EXPERIENCE_INTERNAL;
++GtkStyleClass *experience_style_parent_class EXPERIENCE_INTERNAL;
++
+ static void
+ experience_style_class_init (eXperienceStyleClass * klass)
+ {
+--- a/src/style.h
++++ b/src/style.h
+@@ -25,8 +25,8 @@
+ typedef struct _eXperienceStyle eXperienceStyle;
+ typedef struct _eXperienceStyleClass eXperienceStyleClass;
+ 
+-GType experience_type_style EXPERIENCE_INTERNAL;
+-GtkStyleClass *experience_style_parent_class EXPERIENCE_INTERNAL;
++extern GType experience_type_style EXPERIENCE_INTERNAL;
++extern GtkStyleClass *experience_style_parent_class EXPERIENCE_INTERNAL;
+ 
+ #define EXPERIENCE_TYPE_STYLE              experience_type_style
+ #define EXPERIENCE_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), EXPERIENCE_TYPE_STYLE, eXperienceStyle))
diff --git a/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild b/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
index 87addbca4a19..452ed2e297de 100644
--- a/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
+++ b/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,6 +21,8 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_prepare() {
 	default
 	eautoreconf # need new libtool for interix
diff --git a/x11-themes/vdr-channel-logos/Manifest b/x11-themes/vdr-channel-logos/Manifest
index c4d2357864b8..300f38807c27 100644
--- a/x11-themes/vdr-channel-logos/Manifest
+++ b/x11-themes/vdr-channel-logos/Manifest
@@ -1,4 +1,4 @@
 DIST logos-0.2.tar.gz 659476 BLAKE2B ed882e950fb5d1a8c1fea6194dc5311c43f68f92d25cb2e2b9298c2ef86ec165f30217b58f470cbc81d8122cedd1fa8441f6ab7249a448e3160f5d0c4f797810 SHA512 27b961a9c4da2e3d11e932f0ed69e85f5cac5e06666b1cff116cae483a32ab45c794ebb225900153745cb75ae51d211dbdb5a8dafb28997a5420859dd8ef55ad
-EBUILD vdr-channel-logos-0.2-r2.ebuild 854 BLAKE2B f821c2891561a014b246036b459ae215109705764cd1d89afc26f708eabf87d94e768cef680eddebfa226503477269d9c675825c49e2b4ec370876ac89740fc6 SHA512 40e87afb419c81fff097e1b0f3d0cc328a61c259deda43fe92ec139f5f103377ff4f260770a27d50b04d2e4ba5eb1db8fea1e5ff7e45a26780128955ef531b63
+EBUILD vdr-channel-logos-0.2-r3.ebuild 910 BLAKE2B daf250c2bcb73700ce4858a94a9d4264f1e5c62e5ca5424178def751a286c619a52752f21fa55e57d97401ad41c45bbbadebedbf618c2e8169baa69a42555751 SHA512 351c3aa40973793ac44cdb8f6443c00600f7ad4d6a38af76009afb415b625761705a5653568f832e8902878d855e1b46b5ec0cf51ffc2f3682f071ba948a8159
 EBUILD vdr-channel-logos-0.2.ebuild 544 BLAKE2B ce3f3ae3048b889ff6959fca03af9d7298544cea927c4ed4678bec1f396acebc3b342ed0446df011be759af9842f121e89fb7f19aef7be2aba21edfc0a96f89b SHA512 b51d52c716a1c4d411ce68408ebf7c8628135f942ced4968cb15f539ba478ff6c6532994f8a9ff4f4b5eb22970192d77f9b42dea5813db0d3aade90fb1c84297
 MISC metadata.xml 362 BLAKE2B adf483a7a510a8722e3f2a466c6cd79412ae0c87835a1dc29ff866ccaa43822ea8746ab699e5c3513e9aca22c183857f5918437fa20ac171e06a69b6112158ca SHA512 5e450b3909bef6baa28baae73ed91476826137a8b2f244d5543f4b428bcca42d1bfa52bd32cbca3df3abd4b2fc45175ac78adb786c01b8b604f54a3b5a6633f1
diff --git a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r2.ebuild b/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild
index 7baf764c285f..427c4822d44b 100644
--- a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r2.ebuild
+++ b/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,9 +30,11 @@ _test_charmap() {
 src_prepare() {
 	default
 
-	_test_charmap
-
-	convmv --notest --replace -f iso-8859-1 -t utf-8 -r "${S}"/
+	# bug 715684
+	if [[ ${CHOST} != *-musl* ]] ; then
+		_test_charmap
+	fi
+		convmv --notest --replace -f iso-8859-1 -t utf-8 -r "${S}"/
 }
 
 src_install() {
diff --git a/x11-themes/vertex-icon-theme/Manifest b/x11-themes/vertex-icon-theme/Manifest
index a13ededb20ed..e287e3f3b118 100644
--- a/x11-themes/vertex-icon-theme/Manifest
+++ b/x11-themes/vertex-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST vertex-icon-theme-20150506.tar.gz 5578183 BLAKE2B 59310cdafeff6bc81c70dfb9c2074a1cd4f1dbec4a12ad8fc9598ef0a97f12a0b8ea61ee45bee54d15f024c2c87a0ae981f0e3a2974e3d7ae6b4b6f84eac81e7 SHA512 24176527f50eb2f23621d9dffe9829aba44507939a3ce67dad5480f4297d5004ddccc575b68e86ff9d6db1e5124b89832eff801fab95baf2ca30e305d8083324
-EBUILD vertex-icon-theme-20150506.ebuild 1198 BLAKE2B cc6668260100e69745ee3372f4a59f53497cb0c6126970931e4d88a6468b44d60a8ae934403b0c4648f90031f8521b884134b8929b08404b47b75e8ce4f72e4d SHA512 b3cf6d2220bd86f6afe68d21e67b3f0f3e4034514cdcc6a3009feedbdfba5565a38dbdffaef5f6211d2f0debf0b35e571d9ee64536fe6749cd7be8104fcd16d9
+EBUILD vertex-icon-theme-20150506.ebuild 1176 BLAKE2B d0120c6b32563b6d6f4237e483c88d979f3b0b975eca72ce51e960368ca60f30306d128e2c934d82544e8096509063b1c7114f880a17109e63c17b62ce715948 SHA512 671eb5f6e8187e1054fe4dbc0caa5b1191a9006d2e6614c795d0cba6811866b2605bbb9b443e24c1c087b2db2479b0a38ef45bbaacb5a701fb2cbed9bb6e1fba
 MISC metadata.xml 340 BLAKE2B 6ef4c11038845ebd74258945d323812a59ee730e704c4407ccf82aa3e2362cbc4369435fce06e54dbfbcc6f740b9d085706b84ce2e983664c2ef1a282b05f743 SHA512 a549f9e5cd50b49baa8591a572193a7f12937c1fdc98b11d8e088bff1418003f7e7ddada0fa5eff2fd66c2b68ca24c77f6d561530a59f6d82de28a6204be6af7
diff --git a/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506.ebuild b/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506.ebuild
index 79ed9e68878b..efa82421d755 100644
--- a/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506.ebuild
+++ b/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/horst3180/${MY_PN}"
 	SRC_URI=""
-	KEYWORDS="amd64 x86"
 else
 	EGIT_COMMIT="f27e47edf392596b7967b7d134d3c62ac3fda0c9"
 	SRC_URI="https://github.com/horst3180/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"