gentoo resync : 29.01.2021

31 files changed, 34 insertions, 233 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index ff53549114a7..8d4b11c9308f 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index ca1481185270..b85bffb78338 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-EBUILD colord-1.3.5.ebuild 5021 BLAKE2B 9e9b880d6dbc6dead5a179d1e45c8ffef2289b9598c1b3184bb0a7c3411fc038620b50f5cba33c90318a83e49986c2b2cabf4a3f1b707f100cad8224ef639fd7 SHA512 140f21ccfc2195226b35a225c97d03ecaf8622bc7b1c4f650a2a7885a96bee6d5b5f0d6369d1bd81c6d959c53514b3a6c102e8261ec5ff5176f77cd8baa027af
+EBUILD colord-1.3.5.ebuild 5020 BLAKE2B 0bf726b3dceb24289e27ff1db60e5bf02fa350b52e271539a101cb422d2beaa4a4014e2421c8842755d65991e4c26651234ecb0e15ffe3d0659fe51d9f436e85 SHA512 7d2050a8f9bd884498770ace429edc8c3fffa556f9bcd3861e17531988112b6e461a6b76cd0a1eb2d3ad95f1e01d493416ead82faa2aefcfd3a92ce6833a2805
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
index a58726ebee66..e8a2b5c59e3d 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.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
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 # We prefer policykit enabled by default, bug #448058
 IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
index 404a726810d6..b10a252a94a8 100644
--- a/x11-misc/devilspie2/Manifest
+++ b/x11-misc/devilspie2/Manifest
@@ -2,6 +2,6 @@ AUX devilspie2-0.43-lua-pkgconfig.patch 545 BLAKE2B a2a13bf92fae1569d9bcc66c48d7
 DIST devilspie2_0.42-src.tar.gz 48663 BLAKE2B a2340f64191ba31d554aaab8c1ce74ba2252ac4f1524446c88eb674d9bc49225298eaa64c9df649410cb8a07993e891491f7d885af0d917810143ecdb8916bbc SHA512 796b95ded542a76343ffcff25d7838ee3bc25f37d9a02d06785a71aeb7c0da3ef05279f9b88216124c5c9c64754fde59973445a954b0f446f5b4ebe6a25f3055
 DIST devilspie2_0.43-src.tar.gz 48666 BLAKE2B 3657693547f1dbdfe8542f123601f228086261855dc8e99997cea76ef586b744aacb260222000300dbe34d3030646044fc046e94c2285e6386995853ceaaffda SHA512 0f44f3991e31f68a2d38eac32ea6fe4275a56e8b5e9439490d1e819fd69b5455ede565aa2b09b70c20ac852c465ac2c05c339ae1e5c1b7824685c46a28871abd
 EBUILD devilspie2-0.42.ebuild 1133 BLAKE2B a24c2b54cd596f8a38bb78fe0225b7824e08d8ff9116d2e0a7e358ad5e9197313e73cd249aa4e78dcf8ee247b16d1ac3818424d416cdc68ca1c6691b34d43c4b SHA512 a052da3fe67d8d099e6c5ed338aa5a3ecd177aef9d58bc7b570f61c4ae9c6df97ec16ee537080f0c142c0e7e48a269a96e412bbe63dbb0a467502a75c0288b54
-EBUILD devilspie2-0.43-r100.ebuild 1021 BLAKE2B 5777cfc8a936dfb684b97a93ffdd17beec24993954d01d3bf9a31ca89cdec1351008e34d496032a859568886ceb19b9babb3f98e8a2d5de82fbc83bfa4132d10 SHA512 3a5d5aad2c34ba488278f0f28bbc448861748bf90ab6eb1c92bfac6f3c544c44b2d46254cd715f74d8df6ca45bc0c0d84acba555acb81fe3bea148599df20ab5
+EBUILD devilspie2-0.43-r100.ebuild 1019 BLAKE2B 76bc48bd30bfaac0871a3ea97f9fc42284a98d973a418cb8e7465dee375821540750f6c96df041bbe1fbb9b1816384db484a710431ed293cf4273ac5f5ccc2d8 SHA512 7224b2ff7c486b604af6a278b81c5eb34295fa34cef95f99ab547372143ad1fecd0f2b6535ef0206e36d2150d2f93cfa4016f772a6cb0c3017ce44cf7247a8fe
 EBUILD devilspie2-0.43.ebuild 951 BLAKE2B 020e7b99cb9e1f5e20d1a0f2562b950fca68067866a517cd8dbb25d5a3f380d3fde3e2274fce55df74acf2590405fe907f312194fcded5131caef76d54e5cbca SHA512 81da566022c75df100ab2a1f7c59d5671a7c21950bcac922165133867dc27926ca2f8fc0aefa040100d8ca521284039d582a7c5e1b9fc2d37e4478c9d0808472
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild b/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
index e9c87f823d33..6adedca29b23 100644
--- a/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
+++ b/x11-misc/devilspie2/devilspie2-0.43-r100.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
@@ -14,7 +14,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${PV}-
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest
index 7c3bcf8ea448..e9301a94c3d0 100644
--- a/x11-misc/i3blocks-contrib/Manifest
+++ b/x11-misc/i3blocks-contrib/Manifest
@@ -1,3 +1,3 @@
 DIST i3blocks-contrib-1.4.0_p20201127.tar.gz 738457 BLAKE2B 1db16c40323d0c191bb44c50d6a66523391adfdf9652976f78238fffe0ee50d99d3bd6fbcfd1a0eeef8308fd466a3eeda479299f462b4d4d31ae2f2bc7ea6b31 SHA512 ff09c7b8e4b630d014f0441342835dbf03642f32de6806a1204eccb6166eade190abe43b331ef72aaa3ba5a77f9690ae8c36a9ef9aa6d312ae5e543a46b99a72
-EBUILD i3blocks-contrib-1.4.0_p20201127.ebuild 680 BLAKE2B c6a400a49a9cfa6077b9bd4f64099419d4ba097ac3dc921c6c94ad0bf988969250844666bb9e3b161b09ea2463d7238599b3e4440ba403b92ec15ddee204f5d4 SHA512 7b01dcbbdc5d340f191e6b01d7ad06c7a190b420b56b5b6c8eac2bae7915fa2cd2606059973517aea90402a9501498922b8cb45765115086fb619596985fba3e
+EBUILD i3blocks-contrib-1.4.0_p20201127.ebuild 678 BLAKE2B 864f0ba96e7e9643d1387db3b2f25fa1b3ba7721c1b45dc0679c52f5022eaf9ed4e023adb156f23134a48cd4e0c1e0bf51af43f6484389ff5f0591dd9700922f SHA512 0bb0934095d3ae03bee0715567f814c6906d8d71a670f3c19fe9ac8cda29620589179ae7e693ebe8f9064983d7d01c8b78f8a45428b3134185b16ea692452132
 MISC metadata.xml 332 BLAKE2B 174061304cb0b09fdc2279117f1dd3974b94104fe9926f854f149c580d6e64b4e2201f5a48f989b4f11a3db95e9e5051d393365069d95ca0f83b2db8b972b868 SHA512 911353979e4ca52a7fb5213811cfbac924f05eaa11f92313d65cc96d67eead4872deda29a5aa2572e67d63f2feb0f6e54bb4fd1d4bc41e4c9d6406e6153bb5f8
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
index 91c7d5c78649..01e8a293c8aa 100644
--- a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vivien/i3blocks-contrib/archive/${COMMIT}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=""
 RDEPEND="!<x11-misc/i3blocks-1.5
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index bc6a8785df45..d8c7b5ca340a 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -3,6 +3,6 @@ AUX i3blocks-disable-bash-completion.patch 468 BLAKE2B f4a2777bfb42468abaa797624
 DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
 DIST i3blocks-1.5.tar.gz 66019 BLAKE2B 0378dac61d2f0049dffefe2a3f98512518aef311f2d9d79b72fd9882834c6a09c8954e7ca906fb96bbcc76992288fe659b4977f2cfad1234dca27ec9131ac720 SHA512 759829d59f94070251378d437891c2df05715fbd0b734c34dd41767d61957f301c6125b0058668295b8eeac29038fae6b2e8c194f903398ee736662213d1d534
 EBUILD i3blocks-1.4-r1.ebuild 769 BLAKE2B 871a9eb5cf632c053ed5795047fa1b87b8a16519e9892a96f6ceab764b28c4b2808cbc28afe9f869fe9868a8ccc295ed65b87d38c74dd81d1e9beb771174b104 SHA512 a54bd1cbf1464eb5b7ddd72d1926aec330943602bdc346ab4e74ae5c4030365566dca85d9afda23760a8e66514fcda6172b7171fa063672c9db61d7428aebfa2
-EBUILD i3blocks-1.5-r1.ebuild 767 BLAKE2B cec20a8858f8526ec4ec5d35ebf1a15fca736b44f962cdb190fe2a13812d99804ac931070d922b235f83353109f8d3d69e0e90ecced7a235316772d74881982e SHA512 fa5683103f2190a824ce2100430edd1aa75f73d9c13e132c7135a73a64f19fa39c15fba78515028240e9e144934cb0515dd44cf6f701b1aa8e8f892be745e4ee
+EBUILD i3blocks-1.5-r1.ebuild 765 BLAKE2B c5f8ee3ed8bdda27469431b703e9194d81c6acbe7f1772d05e100a7ac150ab7b30d274224c620a82e409c3146d6eb760ccf0f9b7f61e75f6d6083cac922a3c74 SHA512 40a1abe1ee905d463bdcf8db3f5ff602b910fe8ef9fce5bd436c6733f96c8873338a65f914a84b85a335f584423624657ec1d16ffd0dc143b2f9f78725da00ef
 EBUILD i3blocks-1.5.ebuild 699 BLAKE2B 2ca090318052d5c5fcf03d5b0b4ed896217a81194800cf07c00f7c8d47c79424438678eef5d5b1fb7b1c6c0d4982fbc4277dfdf8f4f417a8939b2ea775594d60 SHA512 7693bce42f2959023b3601e4f10da5ec2351e85bb4271a2192a14eabb45f6515a57ad21ddfe4931019b1d7109691ee544d595bc27ae8a3d68abe4b59bae34058
 MISC metadata.xml 400 BLAKE2B 306658e11cb2e3dbefbb4f79cb3d41137a9f70d2a2ad9e63dcb90d1663a3b3d3220a09f3a29ef451a4191f73ccca8294dbd96225da5c13f2186f6e1ddc8dbfe1 SHA512 43531d6c06327673e8cdf74fee209b01dc17d1c50f54a24a793fdbffde4069694502da52013ceae37dfd57c52bcafef530a36746d46e2931aba93c2673647d07
diff --git a/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
index 418265489eaa..0ff32627916e 100644
--- a/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/vivien/${PN}"
 else
 	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 IUSE="+contrib"
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index eedc4e162067..cce9337fd195 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -7,5 +7,4 @@ AUX 0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch 636 BLAKE2B 0aa1c55b
 AUX 0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch 3810 BLAKE2B b6e08d130fd4ba4ecd3c851edb01acfbf976f8a8134a5116115330b6ead2ae04c53fafba82ce2b006203221737a494276f82dde5140113fabec70cd0aee6b4a1 SHA512 c89341483ae97d43e58ea66324b0f8691bfe3cf849ebb3dfa4c76d4456c3bc1f2239692f2a3fa3b0cef5980ffa807e9c0c9809b16af2755b7cb71c39869a8e83
 DIST i3status-2.13.tar.bz2 201409 BLAKE2B e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc SHA512 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2
 EBUILD i3status-2.13-r1.ebuild 1589 BLAKE2B 2d41ef01ba4d5cebe12dc40dad94b6ca8285ac37e3f2e16553fe7a916387e52512e20e94a02119fa95ed935853b91234b37b504b389c0ac2fa40e4123c9f0d47 SHA512 efbe456e810b7ffee5fb39b771ceed63c85d70b66f8a7d889da97417fc2976c7fa23631abb178ab66780ceb3414eb384266e1e08bff2abc39cf00c6adca3b77b
-EBUILD i3status-2.13.ebuild 920 BLAKE2B d8259edb35966d55a19871a8727b744c3a353d76edf243ac25049fa8992477eb599ffafc68e94138f48e82bea036e43efb997729205b55aa77fa10eb8c4a51a4 SHA512 27845022d890ff5fa2feee8978082944dab85043160b1330215458e77366469e36a056fcdd33aa5bb235ae9781b5bbbc6f3cbcc5318831b173e1bd9e53f404bf
 MISC metadata.xml 898 BLAKE2B 26948920cf32c22b1f80e57bae048dbbe6675d2b3e3593bcaa8e5d5790f34647f81b666dc2b8ef25345755bbcfee1bf71e44da76f508223ce432ddc71e8520d2 SHA512 70981067b9c47528a73fee30a5200b274613d69ed31622ec22de2ba59c5e1138dadeeecac5c5703750ecab7e08629a7a8456a1de208fe404a242929ddc2c88e6
diff --git a/x11-misc/i3status/i3status-2.13.ebuild b/x11-misc/i3status/i3status-2.13.ebuild
deleted file mode 100644
index 0648dee3cb59..000000000000
--- a/x11-misc/i3status/i3status-2.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit fcaps
-
-DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
-HOMEPAGE="https://i3wm.org/i3status/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	>=dev-libs/yajl-2.0.2
-	dev-libs/confuse:=
-	dev-libs/libnl:3
-	media-libs/alsa-lib
-	|| ( media-sound/pulseaudio media-sound/apulse[sdk] )
-"
-DEPEND="
-	${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-"
-
-src_compile() {
-	pushd "${S}/${CHOST}" || die
-	default
-}
-
-src_install() {
-	pushd "${S}/${CHOST}" || die
-	default
-}
-
-pkg_postinst() {
-	fcaps cap_net_admin usr/bin/${PN}
-
-	elog "${PN} can be used with any of the following programs:"
-	elog "   i3bar (x11-wm/i3)"
-	elog "   x11-misc/xmobar"
-	elog "   x11-misc/dzen"
-	elog "Please refer to manual: man ${PN}"
-}
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 62728a11939a..105e15236919 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,5 +1,3 @@
-AUX notification-daemon-0.5.0-libnotify-0.7.patch 948 BLAKE2B 9da54db70a628988b5f5b3e34dd71a7bbf8357a58be1e7c9de863d719619b6376ca311c4963e0974f77c08671f03efd28693d90f97a852ee68393e3b11b550fc SHA512 e828d89197c29c3b8e2b6b2e616d6fd63952f8b8ac23f4a0b7a8f6a75722e011d1684302b711ee530506e4e17aae6c7949f12f58a113ca6bb254a29d146d5870
-AUX notification-daemon-0.5.0-underlinking.patch 277 BLAKE2B ef30fae7ca0d8a26c18acc5f98e5a2bd4db53293f302fdba3bf3fbc362c435931d81482e174fbff5396ecee04768068e51c48a8e19be3f881803ae4af77e3637 SHA512 e370ed9435b474fddf0b884d6781bdbfb1cb68dd7f851e72f525d6153235d39f77d28257c6d720f3de63df8ac29a7bf9100669813f4edda177a9dbf21afa3e5e
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
 EBUILD notification-daemon-3.20.0-r1.ebuild 842 BLAKE2B 74258d04a4a7c89663e7046e3e35cdf36ea0e4f39ac3e0cb52eeea8bb95ecb27be3701c0d9b06984984316285009bd36e8a511d1a2977d62a0ccc346770385e6 SHA512 21d68f573d7eaa846e6deb67b570fb8edde276087ed75f5cbacfcf76aa230de9c65c413f4a7eea6faece860792a61e0fe4101f527fd3255bbb0461750362d78f
 EBUILD notification-daemon-3.20.0.ebuild 922 BLAKE2B 82a6de852b65ea70b4516c41d6fe6521809a926f7eaa1e92905fc6113c0c14a22306a670666d7c7a3fdc8be7396034860636080efe55e8f3eeb4ddf87bb3bda3 SHA512 e08f853f4246530fb81e81ff431b9f95af71a28de6bcce35621995267ae68cf4e4cc3176c97fac6bb26dd5fe76117bcdd78464b2f3e1d22ba61a81f18ed6a319
diff --git a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch
deleted file mode 100644
index 63765ee79e69..000000000000
--- a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/capplet/notification-properties.c
-+++ src/capplet/notification-properties.c
-@@ -27,6 +27,10 @@
- #include <string.h>
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include "stack.h"
- 
- #define GCONF_KEY_DAEMON         "/apps/notification-daemon"
-@@ -402,8 +406,12 @@
- 
-         dialog->preview = notify_notification_new (_("Notification Test"),
-                                                    _("Just a test"),
--                                                   "gnome-util",
--                                                   NULL);
-+                                                   "gnome-util"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+                                                   );
-+#else
-+                                                   , NULL);
-+#endif
- 
-         if (!notify_notification_show (dialog->preview, &error)) {
-                 char *message;
diff --git a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch
deleted file mode 100644
index 306ffd9cf991..000000000000
--- a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/468522
-
---- configure.ac
-+++ configure.ac
-@@ -98,6 +98,7 @@
- 	dbus-1 >= $REQ_DBUS_VERSION, \
- 	dbus-glib-1 >= $REQ_DBUS_VERSION, \
-         libcanberra-gtk >= $REQ_LIBCANBERRA_GTK_VERSION, \
-+	gmodule-2.0, \
- 	gconf-2.0, \
- 	libwnck-1.0 \
-         x11 \
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index 941e88afedac..abf1b9a1ed83 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,5 +1,5 @@
 DIST obconf-qt-0.15.0.tar.xz 99976 BLAKE2B 7c7aede61cfc7a26c56de7e6ab49410dc82f4f9fb4f293fa0f0896f1b14cff63d34d00dd56347ec8daca375e226fed4ebb58c633061129708fd5107daa97d074 SHA512 a723dcd3b409afc7b16572d293cbf0543e00a7177a9819e2374632c00c765de74896429f6e19a54fcee83e20ce2e0876f857447c374db2f4f925dec92be71279
 DIST obconf-qt-0.16.0.tar.xz 101588 BLAKE2B 94407df40878c64a40343ad2a8fdbebc78a99beaf017485fda52d6043f2597467c67da465dd191a78ba7c084f1072152d4033f7b5b41f257946941efda37a9e3 SHA512 ab0ddc013ca877f2434da956c314b248f6a7ef5ced1e5c605de0652d0b8c5c0e84f1e6fdf8b21c6f3d450d57a1413d625d0a31b84cac2c9062dc0f101d8e57ab
 EBUILD obconf-qt-0.15.0.ebuild 907 BLAKE2B a004fcc83626c5abc8673361e9ed2d0a34ce6cc6640b245b3312a2bc2c68be9ac8c208eb7d5ea06473e02f1239c3b4eb10a371337d2c8aa80b54357709e78003 SHA512 857a0b53d75f1e4c769096d70242471234f7331b7828f345c08111d01d30ea52bd262103c371e7f97d9e88fdb01c1bd0fc6a0d7b74e5f4dadbaca8e4073eb5e8
-EBUILD obconf-qt-0.16.0.ebuild 908 BLAKE2B 345ceddff907a6d5989eb63260509fe03b30ee29ff946bed102c68f86f516abb137b66df14fd131ca193f9c10a002332eba1920e4abbc5be6e4d207f6b328d11 SHA512 5b1b5981e33172d486f990d39544a907a7088c3385141f6ad9832aa2a112dfacedd4e486ff7155499a0f29cac64bf20edd4d560470dacce14cd1648561f971ce
+EBUILD obconf-qt-0.16.0.ebuild 907 BLAKE2B f8c9c221dcae3f63bc84d8152b81a1faada6d46c1a848562d11017c72bf4575c3cacf8e313b94f2f580f96eed73bb8f9168b32f14e125125ce542fb0c11d2e6c SHA512 910969c17b53693ea452d5461a8065e26febccbea098e99910e570648c3c94f4dc00d7e311c29a9dece9c9a4f3c9bfb947f7c7e470c5080437122ecef705b614
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild
index 2f737f6ae3ec..82275f756da0 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 70b42e5a2bae..146fc018b5f2 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pcmanfm-qt-0.15.1.tar.xz 257832 BLAKE2B 78c8f5723b529b7f8a00870f017818183a498d8a1f68f8f24ab756eeda9b35d8d998b42d87f78e4a8fb6725bf3e812dca74bc1464f285a6a984dae1996b43f46 SHA512 db0d3cc683b5c94cabab5a8c68b3ae8bf5938735b34989a420692e933bb54d53ebb15da9af4a59039bfd101de0cc00c521c08207e81bfad9d80315e2d94bc559
 DIST pcmanfm-qt-0.16.0.tar.xz 275792 BLAKE2B 65deed6a6d942a57c6cdf497d254d5052b1bcca219198f3cbaa2bcd29048976610afcfc31cc2101f8ddad88f436bc8dba2483b8305ff55f178dd65c91a549814 SHA512 42c754267966b29722bd771d6f6f09c20cdb3b33bbe49deec982bdac98379dff92ac13f6f70b603aea963a3e1003034475cb682ec4264cfcf581c189826ea727
 EBUILD pcmanfm-qt-0.15.1.ebuild 1098 BLAKE2B a775a49e89656b9a857aa2095d3f770ff31a1df5591e6e69f0eb2308723449ec3e3dc7bba053fbab8074d63b1a821f3dfe1b8d1df0a869c6c9b58e3526d3295f SHA512 360c8d2adbfa632a5803ab2c1d00324a5b157322e64b4efaa050d6e51aed33fe355c7b81775731c7b4278397ea1e94eea8f5193577ac0f64804604f914e0ac2c
-EBUILD pcmanfm-qt-0.16.0.ebuild 1099 BLAKE2B 6c0398459837a047891b35770f7766dda49f5f55de02360624b1c381be35b8aa3198af3ac4d6ac21747866c8319c7b82bb5435ff5dc76f93bf2884d77d631d8b SHA512 17691b3af4a6902f97adf29dcf361aa417feed4506e13bfe7d98a29162d4277144da69afcc9c7547d0806a00c829c9b935fb0bf791a33d5782d685660ae389b9
+EBUILD pcmanfm-qt-0.16.0.ebuild 1098 BLAKE2B 8e337b446f6c3c948a5cee463bffac0899bfc3f15006c52a97f5a2de0d07c6886a11c814e741b6312519e2a72ad823c108728a3f757772e1768baca186ffd350 SHA512 71288802c33d465ae74c1a9bef001a287ad8c7b2a4fd519c5811a1935a5226e482684d64c648a1f6df8cc8126908fcf133e4bf011d8037a74a6bec291685d8ee
 MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild
index 50564fd43210..471e0052a4ba 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index d992422c441b..260a1985d23b 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,5 @@
 DIST qps-2.1.0.tar.xz 197352 BLAKE2B c607fde920973c21e85b74e9408f7827ad4354d95b5b16cc95c22bc4143579f1dcddf68bcf9904f4df12236d49f786f457bdf3ce809f37549211f297bab18205 SHA512 e5601657be94d4c21e189fc1113f4678a4bad70ca3c9c3882492625b37339d079d1e8240120bdb467bc47ca95a1b26f8e2da022c271377cf0dbf98e390bc8ac2
 DIST qps-2.2.0.tar.xz 205940 BLAKE2B c5454df5d7f8465687de8d59250db5f8e06edcbceead6f4ee316e02bc7596173d2319fc21e168968d9a155b0bb9aa98f074d0da3b9d618d051e2eba9159b5b13 SHA512 640c228dd9712d6becf7583cf2cf21bd35df638fcbe088650628d678a1f8f5abb055bdf95150dfe7b24687e043ebd805d1a98f331e329058b5db9dce01dd8f20
 EBUILD qps-2.1.0-r1.ebuild 736 BLAKE2B 282c784d62c5df1586702ddb2a509de2b28ad52282344212642925148da0f258b73bed5b7a893ff449dd7fb2c287bd1a9bf5bfa5b2f1f3813a5613f86019f554 SHA512 ef62a9d7080022a9abf89f36eb20a66e6a4dea0e681331a7a4849a1942486588ed42e85344b1b71b2fba80bb108898c39d579b20c92f756f4467bcb87a50d2e5
-EBUILD qps-2.2.0.ebuild 737 BLAKE2B 1f1f1b53c4141a6153287603a14c9a050cf1b8c58a31b3705e3a635a8e24709a6bb1b7d27a92c3de1987bfd96477b89054add1b0f8f1703769af15cacd0578b8 SHA512 d45c97c548cfc06e949793f0501d2fe9b0f798f258d8ba583e632c36610d35a4a628ea1e1f6b2667653a8ea53e1608940214837e4c1611cc8aa27adc07eab6f6
+EBUILD qps-2.2.0.ebuild 736 BLAKE2B 487b8d36f923e0d7e88504f0bd5791ff27bf2b6d880b602186c22e976eb609c09a84d364a3837732fb5ad47c192e370dbded002c508f5c95d811927f71d075f7 SHA512 c6da011d9407a1a8635487e4abfc674395ec8e19417fc88b965c8a794eb6e2279ea0bba1f19f246ecd53d0924119aeba0f422134562a64117de8f09a825aed46
 MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-2.2.0.ebuild b/x11-misc/qps/qps-2.2.0.ebuild
index 0101797a7d1b..cf7874777bee 100644
--- a/x11-misc/qps/qps-2.2.0.ebuild
+++ b/x11-misc/qps/qps-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 6f3f0f3f2969..69561bbe499c 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,4 +1,6 @@
 AUX util-macros-1.19.2-CPP.patch 1103 BLAKE2B 19ea2f1ca56daa27a8949566337305b383f3e1481e9a2bd8046a05188eff00a8a89dcefc30598ceb2a0641c99bf1c6bf13bbcf55e894767cc77e9b897154c47d SHA512 572f64b4a1fc2989f1fbe969c070f19312c90d7f5c4d3fd98bd749f8024a2e21a1a43ae2520e2bbbe7c9b74f76b55615e3618ca7f700837d6d8fbd574775cf26
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
+DIST util-macros-1.19.3.tar.bz2 84690 BLAKE2B 95f6bd6cca47111f973eef60915ab0b0a1c6a6b15facb08da138df100c27caacce28866c5ac05aae79116fe3bafa15f454ea6cb9997069f0b5fab7968777d383 SHA512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2
 EBUILD util-macros-1.19.2-r2.ebuild 740 BLAKE2B 1e0cc0ae892d3fcbb08ea0f91f3e5ea93069f8fd8fd811fcf3772c93c91336c2b0f99a7a037853539a3ecb228ada120337927988d3bfaaef9093da6fb0626ed9 SHA512 234abdfd5f9cdc4a57c61a66c4c199324178c60dfa4d08e7ba5bfca75b0d4b7a506bd11f9d866737c587fb85211c8015740fd9e2c9bf31e126cc1a08066f6369
+EBUILD util-macros-1.19.3.ebuild 697 BLAKE2B 59bc8ef73769b994c0f43bb2ef59971d63b932ed2b119d31281629ed405396fe905ae33426d8d5c6b4b490fea6876cc85fc47d7de69061047c52912ad16d111e SHA512 bc7c94269a11c5da0ffbd3dc183e0d190d6ee3ffe266162b6990c23fdfedc1daaca86468688489cdaf183ed5bfa299d3de31712f51c2822224c4a32ccd486de5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.3.ebuild b/x11-misc/util-macros/util-macros-1.19.3.ebuild
new file mode 100644
index 000000000000..b4c80bbc6eea
--- /dev/null
+++ b/x11-misc/util-macros/util-macros-1.19.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.Org autotools utility macros"
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros"
+SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
+
+# there is nothing to compile for this package, all its contents are produced by
+# configure. the only make job that matters is make install
+src_compile() { true; }
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index a8a7ce871b13..43847d30fc49 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,6 +1,4 @@
-DIST vdpauinfo-1.3.tar.gz 12159 BLAKE2B 41dc31ef2f45272221e2eea969d7801cc9c8bfd693e64f7d157b17645da654b7f50d780df698736b3e2ea9c55c7d3b6e7ce75f96aacd50bbaa4032dfc753a43f SHA512 2271053c17d389ea600742ffe14e863921f18e504e07cb5db33c98745d2f71aece908408bca0161b3c2fa9cd67de8c741c132a774a4fd9443c7124168a4da79f
 DIST vdpauinfo-1.4.tar.bz2 11811 BLAKE2B bf0c268505b8eafb9da7c799518296498f2c04bde33443101625c4a80cfde6418428d3969e9ac0f4222a6985b53f3bd4dff688fc03af29de7576f3af3605e07c SHA512 7227205f35d5ad9bc64537d4e47e1924e7efbcd1185420f5f575eadff23f2932484db9c39c377282ed88fa7fd43d436064b10961082ccbf66c49dac72b4129a3
-EBUILD vdpauinfo-1.3.ebuild 579 BLAKE2B bd17879fe0cbb595de06b973bce5ead8f0443d8d993a2626cefc6651259589cf25c3f795a40634c04cc67bd6dba98c714b2fdff927dc66f505f1f94e1aef5c3b SHA512 b2616a840b284e040fcbc84d067b54be3bf771f0efa6da92a63f2d4fb7379c8fee047b79c38fac6c721a95d86d0afba95c794548e95dac8df028093e5257dfb8
 EBUILD vdpauinfo-1.4.ebuild 536 BLAKE2B 89a7c577f2bcb1957dc1814a5c3c0ecf2e1c63d3183921c8f293cde99270573f6cd8d39f14ebdb871332862ae47d3f5afcc57b124a93cafb41a5adaea6670340 SHA512 663cb4c02ea0333eda5f282869d3a5b9d8d5b67adc3613d517dcc3df382a83f9955e5a61295d4f749709a49eb1eeac0a37cfc430fd69115f0fe53bbe28d25f8e
 EBUILD vdpauinfo-99999.ebuild 515 BLAKE2B 787c16d503300c983ca2da1eab61967a5bc2d986cf0fd969906345ae144da3e62eea7da3c4a318775271a9694be858bd5d70def0f956923d53de337432869bd1 SHA512 d65b62f29237d55d5ac6d2cc8a0965b67def68c5ea52a71c28514926bc6fdf53b7ba8781b50469a3e8eb92f16199120b6a909d0700179a6ef033f7d8c846ccad
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild
deleted file mode 100644
index 6c12128cc543..000000000000
--- a/x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	x11-libs/libX11
-	>=x11-libs/libvdpau-1.3
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index 7eb891e6ffe8..3615b1e719bc 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -1,6 +1,4 @@
-AUX xfractint-20.04p09-ldflags.patch 1067 BLAKE2B 4faddadfa0105ffedef7552264971bf685121a74ccd449b12f33d525af61c9fa0557fc3e693848883d88a5b868c96f8e3bd2e14764182ecb2655b6ba64a12294 SHA512 af78e1facb6e436fed67e56871172fef742df1eafa75c55a75752dda855f81f7aff35cfaf042cf1f7502f66d4a9c7bf831b781c8641299873cc2537fe5da0ace
 AUX xfractint-20.04p16-install-phase.patch 729 BLAKE2B 937aa26a6b0e4e4f9c5ef52677f47ed5fb0f7906f116da378b82020bc765c01cd488b1625d61f33324c4984ba2cb1c669b1fca95fc834a948bf22fe87977a0c4 SHA512 fab66eafe5b97b767e6e67f09bde79f3b984e0d40fcb4fff1e5002da5a47e052916b3ec6786921fa393e150ef47e78e286fc0dda58e4affdb2cc5989a58ef7e3
-AUX xfractint.envd 63 BLAKE2B 1622655f8b51034a4f3e7c9d7b11fd7628a33b30a17df15b6af8d5aaccb824f14ab4659fbd356cb188d8c0f1f0d2c1537a8bbcf1fa560eba9c5a2ced7bd7d7f1 SHA512 1e923957e93a53af47a8bc3205c350b9fe4bbfa9f955c5eb5673c1ce857808bdf0ad020c643c7f81dda1c0b5caf2480005c2f31eabdaa39908ef68649687b5a2
 DIST xfractint-20.04p16.tar.gz 1356976 BLAKE2B 2cb05021c76d9761bf7020a2b9a0fbf7d682a620d931b7841ce75780c1a3aabb6bbbd1b2e378fba3e96b2cfdaf845ff9cdafcf3219ee756fe7d128a19b342132 SHA512 6696daf21c2927d87f58f7d7136c5d51bd8c60d78e901d537f1ef38f27b70c42a590b05c663363c49a8cb30d7013a969813e7bbe4a97f49b9c286497b440bdf1
 EBUILD xfractint-20.04_p16.ebuild 671 BLAKE2B 537cf58481f902508d41458a71295c1c0fc44e7ed4d9c81343c7201a9a22e5280105bc6b39d6e02b4addee97c52c3713baa9e1020957a52e351d23015126e196 SHA512 0327cd8a0e1983ba9a2b176455e7d52c2a49d727cba1cb065aaedf2fa8445c3f95946b30e7b71b965b7c939b29d5b9a8b303526ca10e8210349f0834c2ac4735
 MISC metadata.xml 366 BLAKE2B 5cfc7ce6a7f5e6d02ad5f78d0e9d177c346b498b679f5623cf7d2321021a3d0289fe30c1b2360cec5903409627898de04fec3d2a7c26ea875f8e891685158549 SHA512 d602f03153bd9f03c962a47d7b10c829e2bdbde64cb5e67bfb4fb7c8755eb87784139ae1e1b287d6dd5c99d2f7a96f7c04f67fede847095116385db7cced5f2e
diff --git a/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch b/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
deleted file mode 100644
index eb3d92783aae..000000000000
--- a/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -125,7 +125,7 @@
- 
- ifeq ($(AS),/usr/bin/nasm)
- 
--CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin
-+CFLAGS = -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin
- #CFLAGS = -I. -D_CONST $(DEFINES)
- #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \
- #         -march=$(ARCH) -DNASM -fno-builtin
-@@ -133,7 +133,7 @@
- 
- else
- 
--CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -fno-builtin
-+CFLAGS = -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -fno-builtin
- #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \
- #         -march=$(ARCH) -fno-builtin
- #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -fno-builtin
-@@ -312,7 +312,7 @@
- 	          "HFD=.${HFD}"
- 	cd unix ; ${MAKE} all "CC=${CC}" "CFLAGS= -I.${HFD} -I${XFTHFD} ${CFLAGS} ${OPT}" "SRCDIR=${SHRDIR}" \
- 	          "AS=${AS}" "AFLAGS=${AFLAGS}" "HFD=.${HFD}"
--	$(CC) -o xfractint $(CFLAGS) $(OPT) $(OBJS) $(U_OBJS) $(LIBS)
-+	$(CC) -o xfractint $(CFLAGS) $(LDFLAGS) $(OPT) $(OBJS) $(U_OBJS) $(LIBS)
- #	strip xfractint
- 
- fractint:
diff --git a/x11-misc/xfractint/files/xfractint.envd b/x11-misc/xfractint/files/xfractint.envd
deleted file mode 100644
index 3dd0cbcda664..000000000000
--- a/x11-misc/xfractint/files/xfractint.envd
+++ /dev/null
@@ -1,4 +0,0 @@
-#Specifies xfractint directory
-
-FRACTDIR=/usr/share/xfractint
-
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index f9f98e1dea1b..4a3e0e7b79a9 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,6 +1,3 @@
-AUX xvkbd-3.6-last_altgr_mask.patch 202 BLAKE2B d980f06b4975bf5dadd6e6e656fd3471fbfc651cfee7f4c118010b1c38d41f7597f7bd6d7e07e6c261f7fed0b07efefdfd4f09fcee38029f0047ed5fc2a1317f SHA512 d3d58b1ba3a7dc71a0240ba3240fd06cc1719ac35ab8f1b119f7d79823fddcdbe1605a457722ec75d4b74804f0a68ec221c5ec3d6c15bd2c4130ce96c01f771e
-AUX xvkbd-4.0-destdir.patch 1026 BLAKE2B 473a1499bff1f00846ae81de75973bc77f63f456d071ebd70fc1d112d254345bda108d34d6934075268e1f5c6e02bcc0107bbd1565380ad01dc1c08ce9b243ef SHA512 8c675dd76eb2f126c48cc669dbb5bf87e337816ef4ac5d6c4730f4259862353e4de1dfc255fda36e35f9a93b507add5922595f53e7c91257996e4c5ee6c8043b
-AUX xvkbd-4.0-fno-common.patch 510 BLAKE2B c324653ddf0638f7806a4488a0dd5474097c60c9bf476d3437208aa7b827047b08bad347b2dfef470c0a1198e2341e157c823de0a5c87fdb076793503d2e680c SHA512 62d90307834cc7dfd04c6e1cf6fa0c6e7526d6ca7dccb897c137686e3a4e5d30afffbbba6c8500d144c5ec3dd49691660573957fe6c0b89c1aaedd9183f02797
 DIST xvkbd-4.1.tar.gz 408704 BLAKE2B 45667706005f508e22dcd6d24631b5488ffd32b0bba2cb14e67ce1f77c5fdf3f667ca1431a0833e311bbffbc5baf08daed8ff736158c72178ae5d079f694d9d7 SHA512 6a27a659bacc0f78d70c0afab7ae0f6301f0e7f0c9ed12c581fb4fd5040791536aed50c82ccbd703377244156aade80136567276193f2789a23f05c341b6c0e9
 EBUILD xvkbd-4.1.ebuild 615 BLAKE2B 330f359558c187bb956d15509ba21be02a45288ec625fd30af5aad4a3fa2d82297c806c7454dff03e3e93c0b1a6fc9f7c90492b5804ce1349c21a7205f657c66 SHA512 6b538830bd84981da2a036ddef9fe52f488cfaff57643bcff1b1faeb5319a55f1fe9d4263a9c554fcd3476cc1b52c2fcfaceb944f89cb19c522f21834d3a5ea3
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch b/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch
deleted file mode 100644
index 7fe70773acca..000000000000
--- a/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xvkbd.c
-+++ b/xvkbd.c
-@@ -681,7 +681,7 @@
-     }
-   }
- 
--  last_altgr_mask = (altgr_mask | last_altgr_mask);
-+  last_altgr_mask = altgr_mask;
-   alt_mask = 0;
-   meta_mask = 0;
-   altgr_mask = 0;
diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
deleted file mode 100644
index 83879dd9fd02..000000000000
--- a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,4 @@
--appdefaultdir=$(shell pkg-config --variable=appdefaultdir xt)
--datarootdir=$(shell pkg-config --variable=datarootdir xt)
-+appdefaultdir = $(shell $(PKG_CONFIG) --variable=appdefaultdir xt)
- 
- SUBDIRS = .
- bin_PROGRAMS = xvkbd
-@@ -17,11 +16,12 @@
- 	[ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h
- 
- install-data-hook:
-+	[ -d $(DESTDIR)/$(appdefaultdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(appdefaultdir)/xvkbd/
- 	for file in *.ad; do \
--		$(INSTALL_DATA) $$file $(appdefaultdir)/$${file%.ad}; \
-+		$(INSTALL_DATA) $$file $(DESTDIR)/$(appdefaultdir)/$${file%.ad}; \
- 	done
--	[ -d $(datarootdir)/xvkbd/ ] || mkdir $(datarootdir)/xvkbd/
--	$(INSTALL_DATA) words.english $(datarootdir)/xvkbd/words.english
-+	[ -d $(DESTDIR)/$(datarootdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(datarootdir)/xvkbd/
-+	$(INSTALL_DATA) words.english $(DESTDIR)/$(datarootdir)/xvkbd/words.english
- 
- EXTRA_DIST = XVkbd-common.h *.ad *.xbm xvkbd.man README ChangeLog Imakefile words.english
- 
diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch
deleted file mode 100644
index 1ca0db048566..000000000000
--- a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/resources.h
-+++ b/resources.h
-@@ -19,7 +19,7 @@
- # define PROGRAM_NAME "xvkbd"
- #endif
- 
--struct appres_struct {
-+extern struct appres_struct {
-   String description;
-   String show_manual_command;
- 
---- a/xvkbd.c
-+++ b/xvkbd.c
-@@ -500,6 +500,8 @@
- 
- static Pixmap xvkbd_pixmap = None;
- 
-+struct appres_struct appres;
-+
- static int AddKeysym(KeySym keysym, Boolean top);  /* forward */
- static void MakeKeyboard(Boolean remake);
- static void MakeKeypad(Widget form, Widget from_vert, Widget from_horiz);