gentoo resync : 30.09.2020

23 files changed, 240 insertions, 580 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 7df0c11e9867..d7a73c095d5e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/evolvotron/Manifest b/x11-misc/evolvotron/Manifest
index 781429a0144f..10a93b7089ce 100644
--- a/x11-misc/evolvotron/Manifest
+++ b/x11-misc/evolvotron/Manifest
@@ -1,4 +1,3 @@
 DIST evolvotron-0.7.1.tar.gz 179516 BLAKE2B b73c813fdf134e0e4c7882e06a12bc06acfb6dcdf4a38043c4c30027bf00da10df85d6877abdbd8ca6393496038ba9fa0c32a16b0f37dd14d72cc63c00a17d1c SHA512 74f48dc0881a82d999ccc910df026da80fcc46a906fe2fbb8edbae50a1fa42a3379087f00dd21fd9e5d69cee7c6fc745b80f8703b1af1ebc3a1cdb52ffbe16e9
-EBUILD evolvotron-0.7.1-r1.ebuild 880 BLAKE2B b22113e22bf41363133673ae7c29e11a74adb1df6c20e7a008a574216db96049e653a1cdc815816063fafc7e24bfbb64d9091aa08d50501dc8a5ea6973d60b51 SHA512 a63a10863fc0b0d501000674cc18a477c9b5da5afc46bbd85c58d38db2de4a5269280e79b9676d5a9c4643a8e0686811713605d04320d8a3293001ec9ffd8b11
-EBUILD evolvotron-0.7.1.ebuild 932 BLAKE2B c4d20a71a4ca313e7fb8550aa89c6abd4d151cf5d27e4d704fcd9cf6a42f542b3b7b749006893ed5dad8f181c6c2102f5232be199d3f1f88d958a2c21b977f02 SHA512 1a47ee7de6fecee8922509898eb752b969cf29200fc74d133d53720c9c519031bdce0ef63d5ad2a99c82868598fb64145bd0dff8d8791b0080b76f6eccb92bf2
+EBUILD evolvotron-0.7.1-r1.ebuild 878 BLAKE2B 534a03152a5e38b5aa90c7db36c5b29d4ee65853656d87f0311b2a7afe2b7114ca0caba518d2f8da6b05ff2e60155930382b13d360b35255918905820eb88c6a SHA512 72d8245cdd4f378ab0a4412996dc2dd2384d6f18ba63b872f2530e83c63eabced18e3d989652a493054e36c033576948d15825a66d4977e875a1a55bd16843df
 MISC metadata.xml 356 BLAKE2B bcffe50af78659801374955b8bb13970760d0d565c89a210d2ee98059078df0bbd5634e95f2cbc9e922e8b29f21cacb7b6339b6004ac4619b21706b7da85be14 SHA512 7cea09fe7cfe3d43572ab13f83921cd252cb4a12bfc9fb4e2629cbd96c90a07fef8613090514ad562ee112960f88bdcbbe18daa185470780bd714e95aa6bfb47
diff --git a/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
index c8f3df726e12..2cfacb68a556 100644
--- a/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-libs/boost:=
diff --git a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
deleted file mode 100644
index 62f289f61def..000000000000
--- a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qmake-utils
-
-DESCRIPTION="Generative art image evolver"
-HOMEPAGE="
-	http://www.bottlenose.net/share/evolvotron/index.htm
-	https://sourceforge.net/projects/evolvotron/
-"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-DOCS=(
-	BUGS NEWS README TODO USAGE
-)
-HTML_DOCS=(
-	evolvotron.html
-)
-S=${WORKDIR}/${PN}
-
-src_configure() {
-	eqmake5 main.pro
-}
-
-src_compile() {
-	local etsubdir
-	for etsubdir in \
-		libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate
-		do
-		emake sub-${etsubdir}
-	done
-}
-
-src_install() {
-	local bin
-	for bin in ${PN}{,_mutate,_render}; do
-		dobin ${bin}/${bin}
-	done
-	doman man/man1/*
-	einstalldocs
-}
diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest
index 398a6229a81a..eaa3f4d3f7e6 100644
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -1,3 +1,5 @@
 DIST gpaste-3.20.3.tar.gz 157869 BLAKE2B 02b52b8023c875bd3c651cc5864603812f0cfd49cfac774ee4e27eae63c66e46f34d5128b717af514cc1c57fb93a775ff01f827210bd7cfa5e9ab5de9a87fd07 SHA512 08b7c52d16e630ac57e4d583ae985763b536728ef9997ce5ecc8a8ffb9be8745e1e5aed9003a4ab522ba76a276855c6a095fef7a73b4f4d80b54c7a9c3e6e9d1
+DIST gpaste-3.36.3.tar.gz 186352 BLAKE2B b00af3f32076bbeb4f06853a7892772901d0c72dd972d08fff0520afae388bed0c9eee81892a2492f4bb972b3a80a924519e1c137edb660fa5f9dfa2fab31856 SHA512 e5fe4a31367e96089aefd1af5ed0a3ad591eee009bbc74b1b33c9c736061831979d79f2d6a5c072cf55fc6f1982ade581fe73d2039c5dbd607081683860c7b9f
 EBUILD gpaste-3.20.3.ebuild 1462 BLAKE2B 4c08db2d5cf05e824dd0e380b817a439d3b807daf5f6f800b33a3b5a996dd6c76b645eca63e018b1a9a1681c7a80b7e0da17fe45deeb34df3d64c1e658dedf25 SHA512 1579bc767610f4acb79fb6657a5723bc81a59713ab2251ff5e90bbbf11facd4ed992c06f9f817d154d382ab75e3e25c849ed676d42cd646095f8629f3479ec12
+EBUILD gpaste-3.36.3.ebuild 1663 BLAKE2B 86ead7cb8147cb3aa16f295d260a645f96b367a2e528c394208a019532b8ff362a99e342411c943ef071e0aad53f8673b1d72ce37208d1cd833a59c8639cec4c SHA512 da84e0add550cec51df0b45d983e8ae5d7491dc3fa77eab25efc4c09e60cce67713bac488997a7036e7f1627213b3c1b2501460744076c82d37059cd42ac8c6d
 MISC metadata.xml 404 BLAKE2B b3bee2faf7f5e7ebaa212dcf5926437b55877bd5d9a3988db09c78411f8f24eb4c60db56ca4ea021c064ede1079f33598e096f8e1e793abef0a5c0aef27b0e82 SHA512 fbd89391c9bf83754466bd2d2dc590d819292eb1e2aa29d3c66e22c32c599ad0ccbeef93ad706326c4aa0665c5ca4448cedf5485694ae076a1b3794e5f33b999
diff --git a/x11-misc/gpaste/gpaste-3.36.3.ebuild b/x11-misc/gpaste/gpaste-3.36.3.ebuild
new file mode 100644
index 000000000000..c80647c39d7f
--- /dev/null
+++ b/x11-misc/gpaste/gpaste-3.36.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION="0.30"
+VALA_USE_DEPEND="vapigen"
+
+inherit meson vala gnome2-utils
+
+DESCRIPTION="Clipboard management system"
+HOMEPAGE="https://github.com/Keruspe/GPaste"
+SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gnome +introspection systemd vala"
+REQUIRED_USE="
+	gnome? ( introspection )
+	vala? ( introspection )
+"
+
+DEPEND="
+	dev-libs/appstream-glib
+	>=dev-libs/glib-2.48:2
+	sys-apps/dbus
+	>=x11-libs/gdk-pixbuf-2.34:2
+	>=x11-libs/gtk+-3.20:3
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/pango
+	gnome? (
+		>=x11-wm/mutter-3.36
+	)
+	introspection? (
+		dev-libs/gjs
+		>=dev-libs/gobject-introspection-1.48.0
+		>=x11-wm/mutter-3.36[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	gnome? (
+		gnome-base/gnome-control-center:2
+	)
+	systemd? (
+		sys-apps/systemd
+	)
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${DEPEND}
+	gnome? (
+		gnome-base/gnome-control-center:2
+		gnome-base/gnome-shell
+	)
+	systemd? (
+		sys-apps/systemd
+	)
+"
+
+S="${WORKDIR}/GPaste-${PV}"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use systemd systemd)
+		-Dbash-completion=true
+		-Dzsh-completion=true
+		-Dx-keybinder=true
+		-Dcontrol-center-keybindings-dir=$(usex gnome '' \
+		'/usr/share/gnome-control-center/keybindings')
+		$(meson_use introspection introspection)
+		$(meson_use vala vapi)
+		$(meson_use gnome gnome-shell)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest
index ec9333bdd6a7..553bc7bd7bd6 100644
--- a/x11-misc/gxmessage/Manifest
+++ b/x11-misc/gxmessage/Manifest
@@ -1,7 +1,5 @@
-DIST gxmessage-2.20.3.tar.gz 274110 BLAKE2B 9863e680b1d23ba3d69c35e2de826106f1078f585c0be36d1ad51946abbeef8637bc2f872f9fee20738c978146adebfbe47548de48be6b12b92c314ed93d9c32 SHA512 8f677d0ee899c88a40c912ba68b59ba9a21a0ae21db467c64756daea41fbf2a7fb566e26c74e72f89e6009b1e8029af9bd5748f92099f681346399fe7e9d8e27
 DIST gxmessage-2.20.4.tar.gz 274356 BLAKE2B f3325f870e63429934514d2e1bf3debd2827591e776c43213aae84543623484f912b61f7541e37622a28b1e4dfd5044f0b85e664cae2cb8610b3f77c32a9f4be SHA512 43891fc44d9125921150f9330c7ebafd9086866bde27a635ef0f6b30f2d2fa49b01dcd9a6bf65d6dcdec11de07748993057871c77387f51894c150550e3c160f
 DIST gxmessage-3.4.3.tar.gz 275354 BLAKE2B 2801944c3a6542d250f91388a90736ba781013e5c370e42783db620387a07b315b176bac60e30af6e623d4f664291fdf567786e66a1f9e8c383dc772a64547e6 SHA512 4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a
-EBUILD gxmessage-2.20.3.ebuild 841 BLAKE2B 26fde7e4dbc1b331f9cae6775ac56b4261e4deade272bb43441372ee982605c61a1d41ea9bbcd2070a857c1f467a0213fb55a6cd6ff9252893e9bd99f351818e SHA512 320cf1739969fc9c5d82c5c40892a99706ee0b94fed71df842f6465b904d785fc7cfe351e915f533e3169461e087e6198faa31e188e9ed7499774c0a0aeba82a
 EBUILD gxmessage-2.20.4.ebuild 672 BLAKE2B 344b10d688a284f7dd9e3d5deb38604b4430382661191a267c76186848fba6ce30f0d8a1e8d02281ef5e6dc3ea45663c74dc634a7125bb8aeb52f53e0099fe7f SHA512 6ec50529591320c38091991fa9f8f30ed7f5ad02339b85e84e81d52ffe7785cf11018dc355d65a4944048e8fac0d220f0e8acb09848a504fc15f383e26a849d9
 EBUILD gxmessage-3.4.3.ebuild 867 BLAKE2B f8b771ad4cd8490bbd3bcb6ebd8a19847bf8c57a80c25ef40e5df2a9e08958aaa3be06dc2597bfa6436e971bba042e440a8be97a56c65b958fdbc3fbe53bfcdc SHA512 e35a84714028debd44d59ce5e54305a90a556d12af2dcfd5257b7a3b4081e02331d79ced5029c9e179148f2f207f3edbd49f85fc6ff9eb32458a0b9966c59a3f
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild b/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
deleted file mode 100644
index 3de3cbc42142..000000000000
--- a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils
-
-DESCRIPTION="A GTK+ based xmessage clone"
-HOMEPAGE="https://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
-
-LICENSE="GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.20:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc examples/*
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index 743d12112cac..c08cc87f02cc 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,4 +1,6 @@
 AUX org.freedesktop.Notifications.service 94 BLAKE2B 1a97aac2db9c803c9e4babf9067283b564a1eecb1d251aee3a5e66b8a4f63d2554e3e09ea06749383ce3d5b8e77c8cc3bd87ae2dde48ae8feb4886ecaf7a3c27 SHA512 0575cbfc094455c0a2f04faa534a5e0d9cc41e6d9566ab9bcb0fcbce99e142213ded786ad00c36dc434ae1b9208d34d234a341dfc86adb72925dad0ee2b25f97
 DIST mate-notification-daemon-1.24.0.tar.xz 392588 BLAKE2B 480272848b3403d34eaa1f555a573dbf74a4e8e45e76c4726943bda4c29d7002f00d1a828e318d51dd07a44df1c64902c38bbe41c1c14339e8cb8710f7008f36 SHA512 0fd2da98001c60672d4833e974ac74dd561f54ca6f3fd74f8d6620e3b28768add46dd891d7446b01426b6aed09d4966d902cbde45aac3498fdcbb837e531a147
+DIST mate-notification-daemon-1.24.1.tar.xz 395444 BLAKE2B dca166664216c7027b2e816c7df64636c3f1c7ae25db253167f9c5d1b296cd9bf3c7533e1f7a33a7d4f2bf5fe074e8f0911462463fffa5b839fd8decd62a4716 SHA512 7c799e31229860cb34fa4a19421360a4a93d81826bc4381ed284e1ec280bae67d2f5bdf5d751f3dad6a1da424a5c598b2def60b7b24fd6ea41da5f126f456bac
 EBUILD mate-notification-daemon-1.24.0.ebuild 1028 BLAKE2B 628a6b16802acc6b15febaaa876d4ef6f7fd053e2d2bc3930c4658c13d72dc460f585db90865594179c359551774b1bcf800fea2e72b0235663abb4530075d0e SHA512 df275daceeb8e1d5ee36f37f3c7007710a69540ca4d528c93a28eea494e087510cd64c6753cf7cecfc1a008b9512033f676922ac00480474d0f39ccc88c6e1b8
+EBUILD mate-notification-daemon-1.24.1.ebuild 994 BLAKE2B 1f168864632ef98659fa44f1079cab355fef086169c70664b6ce5367f36114dbda78c3dd7085b92b20dbf10be7b5c654e758417bdc454afa05227542c19566a0 SHA512 8a80b2ee8af7927e740a5b857f74319b087a1a8e77c977bea44db10b63de1da4a12f40ef4ed408fedaae8ed016a59351200bf6391e0344fa49f686f0747945e9
 MISC metadata.xml 353 BLAKE2B 774bcae8807bbb16a1ee8bc12320e487ec817fb45d3169f4929cbd8c3f7f33a35eb1aad2682e5d87131567c56e6ffe8f2bdbda612c58926ddc3d78b14cb69e53 SHA512 3f46b4bb5e12fdb448e7b7f54db4f4a4683cbdbd89019156601abf80be0333690b65670fb110120cf613dd42ecdfb38b329ddde67fd265257d6ddb32e24bfbbd
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild
new file mode 100644
index 000000000000..b419b74c0364
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE Notification daemon"
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libxml2-2.9.0
+	>=sys-apps/dbus-1
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	virtual/libintl
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3:3
+	>=media-libs/libcanberra-0.4:0[gtk3]
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!x11-misc/notify-osd
+	!x11-misc/qtnotifydaemon
+	!x11-misc/notification-daemon
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig
+"
+
+src_install() {
+	mate_src_install
+
+	insinto /usr/share/dbus-1/services
+	doins "${FILESDIR}/org.freedesktop.Notifications.service"
+}
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 40d991cd3164..0119a9277b00 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,3 +1,4 @@
 DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
+EBUILD mozo-1.24.0-r1.ebuild 1313 BLAKE2B 245b391e83ec524f3a14f772bccd9771d67ee65bb98b39dd085ec3a70c62fc992792e1aaea7d1f7197e797a6421470f3debacca3ccd9bec4e1f7c9e95321af66 SHA512 5099b3d2be89196d4b177c7186a7ed78dc250f9fcf285cba70c62a055e36da3822b045cacc95c5ae78d8fb325a73fe737bfb30b3014dc9478e9a5f96a6880e4c
 EBUILD mozo-1.24.0.ebuild 1311 BLAKE2B 31a5bb689aff98fe1f37caea0a4f856262592214f24621ed6be18fba2563c601e0c41f37e96e2605104f2bae7473135e27bf0a7a7530480cec2eab00ba22cf8a SHA512 d7ffdb97ca09abe2814c244accd3d622fced0e385c1723ac22d925ca97e7b9358382540718cb877996dc7d3108156b9a9fc5c866f34e564eb055202d74e7bb56
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.24.0-r1.ebuild b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
new file mode 100644
index 000000000000..8977a145b152
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_REQ_USE="xml"
+
+inherit mate python-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Mozo menu editor for MATE"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
+	>=mate-base/mate-menus-1.21.0[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	!!x11-misc/mate-menu-editor
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	mate_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir mate_src_configure \
+		--disable-icon-update
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir emake check
+}
+
+src_install() {
+	installing() {
+		mate_src_install
+
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i mozo || die
+
+		python_doscript mozo
+		python_optimize
+	}
+
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 5c4ebbe916bd..b3a74f7d14e7 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,11 +1,5 @@
 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-0.5.0.tar.bz2 330034 BLAKE2B af201d3084716fbac02095140f88a4f8528548005996b18ea9a6ef3022ad9865f5bcc1cb7b8bc75d3e97de61fafc34ac98dd5a85066a52a96e908153b61b040f SHA512 abdc86732afebbbe819db779924b82642fee7d29c005564dc890918849e2af11dbff5ba36e1d089c35318236e5950ac69df7e379fc48e7d696d27facce203b5a
-DIST notification-daemon-3.14.1.tar.xz 280344 BLAKE2B 8e965cd52f97129f8f6116c9e21ffe73213b80f0652b7b00732c1afe3817e57a96c094a2ab8cef1628ef0e941aa90c759ff641d5d9fb3e5be8d4c8c26f27678a SHA512 977d028206d6a2005d346f697af5790b404f56399c451774037db25e37724f0cfbd558ae413c9ada40d2d7f399c1911392b19194e8fd093de74f65a6783ccc05
-DIST notification-daemon-3.18.2.tar.xz 329196 BLAKE2B cc4b00474ea20435fa412c1c27a95614baea06bfc00bf09c25b539e44ec8c41621eb7903a9245407e23a2a098290160d970e66dfe9cabc3bdf1ce3663a418f06 SHA512 962d84eb1970451d12d07027d4ee6843a96dc42c7d954dcb79bac55cd9918dcc84a2903b4ee032a0fd8f25d269e5e965a1deaab3da34b4181ea304df2adbae3c
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
-EBUILD notification-daemon-0.5.0.ebuild 964 BLAKE2B 05fad23b9462530039899511e68da49574b623314fc3a8baebeb280b551d96cb6f1b7a2a2858abef469acbf55075ecd7362719ac48a057df6bd9c9650a40778c SHA512 b3c775edcb7a25140cf76ceb3d52b0d57a6288201a841c7297365675f1a866f566917818d58b03caea549267e6b3888f620573712cbd5f9ed7e087f872c0b41c
-EBUILD notification-daemon-3.14.1.ebuild 961 BLAKE2B bda9b278350e7e3ccb3add0187011c29824732e835bafc5a5dd39978d46b01d5f38c18c72e1aa45e2f9a57f5c96d9b77c20b077c4624100428f8664c54d35c90 SHA512 83cc2f4e61790432e8d27722da4ac99ce29182440e1ecfa1d64b768fec9658f03bdadf342c01ea22bfd95be2c6e64fa1b9f293eb903b22be7e733d9defc8300f
-EBUILD notification-daemon-3.18.2.ebuild 933 BLAKE2B ebfa325b308ea42f7c3249265726cb13d4476b93f0d7f4e410a9163a5ff519578a9e1173343c2a50a8f82e651738a9b06a1d0b17be2111970754ec1e41ba87c0 SHA512 46a1a4f00896a331beff2a9b42720cff8a6cc9a1b21c727dec9af0463c0fca034668a7d1f8f04523d7a27adf96bac38f067c84e14fccbcc224af5703f4869b3e
 EBUILD notification-daemon-3.20.0.ebuild 933 BLAKE2B 6b6723c0fb6eb6d0bb651cf89391044caec710a62c646ce14c449dfadba8bac667260ab134ac3441e908fe66061db130e3a7a35f76cbb48ed56ad35258d7d58e SHA512 5ede8f81fb46b783f0d2f323d95724db34405bc5b9339afd36faea803453bd3b76c47c09b8c8525dd821637d1069572f645593c50d18c4e4b266166a7eac373a
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
deleted file mode 100644
index 807ee0da169f..000000000000
--- a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-GNOME_TARBALL_SUFFIX=bz2
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Notification daemon"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.18:2
-	>=gnome-base/gconf-2
-	>=dev-libs/dbus-glib-0.100
-	>=sys-apps/dbus-1
-	>=media-libs/libcanberra-0.4[gtk]
-	x11-libs/libnotify
-	x11-libs/libwnck:1
-	x11-libs/libX11
-	!x11-misc/notify-osd
-	!x11-misc/qtnotifydaemon"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-libnotify-0.7.patch \
-		"${FILESDIR}"/${P}-underlinking.patch
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
deleted file mode 100644
index 5fe49103da47..000000000000
--- a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnome.org
-
-DESCRIPTION="Notification daemon"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.28
-	>=x11-libs/gtk+-3.8:3
-	sys-apps/dbus
-	media-libs/libcanberra[gtk3]
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	!x11-misc/notify-osd
-	!x11-misc/qtnotifydaemon
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS )
-
-src_install() {
-	default
-
-	cat <<-EOF > "${T}"/org.freedesktop.Notifications.service
-	[D-BUS Service]
-	Name=org.freedesktop.Notifications
-	Exec=/usr/libexec/notification-daemon
-	EOF
-
-	insinto /usr/share/dbus-1/services
-	doins "${T}"/org.freedesktop.Notifications.service
-}
diff --git a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
deleted file mode 100644
index 15fde45bfb77..000000000000
--- a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnome.org
-
-DESCRIPTION="Notification daemon"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.15.2:3[X]
-	sys-apps/dbus
-	x11-libs/libX11
-	!x11-misc/notify-osd
-	!x11-misc/qtnotifydaemon
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS )
-
-src_install() {
-	default
-
-	cat <<-EOF > "${T}"/org.freedesktop.Notifications.service
-	[D-BUS Service]
-	Name=org.freedesktop.Notifications
-	Exec=/usr/libexec/notification-daemon
-	EOF
-
-	insinto /usr/share/dbus-1/services
-	doins "${T}"/org.freedesktop.Notifications.service
-}
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index f8a497be6a62..cac32f0383e6 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -2,20 +2,15 @@ AUX xlockmore-5.46-freetype261.patch 561 BLAKE2B f5fde1a8984784a2892363b85413728
 AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd176616c531aa71ff5d051169165f991dd8a586685b5a0b8e1a66b0da247a441fd7a56ecd24cc39bd58f2267e8b SHA512 4eef79a2b791401433ae0c6e55179975f88b74c4e57cd64ca81df48a232723e5edaccbd7045c9f67ba81ba159e70257d5e070ea59808f52430ac08539ea91087
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
 AUX xlockmore-5.64_alpha0-LDFLAGS.patch 906 BLAKE2B 477e2fa3b3e74ef3bcb93d0f87f82f05f05dbd0b8fe395a2be3540986df74acff7650dcaaae84809f2cef9d5da7ff8360cd40e261328d2f404b58338e7353b13 SHA512 ae42b30b37eeccbf767e6e44a557611ae8bd549778b1b4671355d0cd4c3fbb195c23a6b3dfac7b4aa2563cfba86ddbafa791bc3786b9c8c1b84ae057e625e2b5
+AUX xlockmore-5.66_alpha06-rotator.patch 176 BLAKE2B 52115f36e2b40d911570e72fab408d518b3ba3545db9e95b16cf9ed460c80c66b0491b302d8c8752cf487e521d57ecacbf9de00f52785c095eba976291760931 SHA512 db33a41047724dadbe1ab720b5d91289e9795b664e2c032593177d6fc5733c0f004579d568365df42584db96d5ef777e23f6d4630458178a56cf578ae051ccbc
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
-DIST xlockmore-5.62.tar.xz 1943836 BLAKE2B 6ce9b9ad709881a50eba0e32ae1e7524414a5e92e34daeff1ce68b6bb4738117155543d15219723ab514d520064601824a22d438541a699c742ab0c620285c64 SHA512 fc7c63a8ce781ba1a9598b5e3d585cc85051da864dbd59e3232b2fa6b6529743f9244e52bdf588ae438c02a2e1e745eb81b372234189e73ae6698cc962c387c2
-DIST xlockmore-5.63.tar.xz 1944624 BLAKE2B 8ee27c5cc88a7088705b7a017563698fa4bf99418bf3237594a1237547fa1eb9d5274327672f33344e97d2333eca71f95e51f760f0548abef06f8006a97c55c0 SHA512 0b067ced9afe0c5498f0b1e19bf163b0363bbb4bc2bc2007c1c0416328cdc2d528d664b122ef68322c38f2bcc37a15665b31ee6e8ce2369bad9e50528b93a047
-DIST xlockmore-5.64.tar.xz 1944496 BLAKE2B 1b2c0337950bcf7ba094012c70c6c8578523b81a6af6dd68a0373425f87d7da28a770a8f7453019cc1527501a417390f013f43b3da2ddfc7d44380c512f9b4c9 SHA512 4946e8e9f895c0433c09e1cd639389d26020a764d62b08b329ce5d9e5de4bb6438f024639b2068c94f21cb0ebb5a6f94dffff6f606c6c3e2372a5102768e7f39
 DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
-DIST xlockmore-5.66ALPHA00.tar.xz 1944644 BLAKE2B 0b52cc3a5cb77645174084eec3e81838e96a4b5e849955e9090efabb62cb38f477ae3a23664b4dc27bb8b79af62d946b4702244bc3b601ede7097f60de6b0fbd SHA512 7216fc3b034c382ab02d06e22a9e572e3602e4745b2a055a8ee51f6a4c014776ea27b665fe7638719303b9bea3f957a27e1da47e15d5de44c3717136dae82ee2
-DIST xlockmore-5.66ALPHA04.tar.xz 1946880 BLAKE2B a02290052459df4424cca7205a932de603733176323331024514a61682e581706a66a5591f57e6a041eb0e725cbcf04d9641a9d59be4bfbea88d77605973a58b SHA512 2a2b59e733ade48810e85ac0fc58ae2433035db9bfc1653e73359d921a425d7d67156588ce1c428ef756b1604125a151221f64c719c4da20dc0de83fb4d2bc23
 DIST xlockmore-5.66ALPHA05.tar.xz 1945728 BLAKE2B df0d5a8b0122673204c30f416c4bb599476340f0a0a4a80e08efe42c77a5dfa2408d74375dfcf2d68740d0b2c0147faff8ee01fe96e106eeed14fc779bcb3344 SHA512 259a8b2b0e7f487e5bb025a8a6961c38933ae259b3544c66823e09ea2f0fc44e19155bd335870adca653c268dc4811d41570882b021977e4981f0ded36ce3909
+DIST xlockmore-5.66ALPHA06.tar.xz 1947244 BLAKE2B 998d1438bc8ad95c21ebcace2e390936c56fe975331d2a82d10899a00b43fd245fc71c34050459d88fcc47c9b97bc074bd91be432df0a2933db0fd9153091888 SHA512 cd4d47a677b2e00f993b6a32cd2cd98a88fa04dca1d2a62303b58ebe2a4b26b4e4308a5c25883dbe8adade98ae85dbe7b61422ec05579a82b193eecb642b057c
+DIST xlockmore-5.66ALPHA08.tar.xz 1947004 BLAKE2B 44ad1f877d214a8b719db57df8f502391f635a4a9cd12bd470610c27543c4523acd6824cf01cb9bf6ca73628d4bc59bc25dafc436d4ee818d5590ae058a7b02d SHA512 a7bc5ffe09be91a5a903067c1e9cbdd5808207fc2ff0507e9bdfeb4156c187ee00da2a8d790a539b97e26985adb51326e1dcde9cdaa194bab4b8705117dc97ce
 EBUILD xlockmore-5.50.ebuild 2231 BLAKE2B 3accf80283ec7705cfafe4531bc38c1694d9d27381c9aa375bb14a1d59e865dd1c2aa8c99d1cdd26a93fe929b3302ca4646fe93f740feb56c86b70ca9362ed6c SHA512 f0116108dcbae364e4a7c391054890fca090fc182b8bd11c613e84bc91ccb07904e5bd14c515b934e2895c9e6bd2f82762d09719de4e648f6077338e3f05ff97
-EBUILD xlockmore-5.62.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
-EBUILD xlockmore-5.63.ebuild 2284 BLAKE2B 5dfca5003f797a6765b33f14a91664b40559441812611677f392b2291a7e29297c254fb29ec3ea895df6e903f98e5926215b74d2ea0b342527da35eb045cc2f0 SHA512 0ec91c240df64f0a3e6c3c0aa7fbf35bdb889cb4d4cc76825223802cf3dd807067f228980838e1d813214f20ba8269d1cc9df96548dc14d2dca4b2d8ee102671
-EBUILD xlockmore-5.64.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
 EBUILD xlockmore-5.65.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
-EBUILD xlockmore-5.66_alpha00.ebuild 2480 BLAKE2B db28c6af68b0fa419e001dc54dec91d6f5856c5cf2159c1764809f0780fee5a6155a06438880e4a20d2c457332295a7d0830c0e5792bd43f321d901c90b07eef SHA512 4e4bc7c9867f24c9066371c2838ce9e960394717a72fa9b532f4b98ee0e7ad40bd1902669cc1f76c3a5f16742d1b283d5cd0d0722ad6eda30c09aba7efb87b7b
-EBUILD xlockmore-5.66_alpha04.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
 EBUILD xlockmore-5.66_alpha05.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
+EBUILD xlockmore-5.66_alpha06.ebuild 2527 BLAKE2B 12589616ce832d6cb0bbe75372c081169c74904cbc30951bda056c2ac4e6a39d05ad4b8439f895b754331df052a99436a02a22551ece327b06b7a2fc37b3e05b SHA512 243be7ad3ccd304b8d54e4b34bf8065d65d4fbccacb969cfb7400e36c21fda424c9b83f0c127dec4442ffe4e86bb974333be46e453e541a547fa268f53073e4e
+EBUILD xlockmore-5.66_alpha08.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch b/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch
new file mode 100644
index 000000000000..6400ba33fe35
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch
@@ -0,0 +1,13 @@
+--- a/modes/glx/text3d2.cc
++++ b/modes/glx/text3d2.cc
+@@ -83,7 +83,10 @@
+ #endif
+ #endif
+ 
++extern "C"
++{
+ #include "rotator.h"
++}
+ #include "text3d2.h"
+ #include <GL/glu.h>
+ 
diff --git a/x11-misc/xlockmore/xlockmore-5.62.ebuild b/x11-misc/xlockmore/xlockmore-5.62.ebuild
deleted file mode 100644
index 2071d0700818..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.62.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( sys-libs/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	pamd_mimic_system xlock auth
-
-	if use pam; then
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.63.ebuild b/x11-misc/xlockmore/xlockmore-5.63.ebuild
deleted file mode 100644
index 989d6c25d4c0..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.63.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_beta/BETA}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P/_beta/BETA}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( sys-libs/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-)
-S=${WORKDIR}/${P/_beta/BETA}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	pamd_mimic_system xlock auth
-
-	if use pam; then
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.64.ebuild b/x11-misc/xlockmore/xlockmore-5.64.ebuild
deleted file mode 100644
index 26cf0a2b0721..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.64.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( sys-libs/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	pamd_mimic_system xlock auth
-
-	if use pam; then
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha00.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild
index 5fcdba0ea0d5..46cad1c85f0e 100644
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha00.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.47-CXX.patch
 	"${FILESDIR}"/${PN}-5.47-strip.patch
 	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-5.66_alpha06-rotator.patch
 )
 S=${WORKDIR}/${P/_alpha/ALPHA}
 
@@ -60,7 +61,7 @@ src_prepare() {
 	sed -i \
 		-e '/XLOCKLIBPATHS="-L/d' \
 		-e '/XMLOCKLIBPATHS="-L/d' \
-		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"/'|g' \
+		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
 		configure.ac || die
 
 	eautoreconf
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha04.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha08.ebuild
index 2bb52c63b8ed..2bb52c63b8ed 100644
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha04.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha08.ebuild