summaryrefslogtreecommitdiff
path: root/x11-misc
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/Manifest.gzbin48186 -> 48198 bytes
-rw-r--r--x11-misc/colord/Manifest2
-rw-r--r--x11-misc/colord/colord-1.4.6.ebuild1
-rw-r--r--x11-misc/compose-tables/Manifest4
-rw-r--r--x11-misc/compose-tables/compose-tables-1.7.4.ebuild42
-rw-r--r--x11-misc/compose-tables/compose-tables-1.7.5.ebuild42
-rw-r--r--x11-misc/dunst/Manifest4
-rw-r--r--x11-misc/dunst/dunst-1.7.3-r1.ebuild79
-rw-r--r--x11-misc/dunst/dunst-1.8.1.ebuild2
-rw-r--r--x11-misc/polybar/Manifest2
-rw-r--r--x11-misc/polybar/polybar-3.6.2.ebuild61
-rw-r--r--x11-misc/qtfm/Manifest2
-rw-r--r--x11-misc/qtfm/metadata.xml4
-rw-r--r--x11-misc/rofi/Manifest2
-rw-r--r--x11-misc/rofi/rofi-1.7.3-r1.ebuild2
-rw-r--r--x11-misc/sddm/Manifest11
-rw-r--r--x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch20
-rw-r--r--x11-misc/sddm/files/sddm-0.18.1-Xsession.patch (renamed from x11-misc/sddm/files/sddm-0.18.0-Xsession.patch)8
-rw-r--r--x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch94
-rw-r--r--x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch (renamed from x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch)9
-rw-r--r--x11-misc/sddm/files/sddm.tmpfiles1
-rw-r--r--x11-misc/sddm/metadata.xml36
-rw-r--r--x11-misc/sddm/sddm-0.18.1-r6.ebuild (renamed from x11-misc/sddm/sddm-0.18.1-r5.ebuild)84
-rw-r--r--x11-misc/shared-mime-info/Manifest3
-rw-r--r--x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild93
-rw-r--r--x11-misc/spnavcfg/Manifest2
-rw-r--r--x11-misc/spnavcfg/spnavcfg-1.0.ebuild33
-rw-r--r--x11-misc/trayer/Manifest2
-rw-r--r--x11-misc/trayer/trayer-1.0-r4.ebuild17
-rw-r--r--x11-misc/vdpauinfo/Manifest4
-rw-r--r--x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild28
-rw-r--r--x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild2
-rw-r--r--x11-misc/xfe/Manifest2
-rw-r--r--x11-misc/xfe/metadata.xml5
-rw-r--r--x11-misc/xpad/Manifest2
-rw-r--r--x11-misc/xpad/xpad-5.7.0.ebuild10
-rw-r--r--x11-misc/xystray/Manifest1
-rw-r--r--x11-misc/xystray/xystray-1.0-r1.ebuild25
38 files changed, 512 insertions, 229 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 450bbf62815b..05b5ea3a4436 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
Binary files differ
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 35d1247a6323..69167abf48ff 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
DIST colord-1.4.6.tar.xz 1872528 BLAKE2B bf87ed1abe0a827ad81b5467847975d70e4cb83c1973fac3bcb1650875b7a0b375d48633bb1b01c7da1e8acd62cc4cf19f0efe9722e12bde3d8ec4833800ef2c SHA512 d55d3322199d0bfee74eee9e183c9246ec33e755f0144d96087acb3c43ab5a3d872086fcef9f29cdd2295be71daac703cdf90ad10bf183622fdd84347e7af123
-EBUILD colord-1.4.6.ebuild 3350 BLAKE2B 6b6badab6b2ab5780f14936386566467a6c3925ab58f45563331d32fe3c81b48f14603bb9bfa476eca202c113a71fff30aa0bd72634eea9250f676c16a49adfd SHA512 6f00b9fcc94a7a21d456499ea830a80a4311fdffff50aa322545edac919e2c46c67b200e6e9789c5db0f1f71212d1d423a95025501f80ac3d9a9eb5981843105
+EBUILD colord-1.4.6.ebuild 3324 BLAKE2B 9ccc1bb18d01f57d9aa0ec70822644b95511879b1f448c0cbd1d6389dc5e70c9699bf61321aeba16a231699b2a2b182a31c3bb87cd6b21127bd49f7ea3fe681b SHA512 a3cc46372ec78d2b1eeea2dcfa01fcf988b78db3b54a779841166aeb1083c8811df031d3bcaa58fd5530746fabdea6ae33bc7e507836635d52ec9464ca192f84
MISC metadata.xml 459 BLAKE2B 6d8217206edfdae4ed92783b04004d62c6eed7c8d684ad6b921d44c8830fee2aeb5480de68fbbe78535e4825333b1c312bb70196e18102e62d696e26597e8441 SHA512 4f255205fc902918b48a3c653e5c732a117df2e5a8f7ce6e4a7517b03694e14882e484440fce98e9c4cc13aa62739e01666d969e19947a5ae6e3b37130260508
diff --git a/x11-misc/colord/colord-1.4.6.ebuild b/x11-misc/colord/colord-1.4.6.ebuild
index 818cce065a64..8dffbd9ed219 100644
--- a/x11-misc/colord/colord-1.4.6.ebuild
+++ b/x11-misc/colord/colord-1.4.6.ebuild
@@ -46,7 +46,6 @@ BDEPEND="
acct-user/colord
app-text/docbook-xsl-ns-stylesheets
dev-libs/libxslt
- >=dev-util/intltool-0.35
>=sys-devel/gettext-0.17
virtual/pkgconfig
extra-print-profiles? ( media-gfx/argyllcms )
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index e6f4ed79c789..375c0cb6c066 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,7 @@
DIST libX11-1.7.3.tar.xz 1861304 BLAKE2B e0f647ef55567b1d7eff74bc053b8e73f8c696be6f233c2ff6f64dee65c1b40b746683ea7a6fafb4304eba4dec43301b4b3506e2ec6fac1d4c89d664b516bbdd SHA512 abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294
+DIST libX11-1.7.4.tar.xz 1872992 BLAKE2B 6a25e5008ead53be5af7411f51711789eb410473f9aefc49fb4d0bf7227b89c5fd71f0f61fef9bc3f83e585e4815644f42884d5e5cf0bdcdd120abe6fe8a741b SHA512 8bfaaf9fc3081c47152d533d30cdc0b2521bfeb088ff813b041c08ffd518c80ba3725bb68cac7c21b521a4bace546f99424700fe21955b498015d14c2f7f9a57
+DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
EBUILD compose-tables-1.7.3.ebuild 943 BLAKE2B 859cec003f23b043e2271eab3aa31a01ee8ff66a7a78749ced99ff98d09eeb085497fe799138d5efa2a30f83f1097305a90ffa7caccf47bffbdfed72faa29e48 SHA512 2355bba44c7af1937aea4cc68248a96e38f9fd6188d85da7a755e344f4e3add63ae19db03409703b103ebb5045401b621a4258866ead6c79fbd1fb78f9e1e9a4
+EBUILD compose-tables-1.7.4.ebuild 951 BLAKE2B 450f86acb64044d49f6fd21d92a70a3997fd5fe96105aa2676de65737086d982f9a139764e6cbe32e9e0379ae5deca0a17f6e455c5129ed2db6b1c3756ee71ee SHA512 da3d0b1217ef9a2d7f786e99001de745659d5aba01cd9e4d316116972d411abedabf006f1020437b6657c188162088d5b4f02a2c1074e1c736b3fd51bb25c610
+EBUILD compose-tables-1.7.5.ebuild 951 BLAKE2B 450f86acb64044d49f6fd21d92a70a3997fd5fe96105aa2676de65737086d982f9a139764e6cbe32e9e0379ae5deca0a17f6e455c5129ed2db6b1c3756ee71ee SHA512 da3d0b1217ef9a2d7f786e99001de745659d5aba01cd9e4d316116972d411abedabf006f1020437b6657c188162088d5b4f02a2c1074e1c736b3fd51bb25c610
MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-misc/compose-tables/compose-tables-1.7.4.ebuild b/x11-misc/compose-tables/compose-tables-1.7.4.ebuild
new file mode 100644
index 000000000000..4cdfc490b634
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.7.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=no
+XORG_TARBALL_SUFFIX=xz
+inherit xorg-3
+
+# Note: please bump this with x11-libs/libX11
+DESCRIPTION="X.Org Compose Key tables from libX11"
+# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
+SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
+S="${WORKDIR}/libX11-${PV}/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# Only needed by configure
+DEPEND="
+ x11-base/xorg-proto
+ >=x11-libs/libxcb-1.11.1
+ x11-libs/xtrans"
+RDEPEND="!<x11-libs/libX11-1.7.0"
+
+XORG_CONFIGURE_OPTIONS=(
+ --without-xmlto
+ --without-fop
+ --disable-specs
+ --disable-xkb
+)
+
+src_compile() {
+ emake -C nls
+}
+
+src_test() {
+ :;
+}
+
+src_install() {
+ emake DESTDIR="${D}" -C nls install
+}
diff --git a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild b/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
new file mode 100644
index 000000000000..4cdfc490b634
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=no
+XORG_TARBALL_SUFFIX=xz
+inherit xorg-3
+
+# Note: please bump this with x11-libs/libX11
+DESCRIPTION="X.Org Compose Key tables from libX11"
+# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
+SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
+S="${WORKDIR}/libX11-${PV}/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# Only needed by configure
+DEPEND="
+ x11-base/xorg-proto
+ >=x11-libs/libxcb-1.11.1
+ x11-libs/xtrans"
+RDEPEND="!<x11-libs/libX11-1.7.0"
+
+XORG_CONFIGURE_OPTIONS=(
+ --without-xmlto
+ --without-fop
+ --disable-specs
+ --disable-xkb
+)
+
+src_compile() {
+ emake -C nls
+}
+
+src_test() {
+ :;
+}
+
+src_install() {
+ emake DESTDIR="${D}" -C nls install
+}
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index f9af81c8a6e5..921c2f9b0d5b 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,6 +1,4 @@
-DIST dunst-1.7.3.tar.gz 4596283 BLAKE2B dff61659b777a92cd2add9b15551a7fa471eb9adda47b31bd48d6b20a34192f3f9e7147a4249047f6993a595d0d0cf9895d9a7cc84f5bbc64972f4e111e924ad SHA512 e8bd8555bd9ea3dc5ae85c2459ad1fa29bbc5d575346381e828fc6efd618db1e87c40b4fceeb89aef83bb7f5df6b246d8a354ce8b13ec549f3452cb32c918d62
DIST dunst-1.8.1.tar.gz 4603941 BLAKE2B c694503087425a69eecd40e4e50c5cfe5e5d3e9525d259b04dacd7e2bc05ff188aad14a331c41e6ecdd91b7c43d87d5902662b8a510675f3450da7097b7da1e9 SHA512 bd8605844eacb24ec1beafbd62be1defa8ff9f6fc2e93a4746acaba483e86d0fa3937045c20dbba71c46310102d8878c8ec987a3081328b02a09d7f9fde974d9
-EBUILD dunst-1.7.3-r1.ebuild 1593 BLAKE2B 74799c0e1bc5b2744fceeb7abb7cdd3c184676645d25efadc95a0ab2b2160322bc678aa379deeda7e3db96a1a128762a108a69e2f327e38a9592a0c547b2cb06 SHA512 3a86fa252c453dff714be3982a9d73386dd2b0e7caf08a06d8ec48b97a598562aacb77b76da23477e06fdedc0e36a4f0a6bc0263e32e01da2a4353da83fb4dd0
-EBUILD dunst-1.8.1.ebuild 1595 BLAKE2B 639d95fa131b6765873682fb4df0200ac07b6b96843470dd1f3924e7d8429ae33c70bbda3cfa5adaaa0776ab6d480af5306c4e2627ac31af5814c6be612d13ba SHA512 7572b08204d70de4128b1fda07bae60dfe1378f26e203527392e2ff1cb834aa5f1535eb6bc26dfc9600b0402c8106bcd8f69be8b7b6e9d889d35644211b8fb2c
+EBUILD dunst-1.8.1.ebuild 1593 BLAKE2B 74799c0e1bc5b2744fceeb7abb7cdd3c184676645d25efadc95a0ab2b2160322bc678aa379deeda7e3db96a1a128762a108a69e2f327e38a9592a0c547b2cb06 SHA512 3a86fa252c453dff714be3982a9d73386dd2b0e7caf08a06d8ec48b97a598562aacb77b76da23477e06fdedc0e36a4f0a6bc0263e32e01da2a4353da83fb4dd0
EBUILD dunst-9999.ebuild 1443 BLAKE2B e9ff7f69d40187ee07c60fcd8f5933e2b9e725f5976c08db922c7a91c2de6517e418786a89cdb70d342ec75c059d1865296905ed3eb01118740e3ccac8656593 SHA512 f4e7347f08df22c12aadbbf6288577627208905d3f58119fd3af31dc6e03e8d89bced59b0d2e893f972e96302601117142c02f542fe0a9ade529128474c0789d
MISC metadata.xml 335 BLAKE2B a51f44edaf12235d9edf8f84d2df6d1a94ddd894075d708f0dfd4b3d289b0225797083cfe7c02a92688d23bb47daadcdd9751c6b740ca1cf0d69b9c1ab957b8e SHA512 7010391e438ab56478c3f2c0bd92afcbe9dcedb55ec89ee3af75c89365811af2b7f198bc64adae95de5fadd6603792d1d3fd60b46840d564a920c571d3c67e20
diff --git a/x11-misc/dunst/dunst-1.7.3-r1.ebuild b/x11-misc/dunst/dunst-1.7.3-r1.ebuild
deleted file mode 100644
index 37336b25c793..000000000000
--- a/x11-misc/dunst/dunst-1.7.3-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Lightweight replacement for common notification daemons"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
-SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="wayland"
-
-DEPEND="
- dev-libs/glib:2
- sys-apps/dbus
- x11-libs/cairo[X,glib]
- x11-libs/gdk-pixbuf:2
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXScrnSaver
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libnotify
- x11-libs/pango[X]
- x11-misc/xdg-utils
- wayland? ( dev-libs/wayland )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
- dev-lang/perl
- virtual/pkgconfig
- wayland? ( dev-libs/wayland-protocols )
-"
-
-src_prepare() {
- default
-
- # Respect users CFLAGS
- sed -e 's/-Os//' -i config.mk || die
-
- # Use correct path for dbus and system unit
- sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die
- sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die
-}
-
-src_configure() {
- tc-export CC PKG_CONFIG
-
- default
-}
-
-src_compile() {
- local myemakeargs=(
- SYSCONFDIR="${EPREFIX}/etc/xdg"
- SYSTEMD="0"
- WAYLAND="$(usex wayland 1 0)"
- )
-
- emake "${myemakeargs[@]}"
-}
-
-src_install() {
- local myemakeargs=(
- PREFIX="${ED}/usr"
- SYSCONFDIR="${ED}/etc/xdg"
- SYSTEMD="0"
- WAYLAND="$(usex wayland 1 0)"
- )
-
- emake "${myemakeargs[@]}" install
-
- systemd_newuserunit dunst.systemd.service.in dunst.service
-}
diff --git a/x11-misc/dunst/dunst-1.8.1.ebuild b/x11-misc/dunst/dunst-1.8.1.ebuild
index e3f5d7b97fd2..37336b25c793 100644
--- a/x11-misc/dunst/dunst-1.8.1.ebuild
+++ b/x11-misc/dunst/dunst-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="wayland"
DEPEND="
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index ec5ce6de651f..6bd86b48dfa2 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,7 +1,9 @@
DIST i3ipcpp-86ddf7102c6903ae0cc543071e2d375403fc0727.tar.gz 43693 BLAKE2B a84525b0bd00d4ab4ed8afed00fd92eee965efea9960670dcea3efaa259834df5bb7cf8e79a894dd4d4f92f28643ad1b43ccbb374ade96174c6c2f6fc63f5ddc SHA512 f4643bea5a78bd9518fecc9d56ece8d679539b99016440a6e4d45305984c02963d80e00c5375cc53ac7418e2f24f57279930428b331e077eaafa8d0717677662
DIST polybar-3.5.7.tar.gz 283520 BLAKE2B 3f7cad2886c0f8352b92e636035607b2abab6dafd0966e6edb9f3b768fc6e5b180be2479f81812eb792f66edada6fe2625af5c3ecc9216763c141a393ab90474 SHA512 6336613d37ae45ca43d1cc2e1e2126bcd09247dbf81b3df979def44b240e2a736035503cf5aaeff0a86c830deb956f9ef7057c7fa1ac3da5119b8e6c1db0fe7f
DIST polybar-3.6.1.tar.gz 437027 BLAKE2B 87cd05b235128834daacd5e48b7bba4d610c1018bbdc6280996d23314b4398a2c7322a425a047b55ad952c7a0e6a73c3076f57df6b4f7ab8fcdffcc0e40ef165 SHA512 973b623464d3683f28484606e418473f9a241c2f6d6e59877a487b61aa2d91f4f44702926c19c47d87720991bccf0a4b6ac0b00d015806d345a3bf701e327d2b
+DIST polybar-3.6.2.tar.gz 438843 BLAKE2B 0d2e3662fd4b5150b3feea4d8c3cc9acc61e0d7f609b0c88c26905384f5023b3924e0b9c528677fe8e017b5136404ac507a3cdb1ec18dcbf2b89c57d3116d1af SHA512 b45ed2a89f4ddc4ee232d6e47416390611b666f8c765fe3916343dbd45ddb877c9ecf764a7d025762caaee6ec2f8c2b9b232cd52d301e70650e4031d029a4f5d
DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
EBUILD polybar-3.5.7.ebuild 1905 BLAKE2B 9239ffab8b1f236a31ecd6e9c9413e587dc573a6b2878a16e0c1b676d6964f01a6cdc3581c7e037e07a842fe4ddaca663632e9ca782b38d86bf071e036f91488 SHA512 ac44318bc96f3dafc012902c31143b5ed83e108733ed9a6b5174fb3283314240498346d5131d491f9917c3cd9ec3eb715bb71c0219a69d03cb2199bb260e0b66
EBUILD polybar-3.6.1.ebuild 1474 BLAKE2B d12e5b734b6e7c633e6e66ebb8a3e81acaf16b14ad3f6dc67ead029c988618054ee6c150a9caa9031240c977efa5622f162f140ab7becc51d6380f9dc5b84d5a SHA512 78400d1e71373181921b5180c35c9a153f988e5c5c489e83f37296b60450c4b87fa3404db6642abf51493a96423573b22dbc9beed522ebf23562005877f7f925
+EBUILD polybar-3.6.2.ebuild 1474 BLAKE2B d12e5b734b6e7c633e6e66ebb8a3e81acaf16b14ad3f6dc67ead029c988618054ee6c150a9caa9031240c977efa5622f162f140ab7becc51d6380f9dc5b84d5a SHA512 78400d1e71373181921b5180c35c9a153f988e5c5c489e83f37296b60450c4b87fa3404db6642abf51493a96423573b22dbc9beed522ebf23562005877f7f925
MISC metadata.xml 585 BLAKE2B c792f265587effc07acc20f097adc1a1975d23ddf55ceb07b4bda02e61e1b48b1d20c5a07792ac18fa5f02949e0a88bc18fe6df2fffd9454406cda34ac33654b SHA512 c3f9080f68d989dbfd75492ec0c4870e4df9b0525a69256ac95bf55eea60022ac018cc1afe42677bc8f822beec75d137e1e7c8a876763c72664541a0a54b28f1
diff --git a/x11-misc/polybar/polybar-3.6.2.ebuild b/x11-misc/polybar/polybar-3.6.2.ebuild
new file mode 100644
index 000000000000..22e5d89b9188
--- /dev/null
+++ b/x11-misc/polybar/polybar-3.6.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="A fast and easy-to-use tool for creating status bars"
+HOMEPAGE="https://github.com/polybar/polybar"
+SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]')
+ dev-libs/libuv:=
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/cairo[X,xcb(+)]
+ x11-libs/libxcb:=[xkb]
+ x11-libs/xcb-util
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-wm
+ x11-libs/xcb-util-xrm
+ alsa? ( media-libs/alsa-lib )
+ curl? ( net-misc/curl )
+ doc? ( dev-python/sphinx )
+ i3wm? (
+ dev-libs/jsoncpp:=
+ || ( x11-wm/i3 x11-wm/i3-gaps )
+ )
+ mpd? ( media-libs/libmpdclient )
+ network? ( dev-libs/libnl:3 )
+ pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_ALSA="$(usex alsa)"
+ -DENABLE_CURL="$(usex curl)"
+ -DBUILD_DOC="$(usex doc)"
+ -DENABLE_I3="$(usex i3wm)"
+ -DBUILD_POLYBAR_MSG="$(usex ipc)"
+ -DENABLE_MPD="$(usex mpd)"
+ -DENABLE_NETWORK="$(usex network)"
+ -DENABLE_PULSEAUDIO="$(usex pulseaudio)"
+ # Bug 767949
+ -DENABLE_CCACHE="OFF"
+ )
+
+ cmake_src_configure
+}
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 5705de23d49e..e8730e2aa644 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -3,4 +3,4 @@ AUX qtfm-99999-cmake.patch 323 BLAKE2B 023794991cc9a91792388e8d56d54542f50cf42eb
DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
EBUILD qtfm-6.2.0.ebuild 1104 BLAKE2B 761437994d50ca6f4a9bc7165238f41e434d33290d4fe566423be1c1133ea62a1baa877eb8a1cb9a6d92ec91b2a11d8b9ed873fd7831f2dd8fefebf4c976a691 SHA512 c64343feebb7c46cd7ad67b98a9f1386144b39e43fd80cef811e2ea1d110e998563d7cbbc5e731560561bf6bcb138ab5674ba6df4d9a0c7c5983b77334af791f
EBUILD qtfm-99999.ebuild 1016 BLAKE2B 4c85b061cd9b00363ae50c83a2da79b81bf52e394a2d7e8e9f5d2cd47058992d1b8966805d35c458ad78bb14b53d9e52ac24a35f6604c1eb83c7cf98e82f53de SHA512 c68b2e850ccea6ef67be140bf10f87f4178ee4e73d022e33df680814e63ea2d4bf994a1a1a5a6e78f8dad553618de9c383b0898c88b02acc086e6a30cfd3fb40
-MISC metadata.xml 536 BLAKE2B 15fd36f081c57262b787ee419c55adde6f953c8fabfd663c2e9452fb72fbeec055a0569fd7f3befeda455cf4dc676cedb0fce7a205e5ea94184c9862bca56a59 SHA512 a4dac1289a72d87b131be97b0bfe8193951edc33ffe0fcffedc4df09bfe449fc7c170700cab8b81a9b59f59d61c8bcbacdaa08c0fa9655a73112fa689c700144
+MISC metadata.xml 403 BLAKE2B 7befbfef66548288987666d889d847f730d3aca25b443f688483eca608848b612891d56c6b17f0520040622e63b3c0f74998b174758fc91811b98f23cad476a8 SHA512 230bdca0e66f1a18421719bec8a47ef93c311e3a64011246b1fc3731e6f1507a35613b873ce26cb7fb30600858a36e209a6397bcf92bd3d9a3d0aa88bb3c1887
diff --git a/x11-misc/qtfm/metadata.xml b/x11-misc/qtfm/metadata.xml
index 93c880291811..3b19574b6147 100644
--- a/x11-misc/qtfm/metadata.xml
+++ b/x11-misc/qtfm/metadata.xml
@@ -5,10 +5,6 @@
<email>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
-<maintainer type="project">
- <email>desktop-misc@gentoo.org</email>
- <name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
<use>
<flag name="dbus">Install the qtfm-tray removable device manager</flag>
<flag name="shared">Install the libQtFM shared library and headers</flag>
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 4a0f5eb3f7f3..fd5d5887d74f 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -6,6 +6,6 @@ DIST rofi-1.7.2.tar.gz 921356 BLAKE2B 88daaac60f4deab18b9ca00cdd490c57aef7ba103c
DIST rofi-1.7.3.tar.gz 935184 BLAKE2B 66585b5542fcf59f22c68ad753a04051a188524c8008435f75b28f923cc46ecb9a0d41a98414577dc59b5a899488de77a6301544fc5af35a7d14a4d8ec930dad SHA512 5d1b8fed868a7fcf372298800997d4aeeb9b428858448a9b9e4c523af8d878aa172dc63ad788cdc950af89a1f3ea850bc4c98a55c9e8ace29e67050ac0c02078
EBUILD rofi-1.6.1-r1.ebuild 1247 BLAKE2B d92fbb93dad604d5dbe58a90c1c63825952246d5581478578c056f82372d84ab5cd26fe4954601383193714cacafbed45371f913f4a311676e12069e68349324 SHA512 3b1bb1ac88c01a84841a3266fe86aa7c22101c85ef022356768eb04c49740b63b1469c83080dee49cda61260b18e16e24acbdb51f8c37dafbab1d020bc60bbe0
EBUILD rofi-1.7.2.ebuild 1623 BLAKE2B cd07923bee065e0905590975b075537139086bd45caa23a73e29010b01dbf50eaf11e250e980076edfc17c9b16b7b670cf7a725059ed593f456bfc0e8452c485 SHA512 7264a36a857648f9e3d4aa92988c5949869b2213b1a146c7332c531901eb9138526ef01e02d0a7e4a194c8e44b68a2b814a76eb63eae78bb8276b04be6522c0c
-EBUILD rofi-1.7.3-r1.ebuild 1558 BLAKE2B 61ed8cb1e02ac963442675b405afa16c600cc790d33dd5eaa4c9700cfff1e3ff0dc03d65ba6d45c773ba98c97ef78928d9811c1d48dbf3b9e3f62df1d535a440 SHA512 ca1f2b9289831dfee3afcae4ac2ba1c922cc9db7e26d252605e2ede5737d749ce579e57322e154452a6fb77dae854fa462e1b90cf018fafa489cc3946b3cc6ae
+EBUILD rofi-1.7.3-r1.ebuild 1555 BLAKE2B 2a3c791af03ab18553bcd06b91da9d39bcfcb0c0cf76f75275b5691a6514e54a7b6f34f5ee54ad108bd8bceb5b34eb872417e49fe5f98b9d81ce7b326fd3afde SHA512 9758d145da7084f3f5a919ac7c6b67b718e3a5fbe5b4e3ae4db02e701891aea91dba6e164dce52a8e8287e339361b6dfcfcd930a37a4cd78cb10e4858a00f487
EBUILD rofi-99999.ebuild 1091 BLAKE2B e9a2cb5c5699f6c7e16644354209293797ed90a12166768e9174aa7d8ec8273a3dabb972e6d88e639aeec8bc7e3feb7573c6cd53ff15212a2c9d6923cef4c8ef SHA512 7dcbe7996939338dc8a3db8cb415caa574fa0a3eaae0b5b678912564c6263d814fc2e6fbd2a3b790e66fb33e54e2e940ad34a545c545b3c0306a831b7b967a63
MISC metadata.xml 719 BLAKE2B da98cdb710b9c17250168d4875247f27c030011d1197ceeb762530ff89ff6a5f269e4a2f24d8299530bff9b827da9d4c8566f5e97f3d16256d598bdcf460ce35 SHA512 af7a2aa04205a39bf77fe19995fbfd414d50aff50d015d2a3674cf9a4ec9e2ef48994b5a521404af90af9dc95a4c8a64a24be95b9fd5a9d1d2fea3b94cb5fad1
diff --git a/x11-misc/rofi/rofi-1.7.3-r1.ebuild b/x11-misc/rofi/rofi-1.7.3-r1.ebuild
index baf466475aee..c3c1397ae477 100644
--- a/x11-misc/rofi/rofi-1.7.3-r1.ebuild
+++ b/x11-misc/rofi/rofi-1.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="+drun test +windowmode"
RESTRICT="!test? ( test )"
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 8acf90c17a1b..ad4044dfd4d2 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,12 +1,13 @@
AUX pam-1.4-substack.patch 1126 BLAKE2B 61bcfc324b603ed4d9c23ede30f2d6215acdd043c6385c6230f95748b79e9746206525bbfba873272ef2559b605123c727c41de17cd713b31ce706a3cead9798 SHA512 0f08eb5c7904cfee570329bb42621bcbeba6e700e667dcaf956d3359792f7938c6fe4a9a3a56a471b5eb512adde0ce7b92cdaca9108a1cc9307e839c1ee3339a
-AUX sddm-0.12.0-respect-user-flags.patch 779 BLAKE2B 3ea539e4e426fa745be2ae6c59f6bd96e42d864ddba9942681397a2cdae69528d837001535502e83e6ef50a9ca65a30b62601af76a11465a5b42feffef348edf SHA512 77e3f2ec4dff122e40428444055ed7cbbb177242c9c3c034b1934dda7a3ff2345dd8fcee4b927b797f66163bffc23a5760dd55c2fa24f2c614cd7dec88ffde88
-AUX sddm-0.16.0-ck2-revert.patch 918 BLAKE2B 803f3370260ce40a4b46d3d7a9f2f7529db90baba039c080606f9333e4933c6e3a219331d57dbc577e6a32567fedade3a4aec8bd1706bfb5887a0c281d37c2fb SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60
-AUX sddm-0.18.0-Xsession.patch 606 BLAKE2B 0af5d0d6b8da47ead31b14ee6e21dc05e173765b64e74332c01bed2d44e6e5f3d3d67166cb460ffbbdcd0cae41d15883a9c4385b2ed242b858f337baa4e3f614 SHA512 19921eea20964f8f697e7839ce58c63412034ccae6db7d4acabddb5ca43523ccacaa8ba10dfe221d3241eeb5fa0f9ecbd205f10025afde4dc48d4106d38d140f
AUX sddm-0.18.0-sddmconfdir.patch 1894 BLAKE2B aef497f08bd11c4fa4fdfe584b73b69192b875fde9050dbb39d6a0b1924759fedd5c50ed4fa54316f5cc9bb25c667c96eaaabce60d2acd826a4fb0bda2bb7495 SHA512 ebfb026ffca4f450005ecdc64c816720b0714ffcec7c03316148c7835919f01bb47c4c6e5041fcdbb271b70b38de99d74d959fd94b6c30b415159035b0d2b784
+AUX sddm-0.18.1-Xsession.patch 503 BLAKE2B 2fdb001df7440a82cf60558bf10fd4f89b51c1ca0b2b36487cadcfcccce856546aeb5f8c6e8a814abd923b448972ea6141188820c094ec5d4ec582dbdcb0d283 SHA512 3235947b3cc7a9cc3fc8199b6083e7dd18ce95e973e4b7a0e28384ad536bcf0a74df5dd7fc13c9eca8cb8a6f8e813d94d1ca7a4df60397d95423990a126c32b2
+AUX sddm-0.18.1-cve-2020-28049.patch 3286 BLAKE2B 2782c0f01aaf4c108934311359afa139a8b72884a9a3824e1c9226a088ae4c73f7f56e92e6b61b7e0f0a40733acd2f1b25823a62570017ec2f0f24cef0190304 SHA512 cb4840dce22e76ee1bd912c81c590f5333c3c6e679dfca70555ec82dbe64579297bf2fa4ac94c4beda75724f4db28c8178357a4d0392d432e7928b6b1576dcf9
AUX sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch 6561 BLAKE2B 33919c3913fae2eb1e7277647a38567c70ee0fd4ca5c93de6d7597d6c216c9c1802e79a5f281821f8eac4a99d73d2fa8712471b2dff8ed50ec17004ae7d8b67a SHA512 4d2bbdb301e54aaa8673b8765ee2e63d105e8dd2199f636a523b2ef46a6123e8b5194fa778390d4ba8ac3b6970cb4fb3bafc9ee8e20335fbf9284517ea5d36c5
AUX sddm-0.18.1-only-reuse-online-sessions.patch 1201 BLAKE2B cf1947f88fa1223c78bfd5c7d37884e7b9b80349f531d4593a0d1a59f4dfe2ed068abe5f2f0fe53b3d112826230ac9c481ce1db38661ece2ee93b1d0aeadba94 SHA512 62975ad657e46a6dc0157bcf749df1e165cd9f65fefa794d674aa7c2dc84e978d1e98bd2c5dad19a30a3e258d65155c9b93e89e12d32aaf80d0ba8b1e5cc594f
AUX sddm-0.18.1-qt-5.15.2.patch 865 BLAKE2B 1198a2a7b9cd0b46648eddd3eddca444d502c01baf7fd686bd52489acefa8bb3cc53e20b1d8f154aec56f88f53b653c605f8b4905cd7bb445c37ad7bdd091369 SHA512 aae777ca15df43d7c5bfb7f15e2ede4632d598e05d565338880f644e0e8ed9f00e83c33128a85db8db01d4a22cf85ee4dd6fd2c66196c7093afcc9d5c18bade2
+AUX sddm-0.18.1-respect-user-flags.patch 774 BLAKE2B 050d261762b872a475ce9f250b464e539e278c4c87ad90767b7a9e8dc8f4785671ff3c5989b3785979b3a59ce805bb5b2ee90b01da0dca831a48aecaddc94280 SHA512 8df7f3b804594d46439e4c93a01a035e71d8e8a53c95193eaff03403970d0010878e70f0f7c8c965545360a948c2cab994e5ce29e011f8f41bc232107402fe78
AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f592214160ff993e86582bf5f550be204193668f5bab7786db88ae9a1a09ee268beb3e3157c1b033e765053ba415f3d291f299b09606aa566c9c197370 SHA512 b33b26517173262194bdc98e63b84fbb1f03005abc3c079332dd9b275167d8ddc680ba5c2a9968be5c54963b64f291aab65ad9f04b9f3f69299d030753cd90f5
+AUX sddm.tmpfiles 31 BLAKE2B 51d22f1d6e25aed3df726c0c315e83193bf28b5e9cafb681b648e6788ad8e9ddd8610ef5c305627373e32465ac104b33d71c333153217f8f8f560ace9ddca45a SHA512 bb5ecdcc6cfcc6b1056a7b10b8a6f323a3e12ea5496a26d80f199a275402fd99ed0fa810fad6687407605964f980784c24082686e177063113a358e1d4220136
DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
-EBUILD sddm-0.18.1-r5.ebuild 3202 BLAKE2B 8cf57535cca22b139e77581ac6fddb174331414c39fee01c3efe6b9d3b935021895eafcea20aa53d9e9c87622f87aabb96a43255a61de48f0940873ae44b68a1 SHA512 a9d7a4ccb051171caf58e245bc3de0f7ee67134e107d2ad6d05e8aa06535126e6fa85143903fd72e76091689dbb6f5f2bbcf0b1a8649f4d6766ec36f94bae58d
-MISC metadata.xml 819 BLAKE2B 7af7c9b105c34f527c5a2aa0dc437f4f74571a13837730bfd6a81a6e3f6caf217b5d6508f4471d3fca6bcda238fc34bb0533876e0d251c924106e296c4e2cdc7 SHA512 8085d568da895d40bec15cbbc0cc0241ef4cb9070db303ea80cb88ebe96bebc3624a0fd48973a1034d34749903ea581cded5ff63995b7b643a6f743c3551a674
+EBUILD sddm-0.18.1-r6.ebuild 3626 BLAKE2B 028f76769c5a84c4603cc021482a85b993c09da2ca2468835ad69cc38cb5b2423417b35016167f7b112dc38f1349f53845cdc5e81d38c37f3932b9cd49d9f6a9 SHA512 9dccbb59e43544bc6e0be17815016a381191bab856a938e3a3d38281e1c8ac9291ad69b11071124250fd86c4a7d20ffe63dbec53b07bca7ea9cdf1a05ebb2ca8
+MISC metadata.xml 661 BLAKE2B d27eefaf2d3fac197ca5e20199cd80631d099517fb58f4a734ddf0a477ab4a8ffdd49d470139cdd4b7f82a7323b150c30febcd6f498ac818df85d7fb11c19457 SHA512 040bfc5d725a1b78d2ff01c9f9c0222c77c03fd0e341543733d5523b013b726e6ce950b13d01877abe211d89920f378248b82c6ec3076a82437c343c93338bdd
diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
deleted file mode 100644
index bbe2a272840c..000000000000
--- a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2
-has the same interface names as logind.
-
-This patch forces sddm to use legacy behaviour when consolekit2 is detected.
-
-Bug: https://bugs.gentoo.org/633920
-Bug: https://github.com/sddm/sddm/issues/903
-Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99
-
---- a/src/daemon/LogindDBusTypes.cpp
-+++ b/src/daemon/LogindDBusTypes.cpp
-@@ -60,7 +60,7 @@
-
- if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
- qDebug() << "Console kit interface found";
-- available = true;
-+ available = false;
- serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
- managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
- managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind
diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch
index 41c813a06645..e1e3c1527be7 100644
--- a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
+++ b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch
@@ -1,11 +1,11 @@
---- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200
-+++ b/data/scripts/Xsession 2017-10-21 15:25:47.668886596 +0200
+--- a/data/scripts/Xsession
++++ b/data/scripts/Xsession
@@ -50,6 +50,10 @@
;;
esac
-+# Make D-Bus and ConsoleKit start properly, see:
-+# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
++# Make D-Bus start properly, see:
++# /etc/X11/xinit/xinitrc.d/80-dbus
+command="$@"
+
[ -f /etc/xprofile ] && . /etc/xprofile
diff --git a/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch b/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch
new file mode 100644
index 000000000000..8209c0739dc6
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch
@@ -0,0 +1,94 @@
+From be202f533ab98a684c6a007e8d5b4357846bc222 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 6 Oct 2020 21:21:38 +0200
+Subject: [PATCH] Fix X not having access control on startup
+
+If the auth file is empty, X allows any local application (= any user on the
+system) to connect. This is currently the case until X wrote the display
+number to sddm and sddm used that to write the entry into the file.
+To work around this chicken-and-egg problem, make use of the fact that X
+doesn't actually look at the display number in the passed auth file and just
+use :0 unconditionally. Also make sure that writing the entry was actually
+successful.
+
+CVE-2020-28049
+---
+ src/daemon/XorgDisplayServer.cpp | 25 ++++++++++++++++++++-----
+ src/daemon/XorgDisplayServer.h | 2 +-
+ 2 files changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
+index d04f6344..df685b2d 100644
+--- a/src/daemon/XorgDisplayServer.cpp
++++ b/src/daemon/XorgDisplayServer.cpp
+@@ -88,7 +88,7 @@ namespace SDDM {
+ return m_cookie;
+ }
+
+- void XorgDisplayServer::addCookie(const QString &file) {
++ bool XorgDisplayServer::addCookie(const QString &file) {
+ // log message
+ qDebug() << "Adding cookie to" << file;
+
+@@ -104,13 +104,13 @@ namespace SDDM {
+
+ // check file
+ if (!fp)
+- return;
++ return false;
+ fprintf(fp, "remove %s\n", qPrintable(m_display));
+ fprintf(fp, "add %s . %s\n", qPrintable(m_display), qPrintable(m_cookie));
+ fprintf(fp, "exit\n");
+
+ // close pipe
+- pclose(fp);
++ return pclose(fp) == 0;
+ }
+
+ bool XorgDisplayServer::start() {
+@@ -127,6 +127,15 @@ namespace SDDM {
+ // log message
+ qDebug() << "Display server starting...";
+
++ // generate auth file.
++ // For the X server's copy, the display number doesn't matter.
++ // An empty file would result in no access control!
++ m_display = QStringLiteral(":0");
++ if(!addCookie(m_authPath)) {
++ qCritical() << "Failed to write xauth file";
++ return false;
++ }
++
+ if (daemonApp->testing()) {
+ QStringList args;
+ QDir x11socketDir(QStringLiteral("/tmp/.X11-unix"));
+@@ -217,8 +226,14 @@ namespace SDDM {
+ emit started();
+ }
+
+- // generate auth file
+- addCookie(m_authPath);
++ // The file is also used by the greeter, which does care about the
++ // display number. Write the proper entry, if it's different.
++ if(m_display != QStringLiteral(":0")) {
++ if(!addCookie(m_authPath)) {
++ qCritical() << "Failed to write xauth file";
++ return false;
++ }
++ }
+ changeOwner(m_authPath);
+
+ // set flag
+diff --git a/src/daemon/XorgDisplayServer.h b/src/daemon/XorgDisplayServer.h
+index d2bdf6d4..e97a0b53 100644
+--- a/src/daemon/XorgDisplayServer.h
++++ b/src/daemon/XorgDisplayServer.h
+@@ -40,7 +40,7 @@ namespace SDDM {
+
+ const QString &cookie() const;
+
+- void addCookie(const QString &file);
++ bool addCookie(const QString &file);
+
+ public slots:
+ bool start();
diff --git a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
index fc450169792d..6801fa799ead 100644
--- a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
+++ b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
@@ -1,9 +1,8 @@
-diff -u CMakeLists.txt CMakeLists.txt
---- a/CMakeLists.txt 2015-09-05 22:40:50.000000000 +0200
-+++ b/CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200
-@@ -35,22 +35,6 @@
+--- a/CMakeLists.txt 2020-10-12 13:03:39.000000000 +0200
++++ b/CMakeLists.txt 2020-10-12 23:40:04.480687143 +0200
+@@ -41,22 +41,6 @@
# Definitions
- add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII)
+ add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_FOREACH)
-# Default build type
-if(NOT CMAKE_BUILD_TYPE)
diff --git a/x11-misc/sddm/files/sddm.tmpfiles b/x11-misc/sddm/files/sddm.tmpfiles
new file mode 100644
index 000000000000..300d646138c1
--- /dev/null
+++ b/x11-misc/sddm/files/sddm.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/sddm 0755 sddm sddm
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index ff51f919ae32..4250b6ff2954 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -1,24 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>lxqt@gentoo.org</email>
- <name>LXQt</name>
- </maintainer>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <use>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
- </use>
- <longdescription lang="en">
- SDDM is a modern display manager for X11 aiming to be fast, simple
- and beatiful. It uses modern technologies like QtQuick, which in
- turn gives the designer the ability to create smooth, animated
- user interfaces.
- </longdescription>
- <upstream>
- <remote-id type="github">sddm/sddm</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ SDDM is a modern display manager aiming to be fast, simple
+ and beautiful. It uses modern technologies like QtQuick, which
+ gives the designer the ability to create smooth, animated UIs.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">sddm/sddm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index 20b127562993..2eef0e695021 100644
--- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
-inherit cmake plocale systemd user
+inherit cmake linux-info systemd tmpfiles
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm"
@@ -13,24 +12,20 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="elogind +pam systemd test"
-RESTRICT="!test? ( test )"
+IUSE="+elogind +pam systemd test"
REQUIRED_USE="?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
-BDEPEND="
- dev-python/docutils
- >=dev-qt/linguist-tools-5.9.4:5
- kde-frameworks/extra-cmake-modules:5
- virtual/pkgconfig
-"
-RDEPEND="
- >=dev-qt/qtcore-5.9.4:5
- >=dev-qt/qtdbus-5.9.4:5
- >=dev-qt/qtdeclarative-5.9.4:5
- >=dev-qt/qtgui-5.9.4:5
- >=dev-qt/qtnetwork-5.9.4:5
- >=x11-base/xorg-server-1.15.1
+COMMON_DEPEND="
+ acct-group/sddm
+ acct-user/sddm
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ x11-base/xorg-server
x11-libs/libxcb[xkb]
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
@@ -38,13 +33,22 @@ RDEPEND="
systemd? ( sys-apps/systemd:= )
!systemd? ( sys-power/upower )
"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qttest-5.9.4:5 )
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !systemd? ( gui-libs/display-manager-init )
+"
+BDEPEND="
+ dev-python/docutils
+ dev-qt/linguist-tools:5
+ kde-frameworks/extra-cmake-modules:5
+ virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
- "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
+ "${FILESDIR}/${P}-respect-user-flags.patch"
+ "${FILESDIR}/${P}-Xsession.patch" # bug 611210
"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
# fix for groups: https://github.com/sddm/sddm/issues/1159
"${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch"
@@ -52,21 +56,20 @@ PATCHES=(
# fix for ReuseSession=true
"${FILESDIR}/${P}-only-reuse-online-sessions.patch"
# TODO: fix properly
- "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
"${FILESDIR}/pam-1.4-substack.patch"
# upstream git develop branch:
"${FILESDIR}/${P}-qt-5.15.2.patch"
+ "${FILESDIR}/${P}-cve-2020-28049.patch" # bug 753104
)
+pkg_setup() {
+ local CONFIG_CHECK="~DRM"
+ use kernel_linux && linux-info_pkg_setup
+}
+
src_prepare() {
cmake_src_prepare
- disable_locale() {
- sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
- }
- plocale_find_changes "data/translations" "" ".ts"
- plocale_for_each_disabled_locale disable_locale
-
if ! use test; then
sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
cmake_comment_add_subdirectory test
@@ -87,6 +90,8 @@ src_configure() {
src_install() {
cmake_src_install
+ newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
# Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
local confd="/usr/share/sddm/sddm.conf.d"
dodir ${confd}
@@ -100,12 +105,25 @@ src_install() {
}
pkg_postinst() {
+ tmpfiles_process "${PN}.conf"
+
elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
elog "Use it to override specific options. SDDM defaults are now"
elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
-
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+ elog
+ elog "NOTE: If SDDM startup appears to hang then entropy pool is too low."
+ elog "This can be fixed by configuring one of the following:"
+ elog " - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel"
+ elog " - # emerge sys-apps/haveged && rc-update add haveged boot"
+ elog " - # emerge sys-apps/rng-tools && rc-update add rngd boot"
+ elog
+ elog "For more information on how to configure SDDM, please visit the wiki:"
+ elog " https://wiki.gentoo.org/wiki/SDDM"
+ if has_version x11-drivers/nvidia-drivers; then
+ elog
+ elog " Nvidia GPU owners in particular should pay attention"
+ elog " to the troubleshooting section."
+ fi
systemd_reenable sddm.service
}
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index c2e4686b3b88..9029b892104a 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,4 +1,7 @@
AUX shared-mime-info-2.1-itstool.patch 2841 BLAKE2B 4198fa232a034cf2c71f18973c0223af4944bc443c2b642e095cd842c8f206c20812d98d1466d50f345e35c8f61b213a58d711a3b7e515820c462e143dce9904 SHA512 af6772dc8bcceebcdc965e30f626b5ea415bbb0facff9ecaab6fadc23dbdc9ee0d72f588ac0d9637bcdf5930f30bd21102145e56def080cb946cd0f9b027a4b0
DIST shared-mime-info-2.1.tar.xz 5202496 BLAKE2B e8dfc7efe78feb5a38c8115a2b332f46c3dac2f89dffad0834fa7b77560b3ef528e779ab9e42822288f85d8c434fd590859db682f3f99494aa6a4387c985e912 SHA512 87e308281e83c4cf889594f7c2e8dcb4d0d0d3910124c3816fdb886ba7d6113b2581711adcb17032b47f9b8d8b7001fab58daa52b7da7c0ef87915e341d6f1b0
+DIST shared-mime-info-2.2.tar.gz 7064139 BLAKE2B 5e791893a60d64a8a1d421c1fabb5e214c6e34ae975d232a9d695b998e8e9aafb6449e858fd845feb120e170bf7c77f70c1fc23e3d4cf8e7c49c6e92418cab96 SHA512 490d96daf4214ab6ac537761b67f3ff4716b95d7ea3fedd2e2ab7b0b02d946acad49790a25efcb5e949551dc4c39ba08911e59f06b198b61dcb1bc44799a2b2e
+DIST xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.gz 32703 BLAKE2B 865ff57c566b60fb2bd6cb37e259800ee72fb4b9f2d135db46e9a40206946677a7b50bfb8f13d9ce1493bac972e8a5230d7caa833733f3a8d8631e844a648436 SHA512 90abe20483d5ae2131d18740fffbc57c94470be99e9ea1b04e13bffaf3dda4aa9145cb92bb4defe0a655c0bdbd630aaa325e7a9095b9599faebb751699b9cdd8
EBUILD shared-mime-info-2.1.ebuild 1317 BLAKE2B 1ff8f3da6e43a8cc28ee849ee0a07b30ef39623317a60e7ce8ada17709aaa80a14915610ec4ca8e3515937e50703602460ddab30ba4d0e6181b2f88e1988d72a SHA512 31842f41f7cfe45ab3d99b1da1a4207c0b6c124daf510863e0e428d2e8cf5b5db401c6b619b155dabfec87caba78ef4c9ae2c1adaefb960e6d3f275e90b22ac8
+EBUILD shared-mime-info-2.2.ebuild 2635 BLAKE2B 08b59c341ceb3c079da158054375fa9065997b101cb24da5a81987388d33707a8fdb0143ec09c22a30c62dff9704fdc20189348cb1ccff791da719fd44fdba66 SHA512 b344cb461d4fa44bd81faa63b289aca7bc93d2775410b5d2ea650ace24d3a2706b910b1ae8d25f493f0f85579a0dc54236c286e60e14701787827cb3a77c7c95
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild
new file mode 100644
index 000000000000..3d31957ca47c
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson toolchain-funcs xdg-utils
+
+# Keep an eye on https://gitlab.freedesktop.org/xdg/xdgmime/-/merge_requests/25!
+# xdgmime is used for tests but doesn't make releases nowadays; do what
+# Fedora does and use a snapshot so we can run the test suite.
+MY_XDGMIME_COMMIT="92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7"
+DESCRIPTION="The Shared MIME-info Database specification"
+HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
+SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.gz"
+SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/xmlto
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/libxml2
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( HACKING.md NEWS README.md )
+
+src_prepare() {
+ default
+
+ if use test ; then
+ # Drop empty dir (it's a submodule in upstream git repo)
+ rm -r "${S}"/xdgmime || die
+ # Lead Meson to our snapshot
+ ln -s "${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} xdgmime || die
+ # Don't break parallel make
+ sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die
+ fi
+}
+
+src_configure() {
+ # We have to trick Meson into thinking it's there now so that
+ # we can run meson then emake to build xdgmime later, rather than
+ # building before running meson which would mean doing something
+ # unexpected in src_configure.
+ if use test ; then
+ # Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29
+ touch xdgmime/src/{print,test}-mime{,-data} || die
+ chmod +x xdgmime/src/{print,test}-mime{,-data} || die
+ fi
+
+ local emesonargs=(
+ -Dbuild-tools=true
+ -Dupdate-mimedb=false
+ )
+
+ meson_src_configure
+}
+
+src_compile() {
+ if use test ; then
+ tc-export CC
+
+ # xdgmime only has a homebrew Makefile
+ emake -C xdgmime
+ fi
+
+ meson_src_compile
+}
+
+src_install() {
+ meson_src_install
+
+ # in prefix, install an env.d entry such that prefix patch is used/added
+ if use prefix; then
+ echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
+ doenvd "${T}"/50mimeinfo
+ fi
+}
+
+pkg_postinst() {
+ use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+ xdg_mimeinfo_database_update
+}
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index afcfa0e3c72a..c315fbf0e0e3 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,3 +1,5 @@
DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408
+DIST spnavcfg-1.0.tar.gz 496695 BLAKE2B 59d79cc1707881ba50e809c73a41cb94dbfd15e5e184114190efa2394fe4b53f25960a828611007a200687a3e9827bc4df30d3d06ca3764b23573a1f51fb2974 SHA512 271d1d66fdfb4aff9faa521c51c776dbccf77320b0783a5dbdcc4a28d4190ef3ba6c3d277d706dafc35e2e6ceed1d244d346d4a91cf8e1f5ba3141c24d065ea8
EBUILD spnavcfg-0.3.1.ebuild 631 BLAKE2B 87950402346b2d18842697a0e66cc38c7cd897fab3ebb824b100748f35e110acbeaf7f41a933486f50c1d8ee1e02251ffc94da9c28dbf74f7b601a027569cc83 SHA512 13274238bdbecf96267c64cd3cc3aa23a444efe4df24c1616bd4b34bf6060e3580a72a06f1ab470af25edb3d8d9ceac0deaccb203aa1cccb849a0e3e849facd9
+EBUILD spnavcfg-1.0.ebuild 710 BLAKE2B 566cf7be36f2640d12ad111ec240dde0f9923ae197ba5e99dde4c6aef26563d842a6ec29646c0055d1131b6b5f8fc4705608e81d6860250a90f1fcc7080c8576 SHA512 0b0af4cf84c750244cb9111d3e59053bfd0226d0793c7d11a2537416f8020fddcea987bc0df23e9d85a9614df8dba5392f214547fbccca80e68efed5e6aa1b0d
MISC metadata.xml 514 BLAKE2B 50df594dc158c9d7aae74568d8eb00a1351df08aec9aee998d9c34812edcaf51e75a7e3e1e75d4fd74ba3be0249f1cd61530eb9d7b1946bee63af3959e84bef8 SHA512 5627cd947830e8c82068402f2fb9a0a65e92b141ab9f61d285e1caf37c43e3e7ab3666d05062493dd339ce5093bffb2ac5622fff702591b7b0fea15b9a061394
diff --git a/x11-misc/spnavcfg/spnavcfg-1.0.ebuild b/x11-misc/spnavcfg/spnavcfg-1.0.ebuild
new file mode 100644
index 000000000000..f2b2fbed5906
--- /dev/null
+++ b/x11-misc/spnavcfg/spnavcfg-1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="GTK-based GUI to configure a space navigator device"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-libs/libspnav-1[X]
+ dev-qt/qtcore
+ dev-qt/qtgui
+ dev-qt/qtwidgets
+ x11-libs/libX11"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+ >=app-misc/spacenavd-1[X]"
+
+src_configure() {
+ econf --disable-debug --disable-opt
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index a89878907b84..ca47700a4880 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -4,5 +4,5 @@ AUX trayer-1.0-dont-include-libXmu.patch 190 BLAKE2B 34460fc49d3c6836bb9a41840a8
AUX trayer-1.0-fno-common.patch 167 BLAKE2B 31ec6428dc5732fba6f165e71483573668dd6efa658785cbe6d1f7a52cf030ee1ce288ced90b673210b49302c57cb62471f95d3be16a41d350d3273064f64027 SHA512 9a15a1905e33676bef0eee7426a07223a8ee59089ab63888e35c8035b1c7dcdeabdffd59e9df55369b7e1475cda1b341725fc9e3dfae31dd26101fb7c922da55
AUX trayer.1 4448 BLAKE2B 663b00da3409d8366fc110fd2f67876f9b6cba4059410ac4d280c647022fd763a6e999dd953e02fec0d7130e16c5034b0c865766c0fd6c8bfd7ddf648c6ca258 SHA512 c55299fbec8f9bfcaeb262a3d2833af4ec111354c4e18bce219568b4a788b298d3d762f657c2fcc787c6ac8959934e9d459f6a808e618cc4769e2989c59659a1
DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01 SHA512 9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049
-EBUILD trayer-1.0-r4.ebuild 1031 BLAKE2B cb8654a656fc521fbcf0d3822bd0b7d113d20310304a5bcaaa536ec00a3d13041845497fcf3149e5f0366d376d167c40ac94e280db36e0fed1300604b68199b1 SHA512 73a24316e600b74e0d9a87798c744e35705ad6f92f1b6d9e48edca1c9c4c1d1c854cf8082aae81a65e34f7817ca7b85d93ea3c75b7cc853c5061f4fdd0725a0d
+EBUILD trayer-1.0-r4.ebuild 1035 BLAKE2B bd09726103477c85a99d17cfcac65a00c0a139869a3fdd1178b8e662750663d329c6bc79c9f9213e59af7f391534faff42a9a7aca320c04798f5d000bd34d529 SHA512 462d5a2667996c6ee532e992d734a9c3d850fabf86be33b6f707daa450277afe42604669395f9c58a8fbe7a558e1303cb92a7014275363025f4b4319022b7484
MISC metadata.xml 221 BLAKE2B 2bdd4cc2d7f7a4fb627addf3608926b0ec64c4e8f5b764c625482fa803b883ccc5a4d89ce3f0190bbd5772ed719455c46ffd6c4674adcff6044642ce50d8592d SHA512 4d656cd01a75b528e757bfda686503d56ec9753562c6c52fedbd1f897285fd6cce36da0beba020875e29b8e240821456a4ebf26ccda72b8aac6456d8aa8b6a8c
diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild b/x11-misc/trayer/trayer-1.0-r4.ebuild
index d83e08e8deda..5afa3ceb9eee 100644
--- a/x11-misc/trayer/trayer-1.0-r4.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r4.ebuild
@@ -1,27 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit toolchain-funcs
DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/"
SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
-RDEPEND="
- dev-libs/glib:2
+RDEPEND="dev-libs/glib:2
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:2
- x11-libs/libX11
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 1fcc2253de7b..57977bc2fa6c 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,5 +1,3 @@
-DIST vdpauinfo-1.4.tar.bz2 11811 BLAKE2B bf0c268505b8eafb9da7c799518296498f2c04bde33443101625c4a80cfde6418428d3969e9ac0f4222a6985b53f3bd4dff688fc03af29de7576f3af3605e07c SHA512 7227205f35d5ad9bc64537d4e47e1924e7efbcd1185420f5f575eadff23f2932484db9c39c377282ed88fa7fd43d436064b10961082ccbf66c49dac72b4129a3
DIST vdpauinfo-1.4_p20220208.tar.gz 12251 BLAKE2B 14b2a6bb81ac1843d30f0ae9c976971cd3409b50bd6b9adcb59d9132535fcebd3dda7a7f772aabce03bb6877e8140991301a770a58bcc4e82c864c10494773ed SHA512 a87f92a4467f87293fc931a2c5c003763aab8551adcce7fa7281b20f5520a8d2a9df2ff06bb66814cdd059266381a145c851fd7169749e8066e80e4a578cccaa
-EBUILD vdpauinfo-1.4.ebuild 536 BLAKE2B 89a7c577f2bcb1957dc1814a5c3c0ecf2e1c63d3183921c8f293cde99270573f6cd8d39f14ebdb871332862ae47d3f5afcc57b124a93cafb41a5adaea6670340 SHA512 663cb4c02ea0333eda5f282869d3a5b9d8d5b67adc3613d517dcc3df382a83f9955e5a61295d4f749709a49eb1eeac0a37cfc430fd69115f0fe53bbe28d25f8e
-EBUILD vdpauinfo-1.4_p20220208.ebuild 666 BLAKE2B 35901dddfab0c8a1b778f3c5b1667afac02632f92ea02c710dce449e2ebc8d1d5728889a488ba5c1789d3fa5e8ea5d8c9bbd32c241345c9330943cb7d30ce58f SHA512 c74a4c0020f7e6cb811a549c37d0b53c7ca686ed43341499e06044fb3279cf46bad4570705d42046696e1a97430e7f3b21bd4f2366d29ef65b311b9a1325ebf8
+EBUILD vdpauinfo-1.4_p20220208.ebuild 664 BLAKE2B e0497f504751fbc6551b0b029f474c63446d1bd09cfd647f9662c7b0afa3e956f2e67411bc4e500cb44d96faf6135a30cec2ce16ab117af48c02875458f44373 SHA512 3fc89ad3dfb079694258b8bca91afeb19b0e3c861a3222ed9b2c88f0063d4083e325809d22144a420ad4a32e91336535096c132a001be2f81c8eede6adf6bf50
MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild
deleted file mode 100644
index 1f24203192d8..000000000000
--- a/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Displays info about your card's VDPAU support"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- >=x11-libs/libvdpau-1.4
- x11-libs/libX11
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild
index e2b0c83fd786..133cc3bc678a 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${VDPAUINFO_COMMIT}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
>=x11-libs/libvdpau-1.5
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 2830c7b44a05..d83abecc43cd 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,3 +1,3 @@
DIST xfe-1.43.2.tar.gz 2834576 BLAKE2B 5ac7ebf229febb75a99e4829a38a3675d6674ec6eced13dc5be70d2b68ce88f6394621dffec2d8359e72da7eace582883b72491e90597ab4a8925685cb577fcb SHA512 ad7b450d0828747f801219c23824b0751fc2a7f0eea791369c4adb3090ffe1279056fa8804ef97b25a2f810e00d37357efc962dc9d4087c3d7cc5f8ffb37d51d
EBUILD xfe-1.43.2.ebuild 1484 BLAKE2B 96a66f0334851a54b2dab16517567b15a058b5ad91e992dd8c02b429dc02cfc2d9e80a051c16ef38f40430c16a1af36cc0d40be69440c03a5193e4bc7fef3f01 SHA512 1bdd40f8fbb7d5b39f049394c1dae1d541df5016215a9ccb03c92bafb7c5544759ce76ebe39b8f4b27963e63a591fb97737f9c14c8757c30ae6cc1f183a60ccf
-MISC metadata.xml 350 BLAKE2B d616dfe9ca5db09f8074bc9aebc590ddce0409be293204d37307a12db56f36ec7f4b712eba08be10143a21424cdef464b622ccb319ed8da801d64897bbd1366b SHA512 66102a050977b3bffd96305bc6760475bd9e00b5ac51563b866e90ef338698a9db0336ce55049fea064e1723f24759291cf5528672f443c06118fec2aaa9cf50
+MISC metadata.xml 240 BLAKE2B 92d4660766b1bb154a620ee57ef972fc2aca12436eb5e12f5880166a4303653c370318b65a0b39f86a13994d6f70eaab5c77b5d7b9b00df19fe2da15d29c3054 SHA512 9bd9123eda33c274644858aea8568a9dfcff772f9ebb95acf39b662ba39f0b1febfed0c56e1ab8d17650f192946449ac47338c78bc059202133b600800e375ee
diff --git a/x11-misc/xfe/metadata.xml b/x11-misc/xfe/metadata.xml
index d2c81c70e336..532bd5a1c5e5 100644
--- a/x11-misc/xfe/metadata.xml
+++ b/x11-misc/xfe/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>desktop-misc@gentoo.org</email>
- <name>Gentoo Desktop Miscellaneous Project</name>
- </maintainer>
+<!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">xfe</remote-id>
</upstream>
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index dbf563647ae1..3f1e4af49717 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,5 +1,5 @@
DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f
DIST xpad-5.7.0.tar.bz2 162675 BLAKE2B 2166816696d2e00a261fcc8e9483841be7803121dc3669ab35fdd014728f16a47860448dd6b754836a3dfcd0fbbd1805b87e470f96c0b692fbe3a588c81ee35f SHA512 ab9319473cbec9a7022e520e2284853270fccca88ad19e8cb52024ce79a2dd8049251009a22b97e2387de12b9e75576e50d4d17a7236cb8e0eb4c840c3400ef3
EBUILD xpad-5.4.0.ebuild 694 BLAKE2B 1ad02a6f235dd20b901970bd3fa5c79ac1be011297d8338c956fd7c3894f9f8cb3ed748e9e1aa81bc01196688610ac8bdcf2cdc19d61506e37ef7b6fd078b9a9 SHA512 fb723683e307f951ef6c68fae4e7b5d915178413c71dca5ac04cfd2e54a656bed9898c46627714193db650e2adb4a5f283d6818dae17a60937438bf5c7a87422
-EBUILD xpad-5.7.0.ebuild 683 BLAKE2B 4a24d0885069aab9affe957b6fd55e39b602184a909ace33416ed4e20bae966d8b9865919c30f659f8506ec61f379a155ee69b3d29defcc12a73fbf75819f6d3 SHA512 f95732abb029dbb8a77382bde28e0b917ff31e8ffb92fa1315d084a047404a0089c10d11344626dfa584ec6b92ba132d1e45bda8be859e73d853efef34df2fa3
+EBUILD xpad-5.7.0.ebuild 777 BLAKE2B cefb36ffc216f7d2fedd67152aeb53e52901d21836b0f0487300e42643656c584800aa84dabc5ec9fde6d56d75952d32fafce1008d6f618a27a337d1f07daeac SHA512 6359dfb048c411a02af48db086d81bea6733f7d453e9d46db08b72ba1e9844639724bd22b870342ac126bccfb5c825620eb9df00f5c420970f207f0dc80982ef
MISC metadata.xml 553 BLAKE2B a46c921ebebf55ac68b39fd00a78cb79038c3c78977f5b1967eb7f8b3f9745a1879bf1703cd2e71abe0f9eda83b4847089da3ecd9ed0c3d8864ff37af15f4866 SHA512 a99de9e46f399383bbe225e2ef1518327e4219e2877eb3a2b56e83e9aa6f79ad18e6e999b642e24212653bb0ad3ae44c47b7bce820562746b8f55859193f9f0c
diff --git a/x11-misc/xpad/xpad-5.7.0.ebuild b/x11-misc/xpad/xpad-5.7.0.ebuild
index f445ca27ceed..91cad0d91599 100644
--- a/x11-misc/xpad/xpad-5.7.0.ebuild
+++ b/x11-misc/xpad/xpad-5.7.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools
+inherit autotools xdg-utils
DESCRIPTION="A sticky note application for GTK"
HOMEPAGE="https://launchpad.net/xpad"
@@ -34,3 +34,11 @@ src_prepare() {
eautoreconf
}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/x11-misc/xystray/Manifest b/x11-misc/xystray/Manifest
index defb7b22acc3..5279ffb6f70e 100644
--- a/x11-misc/xystray/Manifest
+++ b/x11-misc/xystray/Manifest
@@ -1,4 +1,5 @@
AUX xystray-1.0-ldflags.patch 316 BLAKE2B bd0239d319aeda5e8c61925378f2a536138cd5257a70a131b6aca45b224b2e554eac0e1e212ecacf3001f2860e9e188e551cbabef4f960f595c34c8640e46c2d SHA512 f452a0a0db60bc4c9c1a67790dd817a979bf09ee7db8e424d2d58bec83d2b56d23ee67e62f8604a82820a54e3c57fecd35ffc1202c2a89b2cb23cc904df730b4
DIST xystray-1.0.tar.gz 18225 BLAKE2B bc115aa93448a2d6e0c0ec7f57643aa2444557090e1a7de3e3d2b6fe4c3c12045f31dbb09e6cdcb7afb95488c9fd5537a35a4ae82579017f0645d2a46e697acc SHA512 50f3700e497dae875f659d55e2d5c469e977ab513c35f82516f2c139e2813f126bcc7658d76b55346480c0ca7d65a67b74b289cdae775bd13c0dc9da31a9a92c
+EBUILD xystray-1.0-r1.ebuild 533 BLAKE2B 657366d25f72ec1187ea40d0f908b7864d48acb308364b11fd2540a7bc2711b8af70992a44e355c4f127664e3446ba6d67e55a413776c057c631845ba5e1d641 SHA512 cf09011982605f8b8c688b52a1a6885991d0e16a48c9ba1c027169e20fc5e28fc6669c9fd0820d42fedf274f7a331165a190d4c0a994d514ca65c42ec18b9af4
EBUILD xystray-1.0.ebuild 563 BLAKE2B 5b97ca54ca36f9d362b201844c40ced58a197661e476df8b37ea5ddbdcae0d05b1e991ef6be5bb9debdf076e967713d08e03337ee332aae209d28c31d8882c88 SHA512 844a17b4072343e4b3c25829c2f297e0d5a27f20910c0e35d604383530df38a16ce30bbf0729e34f2b53459c75fbd487a57b5e2517aa1aa178935ccdc9528531
MISC metadata.xml 327 BLAKE2B 30be53395c1b7571fec966d0e939d4118ba8bb64845500ea83525bea82ebc4d489f79798034c95484b99cf9332880a56ab424514e025b8ebec8f1fe81eb61c47 SHA512 f4eb05df5b3560e7b6745d4d58bab8c8ed1a768cc6161cea117ae59f3f4668d4661487af1fe5798c2e5762d234d6392605073ef363cbe6fda8a06974b08c9c29
diff --git a/x11-misc/xystray/xystray-1.0-r1.ebuild b/x11-misc/xystray/xystray-1.0-r1.ebuild
new file mode 100644
index 000000000000..97ff3ff73bdb
--- /dev/null
+++ b/x11-misc/xystray/xystray-1.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A simple implementation of freedesktop.org notification area for X"
+HOMEPAGE="https://steelman.github.io/xystray/"
+SRC_URI="https://github.com/steelman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXt"
+DEPEND="${RDEPEND}
+ x11-libs/libXaw"
+
+PATCHES=(
+ "${FILESDIR}/${P}-ldflags.patch"
+)
+
+src_install() {
+ dobin xystray
+}