gentoo resync : 14.05.2020

14 files changed, 45 insertions, 295 deletions

diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 4c8c3ba82dd7..83feb7dc31b5 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index c35cc0880837..c3e741842a1d 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-clipman-plugin-1.4.3.tar.bz2 492784 BLAKE2B f52dc92976e0b826b7aab2b8a3b9e099bb31e3d670911608d7a39c9805b011bb4c77db1fb01379e3244682a4bcefba617e246cc9ade50ecd275ea554d928385f SHA512 28bc8e2be8dd3eac13a7988b68933ce84dd8cc756f0a19636cd5850d6e36714a73ad9650a28ebfc54d9ad3adb23c242abf89806124b4e00fe7d1701be1b52414
 DIST xfce4-clipman-plugin-1.4.4.tar.bz2 460114 BLAKE2B c3a6d8a9a3f36367bddf3803b86dc4bd5bf2dff94d675695caf95010c563b96b69ce4015d83568e9500f8f5d579f41ef8c5ce94804ecd58baa04f7cc9aa54f16 SHA512 4cb798faab4efdc7a5013cffd06ce527efbda4ba5b96063734d261a864f22075a2d6dd1f79a33c8bdfb39ceea8f89af3daac023aaed8a5a386c70604e8a77965
 DIST xfce4-clipman-plugin-1.6.1.tar.bz2 471364 BLAKE2B cd037db1920aabde5f661401b9adbb81041e72688b431407c19865c10f3c61e41bbc034ff218461b108965b1d294ebd603be500dec7741687ddc0cdeeec69a6c SHA512 2a2aa5d7b5d841b11c6d54d4872fc8cbfb83981b2d4678075ff5aa2a4df9ea88de95b837bf3896d7ce5f434827ebb64238e68cca2e17a7104433ed5847d949dd
-EBUILD xfce4-clipman-plugin-1.4.3.ebuild 1084 BLAKE2B f8a4e2f86f7ba9cf3fec923f99b65a2c729c39d4e8163701aaf388e0fdc475f4ed8fb1238e436f96b625baa265896a3b97679d5a72589564c9d738d369b41a2b SHA512 beac46d153686f0099d5bd50c40d880bd4f1c0aa3a80e1eb7d29eae367269acf90d65fdecdaf85a9dcd885824dae0f5a4f8ddd979c35313ab5e31714896e49c7
 EBUILD xfce4-clipman-plugin-1.4.4.ebuild 1084 BLAKE2B 3a4e8a513764a9ece7cb859b735820b0ae8d08574fc5afe7ae073077e961368cf37168abb1ed4167427164a837f1b9c0fcf4a1c66e7d6871a6d1772afe9ffa21 SHA512 1889a640e83eb92d2f98a5062087608b77c187f021f32302f227a350b5b73051d42556bdca52ee1a8b2e1927fbd0e971aa9686e4bfd54f6511c54932dd3cfe98
 EBUILD xfce4-clipman-plugin-1.6.1.ebuild 1089 BLAKE2B 7df5c2140f9d281bacf349345556303975ff7dc09f3bc82afbb62bd45a5f1cd81388930bb67fd272c60d9d7fbaa646d429ca80556310ad0efe34d5d825a0f0d7 SHA512 e6fe757b4f57f890ddc6a0779a6ae4ff7a46f2fd7112fa73ebe1056f9c54d228fcdf9c4f76f61100c815bef0adfe60afbd12637fab7887c3d19302703727d679
 MISC metadata.xml 344 BLAKE2B 2e5b2202a94c14c0b873c18bdbb7f02250049dbf45f23b82d44b2cb9fce79e7519a3fbc5f324b3c34f700ecf2314d051551283a5941ce16ff113b28f28852c3f SHA512 13ca7f9858f2eae8eaa1a4a43e371ab5b29433e1ac99ebe33d9678b7c3133d8e1639e146a93b6b4b1039278814d413d29e575a1a2784bbce0fcb50525e106065
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.3.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.3.ebuild
deleted file mode 100644
index 3bffeef7840f..000000000000
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A clipboard manager plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="qrcode"
-
-RDEPEND=">=dev-libs/glib-2.32:2=
-	>=x11-libs/gtk+-3.14:3=
-	x11-libs/libXtst:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.10:=
-	qrcode? ( >=media-gfx/qrencode-3.3.0:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	local myconf=(
-		$(use_enable qrcode libqrencode)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index e760a09dec31..a35ee40f7c98 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-notifyd-0.4.4-r1.tar.bz2 536304 BLAKE2B bde62a773f7a702338e07fad8483d57576edb4c046b709c8644c17697ea73b72e46b8b4e2737d02bf23a554cbcac7c9725d7f19ee9f1ea511efb0943280f1b60 SHA512 546a5063673e36ef26bcdac624bfcef41a14918dbb496fb3d282613334f173b51669184b6bcfbee0f07a17863620898be2f464e487ca9755abe7285d6a43d8d5
 DIST xfce4-notifyd-0.6.0-r1.tar.bz2 539371 BLAKE2B aed910e3a547b29b2efb96ec5b5ab03bc3b73269dc7928018be194025d46abaa18bc2d0a879cd797b18167717b2a1f354f1a49f64e9bfc77dd2be51e06090978 SHA512 31f7977cb4639c90d806e8eaa94c00c19bacf1c9d5df2bc1d66ed791e446ed0ecf6bc59ec402994b1eeab5432dc20cffe67fbb267e86b1848fc2206aa4eaf10c
+DIST xfce4-notifyd-0.6.1-r1.tar.bz2 539209 BLAKE2B 58dedc9091b1a2f5f58c4f095596f266056ef6ad735460617b6821192d2310024b27f08767c5fc7700a250c471cc77d3a0cd2655fda65e0d1ba489380d3e0ecb SHA512 d48752cd4e02e515e4c5d147b7bce678a56f47f0bd336e3b9db4e14fc2b0355e0582816957fc43c313a5779b5495c836ee5da4f0cb83616a0164d692a169415f
 EBUILD xfce4-notifyd-0.4.4.ebuild 915 BLAKE2B 58384c17773fe32dbebf460d821d1104c6844979aab6d5fc789637ce4e98faa586c19376f7cdd4748bdc9757f44e30bd2c0652496e8832376d4fdd031c108d1c SHA512 734fe242b9bfcb52264f58986ad913b762cfd4f55cea8f5472a80a8935ed4edbccbddc753bd16f5ac3514bc2682341abd9618b8e089dd7ac2d44b37a22ddf6de
 EBUILD xfce4-notifyd-0.6.0.ebuild 917 BLAKE2B 82593c174c396ac084e2b8d611c78cef251242fdd72265b7763b4d9bedfe6f3c06e0dcbb69a0d36b0c1a5a8edbafa8905b19d8a5fdee47b9e5d7b9ac5d0d254a SHA512 20a89f9f4d4ffab6221184c95776b08d765e6e81f7051f114786136146b38c1240aa7cb441e12cb882c953224bd08fd42523f92f3b10753ee77523da169f9e42
+EBUILD xfce4-notifyd-0.6.1.ebuild 917 BLAKE2B 82593c174c396ac084e2b8d611c78cef251242fdd72265b7763b4d9bedfe6f3c06e0dcbb69a0d36b0c1a5a8edbafa8905b19d8a5fdee47b9e5d7b9ac5d0d254a SHA512 20a89f9f4d4ffab6221184c95776b08d765e6e81f7051f114786136146b38c1240aa7cb441e12cb882c953224bd08fd42523f92f3b10753ee77523da169f9e42
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.1.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.1.ebuild
new file mode 100644
index 000000000000..6d7684102cf5
--- /dev/null
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Notification daemon for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-notifyd"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2 -> ${P}-r1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.42:2=
+	>=x11-libs/gtk+-3.14:3=
+	>=x11-libs/libnotify-0.7:=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.12:=
+	>=xfce-base/xfconf-4.10:="
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 5e9d3e8686a1..463ce8608c13 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-power-manager-1.6.5.tar.bz2 1205473 BLAKE2B 64d3aa04ccb11b7b541b9ec8c3dd4544c66f8e7de626c5395cd10ea1e0004d7f3e941d9357941b73aec3997ed9935f04540d2c04ca1e6ac271baa80732de0f72 SHA512 ebcf9ba7431518fdafa74f49511200e16093c34f78516e823a2f7ac02a085a08377efe5f9c6fe285f3d1e2de253789404e01b34a48e3f5ff23c2c143b2801207
 DIST xfce4-power-manager-1.6.6.tar.bz2 1227814 BLAKE2B c5f9ca3ff1f7bbed8c534cbba43355a62734b6e1553f852740fe332545df910ecba07be249365f9815b2467226d67a41cdb740e99d4f547ee86abf2d014211f6 SHA512 c9377619df9ebab64ed234659e5798f47448e26fae5b19eb15bcbc9416df1afec6b4de32bc272b81531d2643a215ea46892523077017dc6b232bfe802dba6cd9
 DIST xfce4-power-manager-1.7.0.tar.bz2 1235629 BLAKE2B bf6bd6c3ebfc86d199362168788b3d9b1ca2cd691a93a2cbab04415d7e68e11a3b1cb36328e8a974e504eb00282e584cc497ea4f7dcddb20e6854d06bef5ec7d SHA512 30c6c37ce278d869b73880bc33d04115086646850c8fc9129e4fbeb71b36d4bb7ce7ee1758ea804b42b3736ec6632f7bcd8e7806a00421e0e24ac8433e34ac24
-EBUILD xfce4-power-manager-1.6.5.ebuild 1399 BLAKE2B f88ea3eaddb102895859ce512eb394597e1728736fa80204a273bee13fa0a6743de02fa322ce5010223d80eef6123d79554c85423933eab4ccf311372c578494 SHA512 09da812510afe6af3f2281334a4906d59d1032c7421b2dff082a09bdc644003f454847b16b0e0f6d21720a366c68cc435831106fd51ef6b9708fe29f015a471c
 EBUILD xfce4-power-manager-1.6.6.ebuild 1399 BLAKE2B f88ea3eaddb102895859ce512eb394597e1728736fa80204a273bee13fa0a6743de02fa322ce5010223d80eef6123d79554c85423933eab4ccf311372c578494 SHA512 09da812510afe6af3f2281334a4906d59d1032c7421b2dff082a09bdc644003f454847b16b0e0f6d21720a366c68cc435831106fd51ef6b9708fe29f015a471c
 EBUILD xfce4-power-manager-1.7.0.ebuild 1404 BLAKE2B f7a9e297c9aa03bb85a0d75ce59417e49b61dee8d5d2c1b0cf81f2ddda06e29df051c6fd61848819520a41a3f7e6a74286870960a57fbaeaa31e68d1eecb8bcf SHA512 b9179e69a7e80dd730cc9039c7e08992a4aa200669b00eb939320ac6b650f76fde531d3ab6a1a5d2f0d01e096b11adeb7dde93f2e4510dce9ce99a836c037eb9
 MISC metadata.xml 360 BLAKE2B 74fb48a2ee62745a873e6c21670385e6f1108b6ae215e7ce6abb0f735a30559ee8cd5214bcdaaeca0a9a6b2372f1551ee7deea9018108a3f11a01c0497ec0f88 SHA512 bca73ff003a0d3845fc354775332c0edd0558ff5bcf27c562cc8c4f96e95210f197698d76b0ea898aa6ff4a12e5e22a589b62d28e196e679d4046e56f66ea744
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.5.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.5.ebuild
deleted file mode 100644
index 4b9aa22bbe90..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE="kernel_linux networkmanager +panel-plugin policykit"
-
-COMMON_DEPEND=">=dev-libs/glib-2.42
-	>=sys-power/upower-0.99.0
-	sys-power/pm-utils
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libXext
-	x11-libs/libXtst
-	>=xfce-base/xfconf-4.12:=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
-	policykit? ( >=sys-auth/polkit-0.112 )"
-RDEPEND="${COMMON_DEPEND}
-	networkmanager? ( net-misc/networkmanager )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable panel-plugin xfce4panel)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 2ff6ae04538c..a1b52d4a43a7 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,7 +1,5 @@
 DIST xfce4-screensaver-0.1.10.tar.bz2 665624 BLAKE2B 9af4a821bcbb461462cf620dbd2c064a32b904f0d6887095cd00939f857244d69612e18559c0cf0be93e9044047d0e3dba8c756acc16fe9e3e136a718beb3942 SHA512 a04842697c7a8f84ee937f0371b3d1413163b59d1a54b9adf0b904dd501d6328ab645160567ff79afbe063cc113a488567ec5d8df4d6ed2db354738275c00b2e
 DIST xfce4-screensaver-0.1.8.tar.bz2 593968 BLAKE2B 693fe6e057bc1f5f1abff67c8a0a99244d5c270ab9c9afd7945f21b6eeb2bea027448d1485dea9a9f912b5f231211878a92a882bac56f28696557e44215ce283 SHA512 4cb76272f2f94f5e265a86d3fa58de8da6167da013466a4dd2a08a2e94fafe14816ce6c5a1e635a8c07e91497ede0650c014d21b0bbac666b8a72bc5f4645f69
-DIST xfce4-screensaver-0.1.9.tar.bz2 665025 BLAKE2B 290fc9cc81a19971cebd2876c767c04f1e010ed4282c9ccae8d2f615230f8fdb65fffbfb0ec7526cd5e23c7e1450565e6d23c108d23e6f2fd29c94ee4d6fc873 SHA512 ff2a967ebb62a5290405e1070ea064dba18e4a4062c2b2d990a23f44a6f730e0c56a98eac5ba86a166e5a8f67388333b0be695e2e59318abd76e8b6c3765d8eb
-EBUILD xfce4-screensaver-0.1.10.ebuild 1724 BLAKE2B 34115c26110250587fe347c4a837c1c761737e97685121b6af6eba40998038890323e8eb66dd98b7507a63808a9fee0afa960743d09880af9ca106c0935bf90b SHA512 02b7f4e6cb39a4bbb28adc8a221c9db0c170becb2e8d6e089ba04cc18c938be4b70411d51fa39e5eb97291f5a1788b4c7ed2bdf098ace7e0b31791156a5a511f
+EBUILD xfce4-screensaver-0.1.10.ebuild 1722 BLAKE2B 09ddd1731f79cf51e01888c2fc686fdb4e83ee49b3f9f17e566eac3096baf3e08946d19f5479b244c75d2cd0dbd2695178b7ee8035fb136a8dd5af7c7e2a81f7 SHA512 2bf42c1ed2d1a21ead341be63c0311f3f063a201d56317a0e6db5bc1c616f340b89faf599a8feb2b643370fb591e7e03645ecdd2f31fa9427014d4cf8525e322
 EBUILD xfce4-screensaver-0.1.8.ebuild 1722 BLAKE2B 70065cd642c22986718d33bae0ed0f97b08c43d71490e8c7fc6924e6d7d1b9339bbb5eedfe52926c84f3eeb585ce6d08710881a020afa456da70dfd3fe5ea988 SHA512 fae41f934f7ac0bcaedb326b813ab12def44df1cd39fb1fdd9e01fa0db41d0e2231759b74fc263ec5c2228198f19372ae9d60ebc1c54cc42d6d8637a2397a8b0
-EBUILD xfce4-screensaver-0.1.9.ebuild 1724 BLAKE2B 34115c26110250587fe347c4a837c1c761737e97685121b6af6eba40998038890323e8eb66dd98b7507a63808a9fee0afa960743d09880af9ca106c0935bf90b SHA512 02b7f4e6cb39a4bbb28adc8a221c9db0c170becb2e8d6e089ba04cc18c938be4b70411d51fa39e5eb97291f5a1788b4c7ed2bdf098ace7e0b31791156a5a511f
 MISC metadata.xml 350 BLAKE2B ac551b0c67875b795ea6640c67d2a5968a7c7ad19cb12c0103a900fbca8adde364eb32110d92150b677d1fb8089fdd35dfb7cee6fc40d30633a663191d77321d SHA512 88f3dbe07292eae938727232450e5b6a2b7b54766dc095541e6afa451d1261bc0a657467a90f0815c7a3cc4db11cf667cbc5e41f7ba3cefa6354630019fd1742
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
index 22482ef51e2e..53db08eb6cd7 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
 IUSE="consolekit elogind +locking opengl pam systemd"
 
 # Xrandr: optional but automagic
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.9.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.9.ebuild
deleted file mode 100644
index 22482ef51e2e..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="consolekit elogind +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	>=dev-libs/dbus-glib-0.30
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libwnck-3.20:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86vm:=
-	>=x11-libs/libXrandr-1.3:=
-	>=x11-libs/libxklavier-5.2:=
-	>=xfce-base/garcon-0.5.0:=
-	>=xfce-base/libxfce4ui-4.12.1:=
-	>=xfce-base/libxfce4util-4.12.1:=
-	>=xfce-base/xfconf-4.12.1:=
-	consolekit? ( sys-auth/consolekit )
-	elogind? ( sys-auth/elogind )
-	locking? (
-		pam? ( sys-libs/pam )
-	)
-	opengl? ( virtual/opengl )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/dbus
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# disable docbook for now
-		ac_cv_path_XMLTO=no
-
-		# xscreensaver dirs autodetection doesn't seem to work
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
-
-		$(use_with opengl libgl)
-		$(use_enable locking)
-		$(use_enable pam)
-		$(use_with consolekit console-kit)
-		$(use_with elogind)
-		$(use_with systemd)
-	)
-
-	if use pam; then
-		myconf+=( --with-pam-auth-type=system )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index 41de2c2b2d17..ea86ff98d2fe 100644
--- a/xfce-extra/xfce4-weather-plugin/Manifest
+++ b/xfce-extra/xfce4-weather-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-weather-plugin-0.10.0.tar.bz2 3032575 BLAKE2B 2dc81c8d60ab63ff9adb90d53a5eb89e98c3e4b950d8b5943fb2b39b4944164470d7e10dcd096ef90665129d1aa59e052b3140d1462077a285afde4bcdcba047 SHA512 168a850c60f419f40f6c05dbedf24a4f3aea3be04e14c5eb2596a03a8dee5850a80d06b63bee54690b63385109d53ccf8ff2b97a2c879e196046308436a7d126
 DIST xfce4-weather-plugin-0.10.1.tar.bz2 3026945 BLAKE2B 511427d430b696983855687db12ef8877eabc6a0e2518f511e9f90286b08fcf8b52da10bf6ba7b435c069d5018b653c2c7703e8b9ec3f858251ad9c949acb760 SHA512 14fd17da60b0ac76dd0f8e1b7858e8cef57c5168b7467412e1d45ae91e44858c7619cdca2ee59e242d2888038d458faa7580bf02d1cad3371ec80acc9012f569
-EBUILD xfce4-weather-plugin-0.10.0.ebuild 1062 BLAKE2B 7c51d989685b949069e93314bdbae3af2076835ba213942f99643d775b3a1168dd3f2800822bdb70c5defd45d77cccf9acc5be0d8a4a679cfb48d5eec78e51dd SHA512 80f4f33393aab8cf871781e890a1242abafaed57588b2583c301ba12c03adf4ea2e5a0290cdcb4f8d15de8443941c67e539341299588c0a9f3d6957d13bc9944
 EBUILD xfce4-weather-plugin-0.10.1.ebuild 1062 BLAKE2B 905ab5eba1ee544ebab13c6b3e46c2affed4384c6bdcee79ae3cb4cf5e17f71de54a5034a672549c7d76f8e33af91ed8479c9aa420c05fc1f82129e72933144f SHA512 28b22cfe8f49b401481137828c0e9c9738bbefb450cee48327459ac0746c151b6a39c47a6addf8cbc79dd2ac78ad43c4150b7ca9690700b440bd22e40b2415b6
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.0.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.0.ebuild
deleted file mode 100644
index 3cffa7ef77b3..000000000000
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A weather plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="upower"
-
-RDEPEND=">=dev-libs/glib-2.42
-	dev-libs/libxml2
-	>=net-libs/libsoup-2.42[ssl]
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.14:=
-	>=xfce-base/libxfce4util-4.14:=
-	>=xfce-base/xfce4-panel-4.14:=
-	upower? ( >=sys-power/upower-0.9.23 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	# For GEONAMES_USERNAME, read README file and ask ssuominen@!
-	local myconf=(
-		$(use_enable upower)
-		GEONAMES_USERNAME=Gentoo
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 1c1f9e0a9003..1c2b3527a869 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-whiskermenu-plugin-2.3.5.tar.bz2 160984 BLAKE2B c4a53ca34ed0eec2de27837c01d52ace334af5cf952b46b7f9f651314eb7f4aad52f5706ca8df7ddcfb4a9c0ed2fe207a138c3cb432306caa38220a6c13aa2fd SHA512 7697a5d41599df8150d4e7ad1c5898b651d196fb1bd1a657efee33206312455f24056edf679592e0a6a78b17b324fd5d93e202ae7cc461ca70df7cd41794bd58
 DIST xfce4-whiskermenu-plugin-2.4.3.tar.bz2 171822 BLAKE2B 3bba151c768e9dbd3eb0904e675c334ba073a6e22a2c216e41df3bf1e6d5e2961cf25650b90dd459f40a10b4b12f4209e1a370e66d71fedc05da110693f039ad SHA512 378f9b1a5ef4ffab079090aeb10b2e571918aadf7dddb051dc30288b325d3f1e6621fe9c2d3db5815b706d63361d77616124a543d0c96e0d1cc06407152e9f32
 DIST xfce4-whiskermenu-plugin-2.4.4.tar.bz2 172157 BLAKE2B 9e5e12448a35e55285a6e291f0c988ce3797f33b0c72aa5b2be54aafdd15463b75dd726a04116aae8b1721adc9cca93188779a428641bda133883034c19d1203 SHA512 2fe27567d301f66de4648f1c3104a2ecb90c3b25672d5babcde69507559628a3a74b14d1526ff70dd75d64f7d056c8baae645f5a9291bf8c5e30a1a8258721ba
-EBUILD xfce4-whiskermenu-plugin-2.3.5.ebuild 874 BLAKE2B 5cb115b533044ffecaeb09444f46adb0346601afc71b9abed9cb5681148767f805e369371e5b7cafecb3a1536d0d272a175b5961ca53428a597482068140dd58 SHA512 8c79b718309dd0a3c48347b8343148b48ad7f429dd6f5602c4619623fd3c303d1d1782f1eec1a994294e5d096f7c5d4eefb137c51a8b304322da75b9fd41a227
 EBUILD xfce4-whiskermenu-plugin-2.4.3.ebuild 912 BLAKE2B 39351df830906b03e875dac589a024c170cd98ddea6a70edd117f2117de4e53e87c0d0a44dd520f18bb72ef5cf83da2bd02cf039669ace9eb61778f34b8b34cd SHA512 0e32852278940ab88839f69be7191867561f80864a0ab4ac410b3c4ed6a8e2eff21bdfa39355eabb16b4c13c11806a78bc19d0ca9c8206ac2338c6be55c355c7
 EBUILD xfce4-whiskermenu-plugin-2.4.4.ebuild 914 BLAKE2B dbe2088a5b1b3d60feda2c38fd8b86a0ca720ad3b1caf04bc9d06cd295f6ffbee534fb3e517e4b052662e469055f4cddbd04fb2f25fd399be439ab62df6c9866 SHA512 d44b9e619188fe17919c5b8788f6b345decdb85ca3534ce68310db96cb08c42f7d395b2bd1d2145a6d106be7b0c4edb01acdcb3ed015e22cf77aa0ac0ab03bef
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild
deleted file mode 100644
index 08a62d270871..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl
-	x11-libs/gtk+:3
-	xfce-base/exo:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}