gentoo (valentine's day) resync : 14.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
commit: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree: c44943ee0563a3fa957716de909fed683117fcb9 /x11-misc
parent: 69051588e2f955485fe5d45d45e616bc60a2de57 (diff)
43 files changed, 220 insertions, 545 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 81ded7fbc6bf..1f6b9a5a8e10 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 7457dcb79506..55d04fc78e15 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -4,5 +4,5 @@ DIST albert-0.17.2-pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b
 DIST albert-0.17.2-python-extensions.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294be5cd77fe3f9b4abd985541bd995d1665e5e4a3a9dd64b393c5aba6f00347e0a4c031df2a04672246caff1038858df286c271dd33975 SHA512 13e14ce180787cde9abd0c06970109d9217f67e0b4596d73768efb1a183f6493552766e89bea6fc83703a4c0cc1b4961459cbbf5953c530d2c09d53e686ccc53
 DIST albert-0.17.2-xkcd-python-extension.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402
 DIST albert-0.17.2.tar.gz 72652 BLAKE2B af5398307bf4dce928cfe92766551c761c407d9d98cc0a4b730cc8e95509d15c5b8ccfaef6e19d3dd2ded5e56403b14c3ac08fce90845abdfdb74ce7b3ff8b71 SHA512 ce2e32fa0018b210196e09cda8a3cce0a2cafecfdef5edae4610c621c39b66e3b4b039449d1900deb9689b5fa14178d079f7f0a7917cc1019d26b48a0a3ca415
-EBUILD albert-0.17.2.ebuild 2730 BLAKE2B 92a1744717025de8f2a198ba2da7587a61d619642bec5300df737d24978fdf0c650096939830466afd067c88346c295f77e3bf59f0a87fd83fbd78754287da62 SHA512 f6608ffa18cf6be400c7bf36c38860d105a52340d16bdfed257108d31c4466ec4547d9dbd8a9c226fb844244f7fa60e42e6f0037b1dde102e30016410ad9c2a8
+EBUILD albert-0.17.2.ebuild 2797 BLAKE2B d1f12440c3a672c02daba3f2bdb54d54822e78b6dc80bd83b47f47614c5d52d864547853df123b80ceaf6afaabbf1f1ace0dc44cc4bfc585e7a8a689b4b5dfec SHA512 5caee7a51cae769f9acb510bc66d2dbfe310b3be02146c3b5b2cccd1786cea484c0daafa27b49d9829492459b70758a669748a9423f2694949eaf6a97a466549
 MISC metadata.xml 745 BLAKE2B 7b15716f944a6712c6aa1afe34307ca1bfa8587150df5e71d2af0b8fa96b95cea669c8e1b6c7af75667f44035869e8f8f7674837660c094bbd6e1e710940a095 SHA512 573c724bcc935bedca3beba49c89b214d54f690f4d56df73d90f9dae1a2f80f72cad75d4dc4a9166e33c71ececa571db016aa17170d3c6b864288eec9bc85a43
diff --git a/x11-misc/albert/albert-0.17.2.ebuild b/x11-misc/albert/albert-0.17.2.ebuild
index 58b5b30d0b47..037b2adeeeec 100644
--- a/x11-misc/albert/albert-0.17.2.ebuild
+++ b/x11-misc/albert/albert-0.17.2.ebuild
@@ -27,10 +27,11 @@ SRC_URI="
 	)
 "
 
-LICENSE="GPL-3+"
+LICENSE="all-rights-reserved"	# unclear licensing #766129
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug +python +python-extensions +statistics virtualbox"
+RESTRICT="mirror bindist"
 
 REQUIRED_USE="python-extensions? ( python )"
 
diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index 72d91e5c6470..ba724f28c1e3 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -4,6 +4,5 @@ AUX gmrun-0.9.2-glibc210.patch 324 BLAKE2B 6080d23e033fe589c6df27622c955dc4c8110
 AUX gmrun-0.9.2-stlport.patch 697 BLAKE2B 6ebb5d3a8a0a0047ab5a537a5a6f7814add9b9a9ae05feb0ac9b9eab8b5643097b2b31ec0afadfbe345abba89d46432b64bdf34e1f1516ffa2c0c4fd8422bddd SHA512 84ea68891309b6c3a29188e188e4572b7228abf3d874f138750cf51f33f8fc42aee33f8f4538fc80e324c16e64c68b739cc321cb94e49dd4ace5ec1b3bc4605d
 AUX gmrun-0.9.2-sysconfdir.patch 863 BLAKE2B 11cd0ded75db0d90843799a1e06cc9118bf323d540d3870acf3c98e34486b902cb08e03a859c2a0debb1761a5d20923d560b41e276743640d9ab7a85026cb8ce SHA512 0c201cc73f35bf1d56ccc072e2adcc8c6acf5d42d325919fc2e4c4d4440db076812e5a4dc67cde3f857b78332b7f37adc1fb250bababee6ff4aecc16ecc0cbee
 DIST gmrun-0.9.2.tar.gz 66097 BLAKE2B 3b8f253e8d683d02c8b6cc8da3d54103b53c6b9ebd4d90b4675325809f592f407a32532e6f0d3d3a112f5c7b9304eaae75bc3ba7f1e1b372614d95206edf0da3 SHA512 3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422
-EBUILD gmrun-0.9.2-r1.ebuild 807 BLAKE2B 0072c5676d41c1747ed9c5fa4d054fe7bb95945562ade42e5c594c66cd6fc1c1e31144a76bed3fe5c2e6d18a4bcc965c4f8c3933c9893ccbe272d562bbec68b2 SHA512 b56da789824b6fdb5cf9f72a53757a2b0e6e2c1f8260867c6b9d05b2b95fc2e49c071860e3af64087bea36326d6888517276ae9253e4f26256248327dc652791
-EBUILD gmrun-0.9.2-r2.ebuild 768 BLAKE2B 3e79d32b18a322c86b83da6eb171ff6314757a8b2c81f7a6282301b015d73e3c29743354921b6ab7e410f1d88a808607313029ff6f9b689bdb80a8acd6b7011a SHA512 e36415e424243fd967bf85fb7cc66b8790da7db137aa61de9a0eaf24fc9c0199c2820a2bf54257e7e9827f0e427c653fd963941d72d824c4353f48040bfde46c
+EBUILD gmrun-0.9.2-r2.ebuild 762 BLAKE2B 25091b70613674ab68ec9abfe2f1c424b34576f5ee98cb5a5912727f3c9ae34f59eed2682c0e6db506d23ff0f6bb9dab0067bd81243cfe76aa64332ce232fb2d SHA512 b6f5e0ed57fae5af608ac1e921b1d0dd92f2a9dc0ce1209bf6e30fde48495cf0f0510b2319ae5cf613e2d5b12ffcbe30fcc33112998bf75a357e67ff813f04af
 MISC metadata.xml 499 BLAKE2B 5353745aef22be8bf296f8904ff958a3e8d1ce3d09d560b7174f033cfba402e8fce88f040292ab7df81514ec131d2bf1a6e77a92a77a3e5413550b47ed5ea8f4 SHA512 1936f5ec9c0d0ed6ec8a4bb8700ad3d724498c876c2320babf9e5da987e37b25b81cfa09ecaada077d081075017c8efc53c4a02b64148ed2b9e916b3a7ee191c
diff --git a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
deleted file mode 100644
index 4a0f55c5db3e..000000000000
--- a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!"
-HOMEPAGE="https://sourceforge.net/projects/gmrun/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/popt
-	x11-libs/gtk+:2
-"
-DEPEND="
-	${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.10 )
-	sys-apps/sed
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-sysconfdir.patch \
-		"${FILESDIR}"/${P}-glibc210.patch \
-		"${FILESDIR}"/${P}-stlport.patch
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README NEWS
-}
diff --git a/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
index b2ce6fb13cbd..8ccf8afd6f09 100644
--- a/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
+++ b/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index 3ddbc41b9323..04d4c03e1152 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,3 +1,3 @@
-DIST grub2-theme-preview-2.1.0.tar.gz 198805 BLAKE2B ef0417d49462a78678abfbcaa6b2ad31010cc033467c76291be8f66d4a3e412ac6d015ed4ff55a4aa557e7ed5a7cd33d25a2dd04111fe1ee78af413505fdab78 SHA512 9e8f21b5b84e2564654ffff84149f8421e168bc83c39ad9adf1ba0522de3b3d041c4be3853c6749bfa4d0693e629f43f359724c14b652a599f9c202fe00ba6b1
-EBUILD grub2-theme-preview-2.1.0.ebuild 742 BLAKE2B d75341c87a8ad7b5bf49c1ce6e89def1ee34500a40cd8dd716d08b7f468ca5c5d7de615dd235847910b97890f5ed05ecea93d811f51f1e3396e9eafcc25d1d93 SHA512 a61b1c4946a74fac0cb78ac8b8a8dc129e7dc1829822a6ade2c6121da17f197cb76ab01c3aa526742ef2c8e2ba9eae6c31dea478e59ca211bbbccb31567f75f0
+DIST grub2-theme-preview-2.2.0.tar.gz 198843 BLAKE2B 82c0b424cb539d62206b2875ddecbd7bad9796cce3e0ae2ff1b349f382bf39a096d24f3b4b47f6efd85638dc8823a1961b409db7928411858e6e6f593efe6993 SHA512 4906fe5ec60da9a6ec78dcb74897a08b672d52c8f9386d1fb1b11837ea244a0a4ed3a389a15ed83baeb2de7ee602307a96a29e147a6169f301c59078c1f5e376
+EBUILD grub2-theme-preview-2.2.0.ebuild 742 BLAKE2B 90d36974cc5e63331c4db7650be13e6fe14324efb8448eb9ca98e952fee97b9a8776fd397a0312c3b320a37413f1b3b89e3619dd45f9244e7a6bc168b565e8ff SHA512 7a512df655ebb8f4ff51f2ca07eeb7195230924e04cc0e1d8f78a24e52bf9c54031f790e84c5f32a0ef7ca427d8fde734205b32dcee45a3f3265790382bcda91
 MISC metadata.xml 342 BLAKE2B b12306a165fac0714ee6a833ed2b8de2a5f598e36e38e42e521b10d5d432e980d0673266b571986d851b2be319520c020b8fba860c4cd6c28d76a8f3e72ec811 SHA512 3577ddbd08dfb9a7c5f35a5e6b102620985a932cef550f48c32298f44864c385e7fcedda171107285452d242dd3e03f60a3e6bce8c814e933cf35388e942f35f
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.2.0.ebuild
index 7cbfff411c31..35f557913322 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.2.0.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"
diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
index acffb9603571..376df08d8ef9 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,10 +1,6 @@
 AUX gtkdialog-0.8.3-do_variables_count_widgets.patch 214 BLAKE2B 7e8975b55ac8432ceeaa412b01c2a8362c1394575aadeb471ad93f6bb91e185f412c94c4c1e4122055b939723fce15efc8353587f1adc5f01d746b9143f7a5ef SHA512 befcd5644d268b734a15e8ce0d58fc410d61fca9b825cd97f14ba5000355d81684f42d6bbb65cdc84ec7fa01c3112901adb0ffabd6af0df4875f2441aa0a7235
 AUX gtkdialog-0.8.3-fno-common.patch 1535 BLAKE2B 1a881d8827c0ac815791b5bd482d1160158bbbce8a2b5a57235e1ba3131d8cb4c591f10b67fff35c5f1a632f097fa751749702b32696f1b86469629a4b4238f4 SHA512 5812ee6272bc7ffa85ea506bce9b64451c5d9a716c87272b7c5e0c166b85ac7ba7f1a8cf9c687df194b20fe0db942084b2d199cbf51093b05d204c217ea6e65c
-AUX gtkdialog-0.8.3-optdeps.patch 1573 BLAKE2B 1db31db450da622f91920611c93bd4d8cec0378ab2baab27dbb0f3ea750a6ca83ac6e0bb14ba6f4b4043ab80205d140d4b5fad6e9a120445499a4c0984577956 SHA512 a26d46716b46a909c4346c3fc3d9999991c98649ce4fc97cb6f0010dd768c81c62fec6561210dad89ef3911d2fe751c1cf321df60d5e6321647b818f8ed91475
-DIST gtkdialog-0.8.3.tar.gz 571974 BLAKE2B cfd5062ec6c255ade5467b9d6435d7529c5a55f911db8e549b19c26032aebcd1b83f2cf4ac7e2bcc9c71f9f37725c9285bbb22505ec021e7eded28ab7d382113 SHA512 fd8a93d576917efd650e38e31f261065c0a0c3f9213338ed4bd457d310993d8efbe8deabb2c1451f491d14c8d38cbcd5d4cb0c9f289c6fd462f7a06754b89da7
 DIST gtkdialog-0.8.3_p20200202.tar.xz 356312 BLAKE2B 77358e0b04ddb484e3e3a093084776a2c799fa52b90849bdde3bce56a7c042c2cbe28d699f0c4dcc14cc69872d496b89fc5c8aa7140669560e01448d9c57c15d SHA512 9120ac515eace168e4a3987b6cf3a1b3aa0e7617e837ade21d5ffea25cc3f3abbff598bb4c33914fb800416ea687f0ec7dea2b24c8acc0c71734aa6b2b385bfe
-EBUILD gtkdialog-0.8.3-r2.ebuild 897 BLAKE2B 6d445aefb7cc5825df30d4ba7e9157710bbd2266fc047efe47e8525a2899eb75879b878f9f122f067f9c4f974922c340b22e5ba6c952c5dd91d2981a030e41d6 SHA512 294e88293061c8cae807fcb95529a46b54e3a3357b28de2f67cfaaa17af8b237946871ed9fdc10f334a23fe0944190a5c7981e7e001ee104b9c6e0b6f1c57b2b
-EBUILD gtkdialog-0.8.3-r3.ebuild 994 BLAKE2B 53e7ad93fa84c2776552f11365411cf64d19a9329986501717dc4a824af23072f7acb39d1e8003eaaca714087ab39a028ee09213fe3d2792d67e551150e6c9b2 SHA512 aff4969b5d95b6a0a3a19cd37f41c8f7dd554a83fb3a0522fbedece6f1fdcfb37363f6887d2dfabb6ed3c239a72d2f7e152cf87827c9bbdebb3aba22facc1a82
-EBUILD gtkdialog-0.8.3_p20200202.ebuild 1080 BLAKE2B 1985d73e8711b8e7c68fd26db6a277fa99e2e65c910c3c0264b56ac843ae5fb54b04902af6f3fa944c42a9f5e7af09b9540ec9e7b0d5d97ae7d9e61ed53fe756 SHA512 bc7594710c9b1bc958f663d83170b93422bafad7e01dcfa135734b77d9d7f53f7eba125456ff94a191e5f10b8d676d77ba364f9fde3f36f5449e51faabef8f4a
+EBUILD gtkdialog-0.8.3_p20200202.ebuild 1077 BLAKE2B 3c64c762e7b867c6db7a7931cd0aa8eecac5fba66399a65a18e53495c8895be41c469d630cb8af20613ed204958d3a702aa98082f8e1dec3e1f21de563e7025f SHA512 d2d088500fa2411fdb1da1859e7988c133562d97ad944a4f28c95e8bc274e3a8a1687c986a0c148dc34f8c411f115f06873371f31961a0546f7a42e72ad11ce5
 EBUILD gtkdialog-99999.ebuild 1075 BLAKE2B 6c9be3e8b4ed1685a87064c09eeb807cde325619b894301bfce4bc597c8ff796d0c4e5e63a157dc8edcdb89e4ae11e25848c7e98496ab2388b17279fbc822bfe SHA512 c50630ef940040e3dc766615a19c9ac5c9cb04924d5baea9679ce152f0913ae883845841d580b8183abf619aeff7bc24af1fff17a855d4d67d5abf0a3413696e
-MISC metadata.xml 1061 BLAKE2B 0befbe35090efdcd6567b30df2263e2e9de09921b98e78ac829705d5dd667c02074b0e45816be46919cd0a4fa7e97f8b16dd619f0449257b9038daed4a10dc56 SHA512 d58b989f9601950b77e9711ba86e127c7bbe7e770322fb02cf9db26742f43d6e7f80b40cf1f59f086a7c26d1453c78a5c4143e5bb99213819167b1c602f4c11c
+MISC metadata.xml 952 BLAKE2B 3eca701ec6df8005bbdd68bb5c7b65e0719f287930cb1bdc6076e1ecf693f14193cabd4f13b004739b89a147335f1829bb715475099c35d4294366a02cf7b502 SHA512 bb020adf5f95b0001b1b68c8a8457d2638d1790e1f628b47170e51bd4af65a1801d03724e231ac0d2c69f1982f208d4a15b043f57f86fcacdb085b43a0a44e67
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch
deleted file mode 100644
index e032c1290215..000000000000
--- a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,32 +25,40 @@
- AC_PROG_YACC
- AC_SUBST(YACC)
- 
-+PKG_PROG_PKG_CONFIG([0.24])
-+
- # Checks for libraries.
--pkg_modules="gtk+-2.0 >= 2.0.0"
--PKG_CHECK_MODULES(GTK, [$pkg_modules])
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0])
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- 
--pkg_modules="gthread-2.0"
--PKG_CHECK_MODULES(GTHREAD, [$pkg_modules])
-+PKG_CHECK_MODULES(GTHREAD, [gthread-2.0])
- AC_SUBST(GTHREAD_CFLAGS)
- AC_SUBST(GTHREAD_LIBS)
- 
--glade_lib="libglade-2.0"
--PKG_CHECK_MODULES([GLADE_LIB], \
--	[$glade_lib], \
--	AC_SUBST(HAVE_GLADE_LIB, 1),\
--	AC_SUBST(HAVE_GLADE_LIB, 0))
--AC_SUBST(GLADE_LIB_CFLAGS)
--AC_SUBST(GLADE_LIB_LIBS)
--
--vte_lib="vte >= 0.23.5"
--PKG_CHECK_MODULES([VTE], \
--	[$vte_lib], \
--	AC_SUBST(HAVE_VTE, 1),\
--	AC_SUBST(HAVE_VTE, 0))
--AC_SUBST(VTE_CFLAGS)
--AC_SUBST(VTE_LIBS)
-+AC_ARG_WITH([glade],
-+  AS_HELP_STRING([--with-glade], [enable support for libglade])
-+)
-+
-+AC_ARG_WITH([vte],
-+  AS_HELP_STRING([--with-vte], [enable support for vte])
-+)
-+
-+AS_IF(
-+  [test "x$with_glade" = "xyes"],
-+  [PKG_CHECK_MODULES([GLADE_LIB], [libglade-2.0], [have_glade_lib=1], AC_MSG_ERROR([glade requested but not found]))],
-+  [test "x$with_glade" = "xno"],
-+  [have_glade_lib=0]
-+)
-+AC_SUBST([HAVE_GLADE_LIB], [$have_glade_lib])
-+
-+AS_IF(
-+  [test "x$with_vte" = "xyes"],
-+  [PKG_CHECK_MODULES([VTE], [vte >= 0.23.5], [have_vte=1], AC_MSG_ERROR([vte requested but not found]))],
-+  [test "x$with_vte" = "xno"],
-+  [have_vte=0]
-+)
-+AC_SUBST([HAVE_VTE], [$have_vte])
- 
- # Checks for header files.
- AC_CHECK_HEADERS([locale.h])
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
deleted file mode 100644
index 5e5b48165a4b..000000000000
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A small utility for fast and easy GUI building"
-HOMEPAGE="https://code.google.com/p/gtkdialog/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="glade vte"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	glade? ( gnome-base/libglade )
-	vte? ( x11-libs/vte:0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	virtual/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
-	"${FILESDIR}"/${PN}-0.8.3-optdeps.patch
-)
-
-src_prepare() {
-	mv configure.{in,ac} || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with glade) $(use_with vte)
-}
-
-src_install() {
-	# Stop make install from running gtk-update-icon-cache
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
-	einstalldocs
-}
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
deleted file mode 100644
index f6947de49587..000000000000
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools xdg-utils
-
-DESCRIPTION="A small utility for fast and easy GUI building"
-HOMEPAGE="https://code.google.com/p/gtkdialog/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="glade vte"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	glade? ( gnome-base/libglade )
-	vte? ( x11-libs/vte:0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	virtual/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
-	"${FILESDIR}"/${PN}-0.8.3-optdeps.patch
-)
-
-src_prepare() {
-	mv configure.{in,ac} || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with glade) $(use_with vte)
-}
-
-src_install() {
-	# Stop make install from running gtk-update-icon-cache
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
index aaa806d08243..fa5542bd4063 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.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
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gtk2"
 
 RDEPEND="
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index 7d0ca79e2c46..41363328c85b 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>desktop-misc@gentoo.org</email>
-<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
-<longdescription>
-gtkdialog is a GUI-creation utility that can be used with an arbitrary
-interpreter. It enables the programmer to describe a graphical user interface
-in a simple XML-like language, and use it with any interpreter that supports
-either files, standard I/O, or environment variables. It can be called as an
-external program from the interpreter, but can be used as a stand-alone
-framework for the application as well. Stand-alone, bash, and awk examples are
-provided.
-</longdescription>
-<upstream>
-<remote-id type="google-code">gtkdialog</remote-id>
-</upstream>
-<use>
-<flag name="glade">Enable support for <pkg>gnome-base/libglade</pkg></flag>
-<flag name="gtk2">Build with GTK+2 instead of GTK+3</flag>
-<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg></flag>
-</use>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<longdescription>
+		gtkdialog is a GUI-creation utility that can be used with an arbitrary
+		interpreter. It enables the programmer to describe a graphical user interface
+		in a simple XML-like language, and use it with any interpreter that supports
+		either files, standard I/O, or environment variables. It can be called as an
+		external program from the interpreter, but can be used as a stand-alone
+		framework for the application as well. Stand-alone, bash, and awk examples are
+		provided.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">oshazard/gtkdialog</remote-id>
+	</upstream>
+	<use>
+		<flag name="gtk2">Build with GTK+2 instead of GTK+3</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest
index e9301a94c3d0..05ae6b834659 100644
--- a/x11-misc/i3blocks-contrib/Manifest
+++ b/x11-misc/i3blocks-contrib/Manifest
@@ -1,3 +1,4 @@
+AUX i3blocks-contrib-respect-CFLAGS.patch 654 BLAKE2B f3633b4046a55d31d5ae694b37517ac72cffb01ff3d6c6ab58a38df5fcdce64ae3532cfb9629e7d51dc9cb5d1b399623d275456ba3ef84f9376f2a2797e003a2 SHA512 a60f83fd008deffd819a6997b0061474ead9b37b5a069c592b6afb79c0a11b360e5bfadedfa2279919990923e9283adf6c1851972cfdedfdbf27addc44fc58d0
 DIST i3blocks-contrib-1.4.0_p20201127.tar.gz 738457 BLAKE2B 1db16c40323d0c191bb44c50d6a66523391adfdf9652976f78238fffe0ee50d99d3bd6fbcfd1a0eeef8308fd466a3eeda479299f462b4d4d31ae2f2bc7ea6b31 SHA512 ff09c7b8e4b630d014f0441342835dbf03642f32de6806a1204eccb6166eade190abe43b331ef72aaa3ba5a77f9690ae8c36a9ef9aa6d312ae5e543a46b99a72
-EBUILD i3blocks-contrib-1.4.0_p20201127.ebuild 678 BLAKE2B 864f0ba96e7e9643d1387db3b2f25fa1b3ba7721c1b45dc0679c52f5022eaf9ed4e023adb156f23134a48cd4e0c1e0bf51af43f6484389ff5f0591dd9700922f SHA512 0bb0934095d3ae03bee0715567f814c6906d8d71a670f3c19fe9ac8cda29620589179ae7e693ebe8f9064983d7d01c8b78f8a45428b3134185b16ea692452132
+EBUILD i3blocks-contrib-1.4.0_p20201127.ebuild 732 BLAKE2B 65f9771d2b72486d01b24b3b94937148eca140799a043336c90ce212c2abada5f352b07e5fd1c17a490ab8805a83a1ae06d7cfe43e47394e23cdedbe1a802df0 SHA512 aaa52e06493792bb9b972bb8b5965ec3c0703541310d7e431b2ea61752dc215ce67a06f090cedcf17f1238404246ea92b0e4957c623b24dd00039947d15539b9
 MISC metadata.xml 332 BLAKE2B 174061304cb0b09fdc2279117f1dd3974b94104fe9926f854f149c580d6e64b4e2201f5a48f989b4f11a3db95e9e5051d393365069d95ca0f83b2db8b972b868 SHA512 911353979e4ca52a7fb5213811cfbac924f05eaa11f92313d65cc96d67eead4872deda29a5aa2572e67d63f2feb0f6e54bb4fd1d4bc41e4c9d6406e6153bb5f8
diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch
new file mode 100644
index 000000000000..15d36b130db4
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch
@@ -0,0 +1,22 @@
+diff -ur a/bandwidth2/Makefile b/bandwidth2/Makefile
+--- a/bandwidth2/Makefile	2021-02-02 07:03:47.002894030 -0600
++++ b/bandwidth2/Makefile	2021-02-02 07:05:21.556854777 -0600
+@@ -1,6 +1,6 @@
+ P=bandwidth2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=c11
++CFLAGS ?= -g -Wall -Werror -O2 -std=c11
+ LDLIBS=
+ 
+ $(P): $(OBJECTS)
+diff -ur a/cpu_usage2/Makefile b/cpu_usage2/Makefile
+--- a/cpu_usage2/Makefile	2021-02-02 07:03:47.004894029 -0600
++++ b/cpu_usage2/Makefile	2021-02-02 07:05:51.138842328 -0600
+@@ -1,6 +1,6 @@
+ P=cpu_usage2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=gnu11
++CFLAGS ?= -g -Wall -Werror -O2 -std=gnu11
+ LDLIBS=
+ 
+ $(P): $(OBJECTS)
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 01e8a293c8aa..701962eefc8d 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
@@ -19,6 +19,8 @@ RDEPEND="!<x11-misc/i3blocks-1.5
 	>=x11-misc/i3blocks-1.5"
 BDEPEND=""
 
+PATCHES=( "${FILESDIR}"/${PN}-respect-CFLAGS.patch )
+
 src_prepare() {
 	sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile
 	default
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index d8c7b5ca340a..b76843e16d1d 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,8 +1,4 @@
-AUX i3blocks-default-sysconfdir.patch 373 BLAKE2B 4483b6c4e838559997acff86c46a879206decc0e834bd92cf8573eab28f5ce3ec74f186ce53fe3e2a69f8e7006265ce956f677470828f8b3e1bc40b5ab925abe SHA512 db974877a1eadb1b37279dd4e4159b47947958f688aed94dd3e3c49457a94a0e5d803f221dc7a160ed2cfdc915399892d010a1083a49a7ba7a53d49572c16554
-AUX i3blocks-disable-bash-completion.patch 468 BLAKE2B f4a2777bfb42468abaa79762470f871848f76e252de030792a8365656ba683095eb90c95c9f45ab4e250877bade39ee9a89acc067799138b08ac565661af46bb SHA512 cdb9cdf0103d7609f67ec7df80b725e32dc88a90d8b964d2da6d257e2bb3c67ab5a5a7fd99253c713535860752c52741e97982b4b862e88f99ba0bc634eb23b4
-DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
+AUX i3blocks-disable-bash-completion.patch 396 BLAKE2B 1ed07e8bc335117e4dcbf048efadea33306575f706bb88006cd5528158ff9ddcf373202fa4f5d007de69d5694c3521137d23ae108b825123f72858fa4f3d724a SHA512 b388bbaf394f791f052cfe3cda97f9c69b36fe30cee3954df27888585285abe22c6d21d8d2f611467583581d153d00f55477a3458b46d9b741662ace16a00d5c
 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 765 BLAKE2B c5f8ee3ed8bdda27469431b703e9194d81c6acbe7f1772d05e100a7ac150ab7b30d274224c620a82e409c3146d6eb760ccf0f9b7f61e75f6d6083cac922a3c74 SHA512 40a1abe1ee905d463bdcf8db3f5ff602b910fe8ef9fce5bd436c6733f96c8873338a65f914a84b85a335f584423624657ec1d16ffd0dc143b2f9f78725da00ef
-EBUILD i3blocks-1.5.ebuild 699 BLAKE2B 2ca090318052d5c5fcf03d5b0b4ed896217a81194800cf07c00f7c8d47c79424438678eef5d5b1fb7b1c6c0d4982fbc4277dfdf8f4f417a8939b2ea775594d60 SHA512 7693bce42f2959023b3601e4f10da5ec2351e85bb4271a2192a14eabb45f6515a57ad21ddfe4931019b1d7109691ee544d595bc27ae8a3d68abe4b59bae34058
-MISC metadata.xml 400 BLAKE2B 306658e11cb2e3dbefbb4f79cb3d41137a9f70d2a2ad9e63dcb90d1663a3b3d3220a09f3a29ef451a4191f73ccca8294dbd96225da5c13f2186f6e1ddc8dbfe1 SHA512 43531d6c06327673e8cdf74fee209b01dc17d1c50f54a24a793fdbffde4069694502da52013ceae37dfd57c52bcafef530a36746d46e2931aba93c2673647d07
+EBUILD i3blocks-1.5-r1.ebuild 633 BLAKE2B 6f8faffed53680ba459deddd5153d5acb43602c57cb6fac17400c9b2373e5b153d48e997944925c68824f9f008c4256930e09d65171b8d897dd7ec05b0d77133 SHA512 0ccd2efd114bb3be218a094170647048c417811727ccddba89e489e3bcdc82db3249a2461080133b09309d37c11a570c5e647a1e3ae8cd86e1cec0caf4987b19
+MISC metadata.xml 517 BLAKE2B 815d06199e095adf685affa065ac859489993b5d50e375f55b1fd07bd3ca87b8ddb7f1430165a6a63cf61687af7f5b73528271ea5dfd89e42a5ac7f025c0512d SHA512 4a8a2b029c9c4af79740990325ae978989c0a7623b235951f657cf390ed40051931bfd6763d6887c49c9ee6f3c84c8bce3e51083a24cdcb04422bb056a71bb21
diff --git a/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch b/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch
deleted file mode 100644
index 04d625dcb47f..000000000000
--- a/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- i3blocks-1.4/~Makefile	2017-02-20 18:56:06.340061271 +0100
-+++ i3blocks-1.4/Makefile	2017-02-20 18:56:27.518915055 +0100
-@@ -4,11 +4,7 @@ ifndef PREFIX
-   PREFIX=/usr/local
- endif
- ifndef SYSCONFDIR
--  ifeq ($(PREFIX),/usr)
--    SYSCONFDIR=/etc
--  else
--    SYSCONFDIR=$(PREFIX)/etc
--  endif
-+  SYSCONFDIR=/etc
- endif
- ifndef LIBEXECDIR
-   LIBEXECDIR=$(PREFIX)/libexec
diff --git a/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch b/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch
index bfca548e06f1..bc7c065eea8e 100644
--- a/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch
+++ b/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch
@@ -1,5 +1,5 @@
---- a/Makefile.am	2019-10-20 22:46:55.603462157 +0200
-+++ b/Makefile.am	2019-10-20 22:47:29.893461028 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -29,14 +29,3 @@
  
  dist_sysconf_DATA = \
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
deleted file mode 100644
index ce2f86de762d..000000000000
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="highly flexible status line for the i3 window manager"
-HOMEPAGE="https://github.com/vivien/i3blocks"
-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"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-RDEPEND="app-admin/sysstat
-	media-sound/playerctl
-	sys-apps/lm-sensors
-	sys-power/acpi
-	|| ( x11-wm/i3 x11-wm/i3-gaps )"
-
-DEPEND="app-text/ronn"
-
-PATCHES=( "${FILESDIR}/${PN}-default-sysconfdir.patch" ) #610090
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
index 0ff32627916e..8bd169120d36 100644
--- a/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
@@ -5,22 +5,14 @@ EAPI=7
 
 inherit autotools bash-completion-r1
 
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-fi
-
 DESCRIPTION="highly flexible status line for the i3 window manager"
 HOMEPAGE="https://github.com/vivien/i3blocks"
-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"
-fi
+SRC_URI="https://github.com/vivien/i3blocks/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-IUSE="+contrib"
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+contrib"
 
 PDEPEND="contrib? ( x11-misc/i3blocks-contrib )"
 
diff --git a/x11-misc/i3blocks/i3blocks-1.5.ebuild b/x11-misc/i3blocks/i3blocks-1.5.ebuild
deleted file mode 100644
index 9922b9524a99..000000000000
--- a/x11-misc/i3blocks/i3blocks-1.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="highly flexible status line for the i3 window manager"
-HOMEPAGE="https://github.com/vivien/i3blocks"
-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"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-PATCHES=( "${FILESDIR}"/${PN}-disable-bash-completion.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	newbashcomp bash-completion ${PN}
-}
diff --git a/x11-misc/i3blocks/metadata.xml b/x11-misc/i3blocks/metadata.xml
index 2e726d1c36a9..fbf0521c46d6 100644
--- a/x11-misc/i3blocks/metadata.xml
+++ b/x11-misc/i3blocks/metadata.xml
@@ -1,9 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">vivien/i3blocks</remote-id>
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 63da3ba017cf..9e48279078d6 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.31.tar.gz 408348 BLAKE2B 69b71426974ee21fd5f70fc7448b2b08fd2b8ffd673fd0de928725f75dff7121fc9619e8ce98fc926c75dc2ee8eac21ecd77ce7f9d1df01da2698eef00b46fb0 SHA512 612bb859ce594b3eb397b6d254723cfd8fb5b005eb3279f05d72b0098769bff1434060c1086606331d207e5367323179ef52c07ebb4829bf4a10c490e524b4cc
-EBUILD py3status-3.31.ebuild 719 BLAKE2B b4bbde224d212f92d7ea2207dba154ce306671f8989f9b742253857db93b3408a651636e88a255256233313b1b0b8ecd3ff0c9091342a5ba90010b124a646601 SHA512 b65027b5c2d577bd6d3c39a831e3988cb713d91bbae9e9f2365083c845b611c60030cde940ec803315dc4a50e9a6499935e65dbacdb6a69482abaccfc157f25a
-MISC metadata.xml 628 BLAKE2B 649225c124569c38af8f27f617f3aa8761189acce95a76c54725a987c0124daf55723faae315161736b13a3032887d6036328ba46b48851a25f4c67cc3efc095 SHA512 220b5202a46611f41e8c814e90e079db6796b44144e05803c70b04414cc05417cf264d8fa288102e14e94a4995f000efdd19d36e51cbe17524242ac5f1318668
+DIST py3status-3.33.tar.gz 408435 BLAKE2B 5d839d9bd20b2eabf1a95a8a7765472e896805d551135daf032bed175d263b78d7c11609d6e6e60e3fd235b0945f48f9cf5b97285855b7ed7ae1c3998984d0b8 SHA512 fbf3bb869ecaece3d0d34155833bb533a331a90c7315e5c0cb17e88a8f484e0ca66f9855f487daabf18515bb496d136f953854025364b7ca81dc81aaafa4cfd8
+EBUILD py3status-3.33-r1.ebuild 741 BLAKE2B 99bc86a5e02a51d89d596ce4dd553b2ef1e8f2d28a15749827d2e7d2e659f1fd7cc30b7b45fb5a987a3683af5b93fe70ed7c675baf9f893e3d530d7fcc799c2c SHA512 ae46b80cd597e9787756300a2fff054489ca135e94dd68470e6d8ec840be68431c7edb9c2e72effe82fed10f08fa963fd72ffcbb70b292324fa2a11e357a592a
+MISC metadata.xml 757 BLAKE2B 059448fb46b35c9db53995d542d06432e182c022a584351fcd45961f23fca4549ef405eb39aec4fbb59f7e7ec7082428766d917f79fc84ef5ed2684c2030baaa SHA512 3fa373a13f9889d91d863ed3369abb76045447168bd10f62981d14315889d445b523cab315e83afa052baca5881576d398931ee2333a6ec4bf6863e23fb138b5
diff --git a/x11-misc/py3status/metadata.xml b/x11-misc/py3status/metadata.xml
index 29c98f85e343..fe9e1147ee80 100644
--- a/x11-misc/py3status/metadata.xml
+++ b/x11-misc/py3status/metadata.xml
@@ -11,6 +11,7 @@
 	</upstream>
 	<use>
 		<flag name="gevent">Install extra requirement <pkg>dev-python/gevent</pkg> to enable green threads.</flag>
+		<flag name="minimal">Don't depend on <pkg>x11-misc/i3status</pkg> if you don't plan to use any of its built-in modules.</flag>
 		<flag name="udev">Install extra requirement <pkg>dev-python/pyudev</pkg> to enable udev events monitoring on modules.</flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-misc/py3status/py3status-3.31.ebuild b/x11-misc/py3status/py3status-3.33-r1.ebuild
index 4f8362b4f515..a5c75fc841b1 100644
--- a/x11-misc/py3status/py3status-3.31.ebuild
+++ b/x11-misc/py3status/py3status-3.33-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,10 +17,10 @@ HOMEPAGE="https://github.com/ultrabug/py3status"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gevent +udev"
+IUSE="gevent minimal +udev"
 
 RDEPEND="
-	x11-misc/i3status
+	!minimal? ( x11-misc/i3status )
 	gevent? ( >=dev-python/gevent-1.2.0[${PYTHON_USEDEP}] )
 	udev? ( >=dev-python/pyudev-0.21.0[${PYTHON_USEDEP}] )
 "
diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest
index 2fa47a46e4fa..96922b1f5982 100644
--- a/x11-misc/wbar/Manifest
+++ b/x11-misc/wbar/Manifest
@@ -1,4 +1,3 @@
-AUX wbar-2.3.3-cfg.patch 176 BLAKE2B ce95f2eb9787e5f342cbdf7a943612cc066ba09038efd15f7c60258c59dfafd5377c9706c5db8690af69dda555333d54ae176368934062787dd1114d00a1ce5c SHA512 2c5035c41130eade51e90b36588915ea46201678f46ef580f61a33cde2aaadc640cd1626ef3aba4695f43f13f304e5d2e9fedee1c69f07d2bb49655edecd4c71
 AUX wbar-2.3.3-desktopfile.patch 1797 BLAKE2B bf87427e36821aadce543fef960ed235530bbd92ebfc12e1e158102ea3b7a76d7acc2bb20d9d6433babcda3ca15aa8dfca2b7cbfc15b45b5e956550374c3a18e SHA512 16689b27fd2d810d67afca43552822b1a4a70b75b1703e983f767bb7f3a4acb1a4782cb44d56c5ce128fce15589da721083f254732ba702fe5ed4ed813bbbfbf
 AUX wbar-2.3.3-nowerror.patch 181 BLAKE2B b014234207a378f516e738ed14808860b8b2fd426a86e466fd06383ca3e5e1ab8b538864929204fa8d5cc4b525539a018a31cf392075bbe4afb911ba7de023a5 SHA512 6dc28969c9e7be4f9e5e72362f4312882d3aecf2a878a9b1c45f018f1f7707d7b714a5e5b9c1199123fe9295e7c4780068570489b5d3185c8374d8c3b6b0ad28
 AUX wbar-2.3.3-test.patch 145 BLAKE2B 8fd715fabb88ae0e2295d4c38d7e8803cae1631df0838a0e06be82293c1b9cbf4e38360036dd33fec7217658d938cd2a35afcbc535ddabe267b68646ac67af94 SHA512 507b47f25fb13658b677572ebcc995be36a510a7e380d73d6a4ae4f3b74a3564b510b79edf9cedb21a4206053f9f212740fdaf4152ccd4adcf6750620cb21c39
@@ -7,6 +6,5 @@ AUX wbar-2.3.4-c++11.patch 1559 BLAKE2B 9b0233ccd33621043504e456307815f2647dc67f
 AUX wbar-2.3.4-completion.patch 283 BLAKE2B aecc682099788283e42208edd5b4860c8e4be06d9a5776d39086ef7802532d3c77adaf65dbb2eb597d9e9deffb40a41bf8ca2e406973d2316810394b0bd34605 SHA512 dadc31f136b2e85efd19a25698499810de0d6e9dde873d89c50a18e84f4b158f3570c63885270b09541eb89574375ed2c6e630b28b627b5383f23bab5f94d1eb
 AUX wbar-2.3.4-gtk.patch 677 BLAKE2B 6ed51fda1f98b07f5f86acd8a10ce00d4f330210e7ac4aaf1ac5e388dcc1213bfb8f5be6d78eb0d85115ba05dc125f34f1992b46a69ea755dd803c5ae4ab1136 SHA512 f8a0c29e9e4536d9fe60ff350fff73f362e109e04f205cf33383ef4c461102f844c5e43b336fef7631e727c286321c6130d297b40af85b79ea1229286463ed25
 DIST wbar-2.3.4.tgz 189999 BLAKE2B 6c06ae634f276efea336568f38220e40073f6525eb942f9825629fcccf763e119955507e7fb6f12f5501e9072e6b2bf3ba8ac58505ecf8fceb0ef6c4095c6ec2 SHA512 07f3484bd071761d57ef1172c56b30980eef9ce2ee65d1fc21ea20c631a1da1d88c1b8a9e1a1fca0e5f18e7bf1c5697c349a543d72966ce71ff53d7e921147b3
-EBUILD wbar-2.3.4-r2.ebuild 1248 BLAKE2B 9c9eecdb315184d1ffb1e528cac20d24f04c5b8f87ec53c7abe2e6bdfab4166d68e45982d547555491dfabb336b659c5c75475e608999a75bfcc3a7c5af91ac2 SHA512 2bbf0e8c6233e724da9820ad2b4ce8f86f7431b5ca25a8dba4f47ec9bfb5c7b49a0de483901f37fcc4f5e0d30ec365cd03cdcf61da68a0a0031f8a7d7b3b2137
-EBUILD wbar-2.3.4-r3.ebuild 1133 BLAKE2B d9aef4b0947c12d7390ef7cd0a17830771cc054b01ab724e28d6561745c22f35093d413fcdb9ea48ed36d379b8a0aaca6f9be28953d403df916053ff14a8faff SHA512 8a5b2811b68acab0de6293beaf0fe150fe2aa83cb4c18f911502d814b2b835c5ad0971a20027e10208e523bccfff0aa13aa3b94d4f33a61a13668610c0a5b730
+EBUILD wbar-2.3.4-r3.ebuild 1131 BLAKE2B 18a0f55ec512f4604bc6705f083213a3ecf13f52ed1f52e60a9ca20635d94cdca7e04e744cf7ca0a0c06142cd80a239438fd53ab661dbd1a7be2300894cc77af SHA512 b587126294ce184a627a202d0ac6e5187f34aa240fa33f0eb512c075cd75c3e632e5e3a8aaaf062d5dd446a9a97a113750331134087898b6bcb9c35774e799ea
 MISC metadata.xml 481 BLAKE2B 6161d8af7bc35f0e741236c79cc71813e7a308d71db65022a1dd35e69f32b70627eee0a2c61f43cbcada132bf19202d299d8a31d9300a02713f40375aa6b7932 SHA512 05a8903618ab4022768e4eec18f1e89a64a99049b135565bfe921d376ba24c1b6081e6afc50cca90109050364c79e09050372a478c2ac1e200fce0c8216b357b
diff --git a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
deleted file mode 100644
index 5d64909d28b2..000000000000
--- a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/wbar.cfg.in
-+++ b/etc/wbar.cfg.in
-@@ -2,8 +2,3 @@
- c: @PACKAGE_NAME@ @DEFAULT_ARGV@
- t: none
- 
--i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png
--c: wbar-config
--t: Config
--
--
diff --git a/x11-misc/wbar/wbar-2.3.4-r2.ebuild b/x11-misc/wbar/wbar-2.3.4-r2.ebuild
deleted file mode 100644
index d5e6928b2a88..000000000000
--- a/x11-misc/wbar/wbar-2.3.4-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools bash-completion-r1 eutils
-
-DESCRIPTION="A fast, lightweight quick launch bar"
-HOMEPAGE="https://github.com/rodolf0/wbar"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="media-libs/imlib2[X]
-	x11-libs/libX11
-	gtk? ( gnome-base/libglade
-		media-libs/freetype:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch
-
-	epatch \
-		"${FILESDIR}"/${PN}-2.3.3-desktopfile.patch \
-		"${FILESDIR}"/${PN}-2.3.3-nowerror.patch \
-		"${FILESDIR}"/${PN}-2.3.3-test.patch \
-		"${FILESDIR}"/${P}-automake-1.13.patch \
-		"${FILESDIR}"/${P}-completion.patch
-
-	sed -i \
-		-e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \
-		etc/Makefile.am || die #482358
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gtk wbar-config)
-}
-
-pkg_postinst() {
-	einfo
-	elog "media-libs/imlib2 needs to be compiled with the appropriate useflags"
-	elog "depending on your choice of image files (such as png, jpeg...)"
-	einfo
-}
diff --git a/x11-misc/wbar/wbar-2.3.4-r3.ebuild b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
index f46e060720dc..a8f753750939 100644
--- a/x11-misc/wbar/wbar-2.3.4-r3.ebuild
+++ b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="gtk"
 RDEPEND="
diff --git a/x11-misc/xsensors/Manifest b/x11-misc/xsensors/Manifest
index b2be46cf4261..715ce50ec9ac 100644
--- a/x11-misc/xsensors/Manifest
+++ b/x11-misc/xsensors/Manifest
@@ -1,8 +1,5 @@
-AUX xsensors-0.70-gtk220.patch 1566 BLAKE2B a36a31d4a7810d77d5ee3d451936a111204570863c253d7a6afdd7d058b87ea58efa494a048f32b29cb152b30025a1f23d5bad18d0a14ee481ee909f373b692a SHA512 24196915ebde6264a5ec364539ede4827459a87e675dff3e187a556d4adb24ee0efb41db49fe2ae0c94e5ab467eb3caff205df28d30c15c8bca9f78641324199
 AUX xsensors-0.80-Werror.patch 470 BLAKE2B 6754c97e1182c696acd47a101b27889e6efec3e45448d7b19802ba0f2e0fcce35df26dfc517a10ee631bbe36f3ef948cfccb98f102085ca97981e8c61a779131 SHA512 b069009cb470ac224d74669fb8b92dbaa090d18e780eb820599cb413da89fae1f271b831900de15bbe5c209f6b667ab5dd3b9868e14dafa278b1d3319380ddad
 AUX xsensors-0.80-gtk220.patch 1205 BLAKE2B ae7b2d77ae0083ec60971f2b56b5d0a67ed6ac0f5c76dada91ce9f3a6e53eda026292d2c33b8a636966fb11f3c13a1ac5b150ec60e25a38d460499d43c2805e0 SHA512 3d1a8b9042df478b2af69a94f7682aca15826ae8464396e16372aabb1674b9e483c83d19e6f2412baaebc4811a80a2fd5a8cf78575969dceae1bc20e5fa8eb10
-DIST xsensors-0.70.tar.gz 115430 BLAKE2B af18fa723a9e6b84df62d0ea0397d7b30ab800816b84449f91357aa75d99944796ae8164171bd217118dd93ef713d286fe435354614baef7947f3f851b368df9 SHA512 34f038b192f3cecb2e7587e19c4837b795a2705e6d0e9ea2bd3ead6d3259a1dded364fcfc70fa5e37d64f32c879e1dd9c6e43dcf32fa9aeb73ee5cc49bf290a4
 DIST xsensors-0.80.tar.gz 214763 BLAKE2B 7be4c0ef0f59e7c8c8b32b7e132acb906c9ab64e6e0f63a3316691eef8dd2f8b659d4e40d2213cf580cc4874bcba2fefad4f6a759bf349e18ebef12a99c91128 SHA512 e1ac7107b978bf9b392b0ecb13e49f49c8efebb228a9c6781a519b128f467d0346d35632646f20a036fdc34ea3ee86440c7be5a3285d922f8afbf051e9cfdcc8
-EBUILD xsensors-0.70-r1.ebuild 696 BLAKE2B f8301d03329e2339b23679b11bd6a0752e1b30bb67da54b54caba8089893d07f3ff09081a455fbc9aca70734e62a0e76c0776cfb7dfde4079027ae2f41f3e3e0 SHA512 eeead03d0ca6b8216097301b7af41b655a2d081fc8e32c91d25c0d3fdaa6ef20db5e293b1ddc618f5ee4c474ae3f26087da6f420e431dadf7a5793fa44ef00f5
-EBUILD xsensors-0.80.ebuild 754 BLAKE2B 7c879799e61d4f74161679eb8456e5aa78434c5f45f3971a659ca6cd99d8343b0e53d17c8c2377e8a8f89cc5342489d6d6021cb7c4801d51c05e89aee0ced33b SHA512 f86ddf38ec70b361a4a21c5ec3c0fec5cb24d272fd68b2cb2c53cafbbccdc6a77aee8e2932caf735031c791ab02dd1d62042b7ce0e80539b22ac5dfebface8ae
+EBUILD xsensors-0.80.ebuild 751 BLAKE2B e1f36243bc0af781622a7eb7a72a341d3a9fbc700752e14191583c023f1f3d1758901745266f397613a7d17d5ec603e3f5c80ca5e80fc53a23bae4635515a924 SHA512 744d5e11be024716c39d86d44e7f893cb8b80aa94c9b91b63e79706b8c7cb82c62d9eb66df82319e7c46b1e5f9df6c8f9731b62839ca96a85496e507039759b5
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch b/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch
deleted file mode 100644
index 2f36cfba514c..000000000000
--- a/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/gui.c
-+++ b/src/gui.c
-@@ -84,7 +84,7 @@
-     while ( *digit ) {
-         get_pm_location( *digit, &x, &y, &w );
-         gdk_draw_drawable( widget->window,
--                           widget->style->fg_gc[ GTK_WIDGET_STATE
-+                           widget->style->fg_gc[ gtk_widget_get_state
-                            (widget) ], theme, x, y + highLow,
-                            pos, 0, w, 30 );
-         pos += w;
-@@ -121,7 +121,7 @@
- 
-             /* Display RPM */
-             gdk_draw_drawable( widget->window, 
--                               widget->style->fg_gc[ GTK_WIDGET_STATE 
-+                               widget->style->fg_gc[ gtk_widget_get_state 
-                                (widget) ], theme, 0, 120 + highLow, 
-                                90, 0, 57, 30 );
-             break;
-@@ -142,7 +142,7 @@
-             else
-                 x = 57;
-             gdk_draw_drawable( widget->window, 
--                             widget->style->fg_gc[ GTK_WIDGET_STATE 
-+                             widget->style->fg_gc[ gtk_widget_get_state 
-                              (widget) ], theme, x, 60 + highLow, 
-                              96, 0, 57, 30 );
-             
-@@ -158,7 +158,7 @@
- 
-             /* Display V */
-             gdk_draw_drawable( widget->window, 
--                             widget->style->fg_gc[ GTK_WIDGET_STATE 
-+                             widget->style->fg_gc[ gtk_widget_get_state 
-                              (widget) ], theme, 114, 60 + highLow, 
-                              96, 0, 57, 30 );
- 
diff --git a/x11-misc/xsensors/xsensors-0.70-r1.ebuild b/x11-misc/xsensors/xsensors-0.70-r1.ebuild
deleted file mode 100644
index 38fde9b5deb9..000000000000
--- a/x11-misc/xsensors/xsensors-0.70-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A hardware health information viewer, interface to lm-sensors"
-HOMEPAGE="https://www.linuxhardware.org/xsensors/"
-SRC_URI="https://www.linuxhardware.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="x11-libs/gtk+:2
-	>=sys-apps/lm-sensors-3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-gtk220.patch )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/-DG.*_DISABLE_DEPRECATED/d' \
-		-e 's:-Werror:-Wall:' \
-		src/Makefile.am configure.in || die
-
-	mv configure.{in,ac} || die #426262
-
-	eautoreconf
-}
diff --git a/x11-misc/xsensors/xsensors-0.80.ebuild b/x11-misc/xsensors/xsensors-0.80.ebuild
index 6ae9a5fc3e68..0c913f588eec 100644
--- a/x11-misc/xsensors/xsensors-0.80.ebuild
+++ b/x11-misc/xsensors/xsensors-0.80.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Mystro256/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	>=sys-apps/lm-sensors-3
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index 0b713d13c6a0..0e7dc025de5e 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -1,7 +1,5 @@
-DIST xorg-server_1.18.4-2.diff.gz 189089 BLAKE2B fa5270bb760a60fe0234a630afd55eb091a6637c696f26ba82427d8e305dbf634966c4ee5b230bab0205b48b490f810dd9838e4c26c5f11f0a7f5ed16732c904 SHA512 d76e2471a29a1fdc7a65aeb724f1d449ab58e9380acb7c0811d8d3d9962618205943b50c7a684bfc6b6432afe2521ae98356662a5437c78e7e3dd075d872248c
-DIST xorg-server_1.19.3-2.diff.gz 139662 BLAKE2B b88708c4358a121a6f7bd099b15711b10fd9b08c163fd12e9340c83234746ab47da695f40cf35f7b91caac1480c64364ade46b9753cdace9594c4591646bae3e SHA512 6e030aa132da920092e8b0ed9b414ec883878b84106964ba002e086f9beec821be0cd7a54f5647ca5c54b09198123d6210b8d5620e3fd68369b59cf818be4f85
+DIST xorg-server_1.20.10-2.diff.gz 152303 BLAKE2B beb1d07e86378a62bad956990ee210375c3cfa0135acd51e2756c0ddc2933d13092e400a53909a72755b3c1dfb31faa32a137c7ff719fdb8dcc23f11cca72e05 SHA512 c19e16764720b79df53b8032947ca64bb4ca0b9c380d4c2e3317c37b6fa2937815de01e82019ec93921919690c0a5ae1b59bf1fae189d8f7e9e80fb4860fd713
 DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
-EBUILD xvfb-run-1.18.4_p2.ebuild 773 BLAKE2B f43e286a6a376a355c527990a3600eadb7ca7078ee4e9942aa43f8b6c4679e4fccf7521914065bbc77538a5ff18e64081acfa1367919e2920d414c13b6c6225e SHA512 078d5ce6b8a52c4917c61cfc287caac0400e6db5e44b6df8c67455330e400e3cfce0fd0cd497e7c2d5081ad19076c1ce38191b6668f64bc492a663cb3c9aae4e
-EBUILD xvfb-run-1.19.3_p2.ebuild 743 BLAKE2B 9bc489339913c6139369aacb2898c8f4d4f2e987283dd70029705d28942b88ae2e011ac08bfdf72603fcb98e907869edd5a9cd145f92205ad0fdf38e8555a12b SHA512 9cf5be301ecd7fb6aec136deb9fab6e595fa0bdc1dd7392a1c654675f341056e33c9d4118a4e8dc88955ed12f865a8e3c602bf948ab6b013183dd21f48d2a311
+EBUILD xvfb-run-1.20.10_p2.ebuild 757 BLAKE2B 480f78fea0fb293e3656ac40a94833c37cacb294c8dbeaddd6629e3c2ccc329b6f47277926d7435b41c35a33eadafb59bdda731ec006fa93465fd9c7c772f397 SHA512 7948f90a2716af559e6c8028898454dae4d4419e337163ba962e24a72f6d2fed11288a39cee3e0fdd921e1fcdf6ee57072646aa9dee56c2f7ee38a0c301cc5d3
 EBUILD xvfb-run-1.20.8_p2.ebuild 755 BLAKE2B b2e7dd470ff90c72d40a64f77f85de998f97c451cb6bde49d4ef00cd3d5a3dd211d6639f5beb4c0e1a728dba2cac6cb25542c4916a900fb41f1c9bce78b2d4c7 SHA512 07594ffef5bffc8c3eab48a278048e87ff3507480d28a927fb8e54ff25161f2e48f99e1717442a2206407ebfad50756359c2122565e2f26a296ad05881931ae4
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild
deleted file mode 100644
index 3a1d8f874660..000000000000
--- a/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN=xorg-server
-MY_PV=${PV/_p/-}
-DESCRIPTION="Run a command in a virtual X server environment"
-HOMEPAGE="https://packages.debian.org/sid/xvfb"
-SRC_URI="http://snapshot.debian.org/archive/debian/20160906T162237Z/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-util/patchutils"
-RDEPEND="x11-apps/xauth
-	x11-base/xorg-server[xvfb]"
-
-S="${WORKDIR}"/
-
-src_prepare() {
-	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
-	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
-}
-
-src_install() {
-	doman ${PN}.1
-	dobin ${PN}
-}
diff --git a/x11-misc/xvfb-run/xvfb-run-1.19.3_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.10_p2.ebuild
index e0b3fcee16fd..8e246007a204 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.19.3_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.10_p2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 MY_PN=xorg-server
 MY_PV=${PV/_p/-}
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 493d630efc15..7c74623ebe6f 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,8 +1,10 @@
 DIST xwallpaper-0.6.2.tar.xz 82600 BLAKE2B 2e2b1121fcc2481c4a1e3c78e357534b9609b4435c4364f22dbed78ee0de7c671d2044403c22d22b494a9c89efd17d843f32b296c863df3c0f5d7b3673ae361f SHA512 3713038ffe8fe1da117dc64db6e3c8642fe663473d1e9078963890fa08f21af6ace60e08773e23e6025fcf2116563e24c76d07a66ba02537b38aafa9ac99f395
 DIST xwallpaper-0.6.4.tar.xz 82752 BLAKE2B e81a1a9ec56ffe0a1953f1186c945c9ebb143ff683b8c0c01b819506b79520738935d04725420a24b38119221cbb71d9a5562bffd03e03736c65ba7e3c6a1713 SHA512 531910957c44f7e5ce7357fa46737967f673aeca53868012211eb91507f78bd028f8d84fcbee6e1237107816a09f8247cd0445c0907b60792ff5d07416630d56
 DIST xwallpaper-0.6.5.tar.xz 82696 BLAKE2B 8c12bcce2a2eeb9580038b172b51284cc9fa851f01bef34e7cfeb13ccc05879f5443ef0b7fd39a4f0d5abcc399ec614db28f6f6db6847505855128348fd22d4b SHA512 99c911c6a4f7501101d85532cfb9956fa4affb57f7836e9216e5e0d873ed34c9e7d0a9983def442a4728a682a3351268905e22174dc9a14d003dc36c42ed9615
+DIST xwallpaper-0.6.6.tar.xz 85368 BLAKE2B fcb0861d4cecbafc980208b3d2a174b9931a93cd8110b6f2c38eddae19e890295ce5d6d75dc4f09924279a2b0463234f4efdb4dda758ed14ed728abfec6b9bf3 SHA512 e37055b9adfa6950fb423228ff880afaa03dbdf2a7ced6ab1e110dbf4813f68aae3c9147668ebd20665b582bea195470c39b6948cd36879afe54d61c90b6f8d9
 EBUILD xwallpaper-0.6.2-r1.ebuild 1023 BLAKE2B e285ddbab7b2fec704a7eff51e7b3a26eebd6c5e2c4721fcc8aa61ded8cfe20c54891930d4d53e36280c2a2e911cd9511bcae7b6d4f2430a4b0547f63bb1c7dd SHA512 810271ad0ce334df6adf60d69949f8a0e16b66753d872dd82190c66c97b7b37a98643b90ede10949a86086cf72e28ce36756cbcda5af9c90471b97056884a619
 EBUILD xwallpaper-0.6.4.ebuild 957 BLAKE2B 4b98ca3eeeb452114cac1659db79ce06013706d2640eafbe9232a6850f9b5782ccc0ffc96d9e014d8ae01e0583bb8370601d24ba93b57df8611ed3b30395d821 SHA512 20d58283aea3edc79637a5715db014d9002b5acce8351688bfb0cfe00612795498589c6aa09e1849a38abd9e581ace669e861a1d4f8e1da1d93b91050e6efcec
 EBUILD xwallpaper-0.6.5.ebuild 957 BLAKE2B 4b98ca3eeeb452114cac1659db79ce06013706d2640eafbe9232a6850f9b5782ccc0ffc96d9e014d8ae01e0583bb8370601d24ba93b57df8611ed3b30395d821 SHA512 20d58283aea3edc79637a5715db014d9002b5acce8351688bfb0cfe00612795498589c6aa09e1849a38abd9e581ace669e861a1d4f8e1da1d93b91050e6efcec
-EBUILD xwallpaper-9999.ebuild 957 BLAKE2B 4b98ca3eeeb452114cac1659db79ce06013706d2640eafbe9232a6850f9b5782ccc0ffc96d9e014d8ae01e0583bb8370601d24ba93b57df8611ed3b30395d821 SHA512 20d58283aea3edc79637a5715db014d9002b5acce8351688bfb0cfe00612795498589c6aa09e1849a38abd9e581ace669e861a1d4f8e1da1d93b91050e6efcec
+EBUILD xwallpaper-0.6.6.ebuild 957 BLAKE2B 96e16c2ed2eb70fd0014adcefaaa5d8f24a4062730b46de2550334516d246b2156c7c4bd4fc7e4d1aed5ce1afe8979998faa43883773357f33a0e2869b2c1e9e SHA512 8fd6054a3e737b4c67c85c746b5ef16bc9970672821de6abddfbf0b62874b24f54a33d0a8d5f4bc09a4b5a6d94fae4eb24bb08f9db3815e345e68e3115857ba5
+EBUILD xwallpaper-9999.ebuild 957 BLAKE2B 96e16c2ed2eb70fd0014adcefaaa5d8f24a4062730b46de2550334516d246b2156c7c4bd4fc7e4d1aed5ce1afe8979998faa43883773357f33a0e2869b2c1e9e SHA512 8fd6054a3e737b4c67c85c746b5ef16bc9970672821de6abddfbf0b62874b24f54a33d0a8d5f4bc09a4b5a6d94fae4eb24bb08f9db3815e345e68e3115857ba5
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild
new file mode 100644
index 000000000000..ce50a5f57642
--- /dev/null
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Wallpaper setting utility for X"
+HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
+else
+	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="jpeg png seccomp xpm"
+
+RDEPEND="
+	x11-libs/pixman
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	xpm? ( x11-libs/libXpm )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+src_configure() {
+	local myconf=(
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with seccomp)
+		$(use_with xpm)
+		--with-randr
+	)
+	econf "${myconf[@]}"
+}
diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index 2b1e1615823f..ce50a5f57642 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.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
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 86f2ef8cf500..fea76960e243 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -3,8 +3,10 @@ DIST zim-0.73.1.tar.gz 2615382 BLAKE2B 055857b20dbdebc1e5d8d6b13c344fcf665d9889f
 DIST zim-0.73.2.tar.gz 2611490 BLAKE2B 05fd020b3add3ac9c6fd860ca002a5c0755a1a1f1ee07c6e5027e16e3b8c64d9116971e96ed235b249b65b9097551b9fcdf46ed929a03a877c36a02a7d54e8fd SHA512 26c987906759436063f88863e90cf2643996913a2fae12ebc4ae623731ad97d488d37ad70e72153aba7aaac7fe2dff9bb6f9f06c4d899a0ac20e3bfbd20ff3db
 DIST zim-0.73.3.tar.gz 2648597 BLAKE2B c3709fc418317bfbd355f3715e5fceb346026393bfaec65ca8713fb2cd33243189dc3328b4be20b08452545704d4d1196f99f96df9445aaed5d0277b310d37f0 SHA512 880839495e3aa434267ac02abe2c1779c8cb3c9c7b73de91a19e962e7face2cd05399871789d719d89d0776d09fb9b339370f4fac8e4019be538e282accbe180
 DIST zim-0.73.4.tar.gz 2648686 BLAKE2B 47ac293494fb61808c80afccbc7b97c5539ceed050abdfd84048b5d0a6dd0667f8f23e1fd9cbd06aa77f8895787da76c3297e041e435ac45d0b5874fd8054fc4 SHA512 8205335e07d99ab340af4f75a429aeb3114446cc9ae2ccfbced4eb95b723c26b5d8c8624e94c5b38373a9368cf058c03f160a36730feb37d9c00abcd61b6d147
+DIST zim-0.73.5.tar.gz 2702734 BLAKE2B 494dbe8ac0cbb46c15655cdf56bc25010591bd00faec94608ccd9fa7cec01385c6756480e5a3f37b50f44984ed69d30f33570ca913dab7ede2b89a4bf0cc4016 SHA512 f2c335d4697e7d0535b2abb200af45b7d753f2964e94a35c2ec8d4fb8deae0842aef086e09430a50d4ff5ecee89eb1f6f881a0b430877209e4a8d83ee046c4f9
 EBUILD zim-0.73.1.ebuild 2002 BLAKE2B b971044002f24335c7f3daf11968169b09afdecac11ea83b4523f10e1251e6315806862903edfc2c5e2f6856a6d401764ee1cf4ef9d6e79de0ca137f27dbf9dd SHA512 dd386c113cb04feef79e9c00ba5c362789fac4639fffb14b6075b19f78bc81736ba74229407084bfb0f1558fcc1b8069e99b1a02af1800fdf3725a2c70e65ca6
 EBUILD zim-0.73.2.ebuild 2004 BLAKE2B d6478af537b4a15014f485eda1244ebcc8731ea2cc25b674982a393fab6772694722dd4049a04d9f59a41df128d7c26d669b0a94e0eefd9e05a98f9484f0daf7 SHA512 76ffbc31bae087720a1a4dea30d0d38b5e377e4bba1fff7a42df28c4652ba76421012ff0ba82f22fc4573654d7f7c4d876ffd05d68a3972ca06d3e857380b8e4
 EBUILD zim-0.73.3.ebuild 2004 BLAKE2B d6478af537b4a15014f485eda1244ebcc8731ea2cc25b674982a393fab6772694722dd4049a04d9f59a41df128d7c26d669b0a94e0eefd9e05a98f9484f0daf7 SHA512 76ffbc31bae087720a1a4dea30d0d38b5e377e4bba1fff7a42df28c4652ba76421012ff0ba82f22fc4573654d7f7c4d876ffd05d68a3972ca06d3e857380b8e4
 EBUILD zim-0.73.4.ebuild 1836 BLAKE2B 48ba230f3107c73756959d990fa50760a274bd6041aefd635a1e71176598532ccf2cc031ddbd7184c1fabe8eb023be97f84533e0dbc1d50e0a468948e314d106 SHA512 4e1b01089107eb7bd13cb5c55245d7b8eed655428c2e92afa49b3bbdb494222931c4b4a29c09e7ce465e4bd49616a0a44ceecb171b9273e44ada685bf24478f2
+EBUILD zim-0.73.5.ebuild 1836 BLAKE2B 8b948039c8c348d0e03e4ad5dfbd6f8753f52afd6624651cf696781235468c7ee787a5d1761f7491ef791abd0a3cc62677861826fe6e82dfb9db44152050b96b SHA512 8c99951b620ec4553010355733b52b1b4b4635ca7fc035b130fc529f95865492a50ade1994485872b41ef95808590455b97f5a22251ed00f8239cc5eb43ececd
 MISC metadata.xml 804 BLAKE2B 3b238d0a00d1ff9edc20e2b65b06aefa6b324e71c70e545372e3d05fb4020a67a2be45ade5065439f7974eaea6fa25ae8d65addc9e940d5c3762f7bd4c6ea1d1 SHA512 95e103028935e95fdb0d3ab00c1695db0f82a6f9cb33c0defd298edb50adf69ba5b00194ea2dbc6adb8b2da500fe45d17451e6354b6020ff9a75de837653244e
diff --git a/x11-misc/zim/zim-0.73.5.ebuild b/x11-misc/zim/zim-0.73.5.ebuild
new file mode 100644
index 000000000000..3ddba84025c2
--- /dev/null
+++ b/x11-misc/zim/zim-0.73.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 virtualx xdg
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+	export XDG_RUNTIME_DIR=fakethis
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
commit	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree	c44943ee0563a3fa957716de909fed683117fcb9 /x11-misc
parent	69051588e2f955485fe5d45d45e616bc60a2de57 (diff)