Sync with portage [Mon May 31 09:26:00 MSK 2021].

3 years ago · f8d30a4ee5
parent dd247d0d02
commit f8d30a4ee5
864 changed files with 1619 additions and 24007 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29311 BLAKE2B 4aad93ee61ba87f1e5e8cc4f264cd542ef3fec04cbbe8356a8f03f39d9161eac7c8e876fbe9a3196db09679266cf56e00925abef29a5f7ee258c761e9ea8548b SHA512 88f33adf25441fea9eeeb80a2721574b412ddd21f773a95238c7d257ba0adbbac2307a36b31bd53f48c75400ad9a47ba9547032c9bfd178440978cdfa77bcf1a
-TIMESTAMP 2021-05-30T20:39:02Z
+MANIFEST Manifest.files.gz 29282 BLAKE2B d867413e067fe88adb170374031366ce678e7558c947b4ef519cf10591a68a8a210961ba93ac9b960a6cc08256be3b1e2357366a4d6f299e55ebdf2b954db993 SHA512 6c02c81fc6edff0b758f0bd03bf600b2c3b096c993a736f4aae179392768a74aeac3b5d4d390f1dd1c81bdb6c46a40108345c8f9ff82edf7b90598e0cbd4ea02
+TIMESTAMP 2021-05-31T05:39:00Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmCz9+ZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmC0dnRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDqLQ/8C9YkD3tr8bDjLlt8oMbh75xOz9Z4Mbala/HfOiAMxvDZpkMQcaOax5Et
-Nuu45Z0ttUUjsxYmMLzwmngrcEJi1DIDUvXGMyQUoW2s/wyYZJJKnYqLukytH8qs
-89huz8+timttmjtlRj0X5ED8AjL7zX1em5q/f7zYjo3UBrkPU3coHWAOocarfzgl
-/Qfq4O7d++P2YLXWmWRcsENJfq/Vl7JQ/+UR+Wp+ce+NsqDJPlPNZ2Mu8XjFF3Rd
-qi2WjI+R+QgIVbbMPW+D48aQLmrL4VQwmTJ9QjSkIgzeTtvI19Gk0OWyv6C2lJyF
-bIU5tHlgW4c1ZiVUbuD3+BK+C3cYDbpdOMBx9CASKTHqqq6L+kF0MMAZOILzebep
-WZN8/mAhgB9Rx3RfJHzJMD/VQ3Pc7zeOJu67v7k71e4KMCZcplYy7UK3UfYuRbtu
-1ufrPZRrGvDrJr83L2YgRX9Aqo0YiQ+FnuW0LXBOhoEvO6QZazw3M+UVYr1edWPt
-HmGutg7Zq4Dp6GgI53k/lINn7Cy8YnN/J6viK4qlH4AK13yyOSS3NV7kRd+CzCuI
-epbkIYDGgtQWl6yNV/3CJvws9RzqKvlGD49g0eGv6Gs/cmfFx8Jm7D/3EF98RYpf
-S0i2GNzboZ+cQeM0B2Y1KgN1Gq+eLOjzQqm90zI1/8f+ruWvpw0=
-=xEsD
+klATLA//b1eFrUUWkJwxbUUDhjedzD0D/nvNsLLyBr7AmjVS0xo6KSU+deZwznWw
+BXmCsrozeWDIlgVQMHN95R0Wguj2C7Ezrjso33juVhGRnQfIqVqHi30KatRu20ym
+rjF3qKV75PhDH9j0n8bqGrVZoXkYPjJICZD3e/JID9fK8fcZBO12SGnvsltP0Zqj
+R9+BzlmevfTkRgmId2OXpgYKUwRZNW7+5e6A8h4fPsRBb4aYMdj0s/LiV2EyXnUu
+lbHoyVtWv6lJjFwiMqK1+p3QRYzrOogDoMR2regeDkg8pmKssjokVmmWFvFcG2Rz
+dcaYgkhVjuwoSZHRcBO5WBcHsLf35kIWM3wcR541LiYjVv/SPbENR4rNBm1cSXU
+gh6BB1gKSP+cDgfNjA8sz7J9DYiTdMVU9pwvN76rb21dknOYMpreslzRngLcsKPX
+UwCv89X0EnDwvoGKDqWliDnhwO8SeQpzTV4Gzi/ExH/QLodMAcVoT2/p5Xi3Y79z
+WBB+wMaCPlFYOB4AQPK6GiR9MOXYaB1oySfSRu4W+RFn32QX3JQS1Z9wqFLYeGXI
+SLpfWDnRKaYEMZn9Egsyh/pV4eQyOOxdlGXw/9gCL7JgIO+G2hwHf8nkchRfeORz
+Yj5KPj13B9t+RTnffrna916JtW85qVj4HDLzmSOyL2Q6RZIBlZg=
+=sze8
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@ -1,8 +1,4 @@
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
-DIST at-spi2-core-2.38.0.tar.xz 190540 BLAKE2B 6c5c479c279285460a5ff80533d600b5173fe9bedacfa1522bc37da4a305b965cec2c677eaae8be809ed1a5fd8aaef6475fd27b80510efd1c530e46368e954af SHA512 3a1eb27cff6e0dd03119b4f8361a3b6037b26c511e80e2d003d1d5c41fede6d49eb5e0ac1ee45cfb4f3ca8e53292a7e2da67df80be28e77014775e41777a96c1
-DIST at-spi2-core-2.40.0.tar.xz 197080 BLAKE2B 56c0ca8138b5178d713851ffb9a9299544a65708a3e5bf37b1e59e515bb30fccffd8b8cc9dea1e78c32a5d1fa3d21de506ef674c5e0ab8067a8ff5df206d349a SHA512 45f9123dac27982003e4c5e357ddaf31dbe945ff334bf1a7d02e81011b841bd69c717233e8b2d33abb6cfe16320bfe5893499f25d9f603cde5d11d63315e8725
 DIST at-spi2-core-2.40.1.tar.xz 197064 BLAKE2B dfa19413e6688678fcc0c0ed76d0fca0d5de5039c9b1e42dc10c9c387c0cbffb3c6a38570f9e74c343fa86310f2c3f6fcf0e311c57d11b5adeac5faf7bdf9630 SHA512 fcb73e78a85db9b982ae10d8c968c7732079832877fa0214c30a04b9e27910448c3f5456b8628ed4a3d4dbd59037c8c206916ad1462ca5c7a44409a702096b14
-EBUILD at-spi2-core-2.38.0.ebuild 1491 BLAKE2B 943a24eeaad62279a2e38379b0c886ebffd39c682c5d357257ae7c25016ed3eeeb46be8ef74f7b4bab3eb7824ba4499563553d660a6e31ab89c6387d0a6d89a8 SHA512 91eb3da057afd7139a09a57b24ab41075f01b72d7900e0a42e61ef325a2054eb6d0bd160417d007e693a3da5e40a20aaa3ccf584b2478677f898bb9b825d4d32
-EBUILD at-spi2-core-2.40.0.ebuild 1498 BLAKE2B ee7a8d002f0f8c3e671a3a2265dc94d25be572f13e9bb8df904b050522f522acbedc60f8d1a4f8edd0a5f8e9f58f15dba2a62ace02f5b50365a1238147ae5e73 SHA512 c62c5849be2fc2fbda8e55631757ebf98431581b1725e3fdd559fc02edd1defff5c27fb002e35e6b38f63f9b76cc6c4279366e5ce3a62386f2fc9d571d811188
 EBUILD at-spi2-core-2.40.1.ebuild 1498 BLAKE2B adfa362d47ff9ecb6d555353bea1baea9197bb2687d5f8349a5b442ad06c4c17b3b6124489bcb922d02e98465195137022b75322a41e6672a1a9fe1ab572f3bb SHA512 96585e874daad90f59bdccdf2c313dbdc2af4f3aec02aeef9c3f95d3a6a86c50ea0f07c0bed74fe40c9641615eece82db03e2a461f92b52034434c8d123d8b42
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson multilib-minimal systemd virtualx xdg
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
-		-Ddocs=$(multilib_native_usex gtk-doc true false)
-		-Dintrospection=$(multilib_native_usex introspection)
-		-Dx11=$(usex X)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
-
-multilib_src_install() {
-	meson_src_install
-}
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.40.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.40.0.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson multilib-minimal systemd virtualx xdg
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
-		-Ddocs=$(multilib_native_usex gtk-doc true false)
-		-Dintrospection=$(multilib_native_usex introspection)
-		-Dx11=$(usex X)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
-
-multilib_src_install() {
-	meson_src_install
-}
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@ -1,5 +1,3 @@
-DIST orca-3.36.6.tar.xz 3465112 BLAKE2B 227610b5a01027c292cf9a99ecc54f76ad6053d6923325825ed5f81183b39e1e38e70e7a7d88561f0b0c4d212f16465542d57bf4aeed2fa893b8893fa1d3dd49 SHA512 be2752267d46077310eccc4d76dc5e87ce8e1715cc33ff6f8f15b83c9891a2ba98a2d681f893c88df5b0c5ffd8a1ebadc3a4286debf0ff14ba17803d20f902db
 DIST orca-40.0.tar.xz 3603368 BLAKE2B 3ac99f32ee496004e568ce61d5862591556bedfd8dc7ef1b707b62b120f1349ae38bbd427b0d3cc67c7be7334bcc46b067ee44a45c51bcdbdf15ee78c0243f64 SHA512 16e15b1cb4b5a2a3d14ddf9e9277e6b0c65e2ab0a7370fd8bfb830bee9d208ef6b5b3d0c19cc2ff6107f3b0cd41e8ae00881033645f7a309ca3ce65aebd73a1b
-EBUILD orca-3.36.6.ebuild 1645 BLAKE2B 816bc6cfc1719fb015c01dba7bc1c103df390f9e6566f7b1171bd18dd1f6bbfb4ee83ce83d4fa4ef9340462f45bcfced71aea1b646e1c74c152f3943be57b395 SHA512 6ea41caf03cdee346e64ae7310fd7e6c12164b1d55f39cf4a16644973f3afe336d25ff88f980fac56690e420541fcb755ca87840fa977d2762adddab5d7e682b
 EBUILD orca-40.0.ebuild 1596 BLAKE2B ccbd51fe9f25ce4f23f1abbb96cce99c5196d4daff9890ccbc1cf2b870197d6b16d821d6e7150a2fef714ae930f47e2cd0065c2b598ef2e62b97c8bfa5270c6b SHA512 04ecf87baf989cd16260f7c08f1ef740aa8983c46437123facaf7667caafe76b61e333257230e54cca121c5e8ecc35b07a99648ae0d56b9de1df7ccefde8b569
 MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8
--- a/app-accessibility/orca/orca-3.36.6.ebuild
+++ b/app-accessibility/orca/orca-3.36.6.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-atk-2.34:2
-	>=app-accessibility/at-spi2-core-2.36:2[introspection]
-	>=dev-libs/atk-2.36
-	>=dev-libs/glib-2.28:2
-	media-libs/gstreamer:1.0[introspection]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}]
-	')
-	braille? (
-		$(python_gen_cond_dep '
-			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}]
-			dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-libs/atk[introspection]
-	$(python_gen_cond_dep '
-		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyatspi-2.36[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-	')
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with braille liblouis)
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize
-}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@ -1,6 +1,4 @@
 AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78fabe2eb48f8131b25ed75a11630ae620e70646539ef42a7c4d7d283f71ffa0fa13f64ccf164d672acd95a SHA512 154438583492c571e4c8e1c926c3cb04972255cc4d1b74f186dfbe50c9756f25e11034fe64d893fdd8f2698c8eaaebba76682a818bb6523656c7c412f8e8b614
-DIST file-roller-3.38.1.tar.xz 875572 BLAKE2B 29a05d48971c2172177bd1aa52448ed5432a69733644b131517dbd7dd50cab971801d1bff5837dba74ae48ea0487614c7c7ebd4669f04f7d42e6257161fe1776 SHA512 b1936481140084c84d7bdbf361859b0ff1fed8329e26b692f0f0c8d1a3a1ec494b493aa0fb4de9f0ea5004b18e4bd69859656fe424bf413d720b04fc56e453f6
 DIST file-roller-3.40.0.tar.xz 876424 BLAKE2B fa2483677869d5a6b4ac91938eac6bf09965177ffa07bab76a77a0be58e331466f939e7e0728d5eeeb5703c6ff12f178f8080922f8ae9d726e77700bbbd518ed SHA512 224dbe4f4358aa62589d084d67244ad8d65d718f9b6adf708ba1425b38fca68e08b07a6163f66d95c6acfd164b6062939cfeb27873ea41353e0551e322b0eb26
-EBUILD file-roller-3.38.1.ebuild 2180 BLAKE2B c2c10d784a90e57eb4a3f44511689e02042db061636c3055a97f54ed7449d6b8aa4b5dde339bd445025c395046a3b1aaf207763409c735e0d15def8b706d3ef4 SHA512 7b6bac2e9da061aa93d8b5da88d44090e20ad1dc01bf1bf3b95ba2532489ae5911f4c809fab528b5101c9d22a54b5813a1a8fcd0e589245ffb09f8c0d7c35a7c
 EBUILD file-roller-3.40.0.ebuild 2193 BLAKE2B 0f160c46d1c945f9e255cce4263074888bf9e79f85464abab84506e00a8a7d2b9fdcadfb67e8829b938df1c281c7ea628b3cb3439c042ff9d486b298903102ac SHA512 be4764c54141ff241d2e9b9990cbe0d4ca04d21404d66c322098e4b36d38ece713117bea5dbfb7900a932f68a71879946503273630098a6e779502db750bbd43
 MISC metadata.xml 522 BLAKE2B 555fc1eb7ab102a7bd439544e158c0a554b8dee1d3891dbc3b9441c5063ad2666795c682e9ade30a920daabe5788017a67680095832e760b9c9c666dcba94928 SHA512 6a8988a025352b00d1dff7b4ab3f75bfb4f95b890a1e1b0fcfdd840a67fe4897dfcce275f8ff439345f094924c72171b1d03e70106f84bd8e0aff8de5510d698
--- a/app-arch/file-roller/file-roller-3.38.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.38.1.ebuild
@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="libnotify nautilus"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.22.0:3
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
-	nautilus? ( >=gnome-base/nautilus-3.28.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-brotli  - app-arch/brotli
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-lz4     - app-arch/lz4
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zstd    - app-arch/zstd
-zoo     - app-arch/zoo"
-
-src_prepare() {
-	# File providing Gentoo package names for various archivers
-	cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Drun-in-place=false
-		$(meson_use nautilus nautilus-actions)
-		$(meson_use libnotify notification)
-		-Dpackagekit=false
-		-Dlibarchive=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@ -1,5 +1,3 @@
-DIST gnome-autoar-0.3.1.tar.xz 297904 BLAKE2B 607c9b3a26cf23eed3b9b19c32e2e0b3b9127977b5836b0b263cc3163490fd10052716e073264bbe946e351ec096021dd243560f6e7781400029263705308328 SHA512 a8ece09f66d7f1761fb4217f267b8a6dd1dee2266cc10f9944b1860c364e0d671286c6bf9477bdee5d0dd231b959ebefdd7a7003d679c38fe1553863033311dc
 DIST gnome-autoar-0.3.2.tar.xz 298656 BLAKE2B d56498f2798b838729056f5d2194dc628de8cfd3e8964a718982cfd464e3e6848152624b2cbbe5377d813183eebae1f212bc56c1a8df2ea119af264786151670 SHA512 6685e44ed61388759ff820b7cd403304f32d47fab4e2f66f5571a5cc6d01c1287bda851f230b3782bb1beff6ef784c25434930f15ef6ed32d788db4b89435968
-EBUILD gnome-autoar-0.3.1.ebuild 938 BLAKE2B 14ef901e62956cb84ccec0790971e83dc176e73b8da92d2e785bb8b0136132b5bfed43964139409f915b43babf27ab09f7ad5cb3eac9c0b4c454e6552cbb7c47 SHA512 70a9f7e15c9db87e4d56c089a407da0b97bc274bcf6a6deed93e9c16828e5f2e51ac0d8bca55b684e98784ca80fcc3af0d52ee6768b4b8b74bb522fb9096fdc5
 EBUILD gnome-autoar-0.3.2.ebuild 938 BLAKE2B 14ef901e62956cb84ccec0790971e83dc176e73b8da92d2e785bb8b0136132b5bfed43964139409f915b43babf27ab09f7ad5cb3eac9c0b4c454e6552cbb7c47 SHA512 70a9f7e15c9db87e4d56c089a407da0b97bc274bcf6a6deed93e9c16828e5f2e51ac0d8bca55b684e98784ca80fcc3af0d52ee6768b4b8b74bb522fb9096fdc5
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
--- a/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Automatic archives creating and extracting library"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-autoar"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=app-arch/libarchive-3.4.0
-	>=dev-libs/glib-2.35.6:2
-	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable gtk)
-}
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@ -1,5 +1,4 @@
 AUX brasero-3.12.2-tracker3.patch 8745 BLAKE2B a3ca65c2354bc87f7d9c9bd4ec2dce06f7a97208193a48674ffb60ace244528e9f45e25b15c768af9cf5b002db549d058433eb069ad13cee2d1a2e76afee9b69 SHA512 0595dda2259c8a1a4b005ac6d8886a1b9333102df61a24cbaf61895160395374abcb2391e487b6e98eaa441fcc3164187c451edb6ddc0c19cb1b7d12658aff1b
 DIST brasero-3.12.2.tar.xz 3742120 BLAKE2B 42cc60d3f4e26e948321c34f2514172aeac5a1b2624e6b23f27cc9725efd5cf0844a54175161b4c94601bbd5c4a6f18ccdd62353e862eddaab17e0d164f4694c SHA512 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f
-EBUILD brasero-3.12.2-r2.ebuild 2092 BLAKE2B 1c0dbb77b9eb0119c82e7617966053f0e9970c356b7e395eab70c9081c94f2e7f4b0d6f44188aa804ee0371b9cec4eb5008685f3fb72162b8654cbccde71ce55 SHA512 dfe209442fbf441d96c252cdb4a81bc76fb41144c07f307aa49fe271593dd90f77ac0abe81521f448692342e9cc16eaf8e30554e640460aa80cc1f44385ad16d
 EBUILD brasero-3.12.2-r3.ebuild 2079 BLAKE2B 9995acbe0f49ba347f5e9d72020248bea689273b596b84ec82dd81fc538214326816be0615d614a17d695fa028b49a5d6158cfac280e21e072de1f4ee377ac13 SHA512 8b3be1358de668c0a2e5fea8304c57235057acb70ab9454379e8d629dfbeff0d5597b812939032b7569ce793abba5f3c344c1c0d0a9151def537d49b583edcb8
-MISC metadata.xml 746 BLAKE2B cc74b666873593a356e42643f62e16a4919441f08ce9645e367ce5f52b6b3c3d0a2bd1a5bc64b49348239b04c7543a66993926d216a7ada19f2129417106e1dd SHA512 9824ae80fa067cedf46aa47f83d481b18704b94af6258657eb099bde328abae196b8f86ce7e92a800fea6b657b5a774afc37888fb92b560fda1403d8adf06c7d
+MISC metadata.xml 641 BLAKE2B 7794aa95bc8a957f6e7ac6ae6083ee3dc39cc1223eb5de848350fddf17c1c1f92ab48414d85c4aedf8796ec677cb503b85f035ae59339cfe4ad7a22035f47a7b SHA512 0e0593e13efcbe00ae211c318ffe6f8d9a142a2fe6e6e0535ead88a46c13c05d6d03f131f987a0ed6b2ccf111526b113064a910c7c81167367e7051f390b45f2
--- a/app-cdr/brasero/brasero-3.12.2-r2.ebuild
+++ b/app-cdr/brasero/brasero-3.12.2-r2.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="CD/DVD burning application for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
-IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.29.14:2
-	>=x11-libs/gtk+-3:3[introspection?]
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/libnotify-0.6.1:=
-
-	media-libs/libcanberra[gtk3]
-	x11-libs/libICE
-	x11-libs/libSM
-
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	libburn? (
-		>=dev-libs/libburn-0.4:=
-		>=dev-libs/libisofs-0.6.4:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.90 )
-	playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
-	tracker? ( >=app-misc/tracker-1:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-meta:1.0[mp3?]
-	x11-themes/hicolor-icon-theme
-	css? ( media-libs/libdvdcss:1.2 )
-	!libburn? (
-		app-cdr/cdrdao
-		app-cdr/cdrtools
-		app-cdr/dvd+rw-tools
-	)
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	>=dev-util/gtk-doc-am-1.12
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.3 )
-"
-# eautoreconf deps
-#	app-text/yelp-tools
-#	gnome-base/gnome-common
-
-PDEPEND="gnome-base/gvfs"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-caches \
-		$(use_enable !libburn cdrtools) \
-		$(use_enable !libburn cdrkit) \
-		$(use_enable !libburn cdrdao) \
-		$(use_enable !libburn growisofs) \
-		$(use_enable introspection) \
-		$(use_enable libburn libburnia) \
-		$(use_enable nautilus) \
-		$(use_enable playlist) \
-		$(use_enable tracker search)
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/share/{appdata,metainfo} || die
-	find "${ED}" -type f -name "*.la" -delete || die
-}
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@ -6,8 +6,6 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="packagekit">Enable support for the distro-neutral package
-			manager GUI PackageKit</flag>
 		<flag name="nautilus">Build the <pkg>gnome-base/nautilus</pkg>
 			extension</flag>
 		<flag name="libburn">Enable <pkg>dev-libs/libburn</pkg> backend</flag>
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@ -1,7 +1,4 @@
-AUX 3.38.0-avoid-gnupg-circular-dep.patch 1994 BLAKE2B bcb5be508a5d0ef580197aa2405e18cb90f28b4c3edac7b80eea2fcff3585ee9d8373e2b8c19e4c6a845dc578ca591131aeec698e19d27cef1716e4cb350eb15 SHA512 5407ee82605a66d6f59b81c5ec17e8293f5d93d405fe474fecf0cb2645aecda2f06d61baea5ab9f477135651584552be613b0944d290e771fecf7e49f55025b5
 AUX 3.38.0-optional-vapi.patch 2278 BLAKE2B 7011aec6831b9488ba19efd41b6f3772af101dac4e2e9759f354a59a7243c45eae4a03583f7a717099fe5b08c813c898228ceeed8afac7b28d4bdb77fe9ac4e0 SHA512 95a9109217cf255e921bbf2504918345d1e32e454a8c44c726cb1df522cca73de785db31e9e71a88d3bfa802c49ae89caaa9c64edc3834c5b491ef15f853313e
-DIST gcr-3.38.1.tar.xz 1030360 BLAKE2B 474b501a5f6c339b0b4fb460a094dec6d5a297ca44daf050c6c88bc05ee822358309f57490f92c42f84a1e9f36a1d3c09c4b2788d7142ee5e86e2acf7987ea14 SHA512 4dc8c3f84023a7cd6f069f4529cb063d7153e589c2f9547410c7eeb5298dc238ea7fc4f22e22d8c237391f31bfcd814190e55125195f20b913665b9ca81d9c21
 DIST gcr-3.40.0.tar.xz 1011044 BLAKE2B 6b1016f74e5fd3ace32a534a59575db9c39b5deefd2f4f3a747ef7e87a43c7c00b33500d8151009347af9fe6b073c390895bb6e17c577c6e150c780c487b997e SHA512 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81
-EBUILD gcr-3.38.1.ebuild 1846 BLAKE2B 7a5b4eccdf711025139adfd05032899d9d3394a6ccdf2439a1bf1e16934de8205f3e7a4cc2e0ecf059ad27ba2da0a867dcd80d7f31d20464b67c769cb8bedb2b SHA512 9974e119a8292d4fe1a37d09a0d830089fab446366b472e91a5da849b482ac24c6f48580d747063b1f31acedc1731be717d1cab93998aa4b6d6eb0881ac62041
 EBUILD gcr-3.40.0.ebuild 1798 BLAKE2B 9491586e1c0d8bb0f564296fb9d922bfae752867b2a33a6adcdfc957c7f70b48516dd876d074ed90f4cf53cc3b4e018d707152fd3365141acec563a12c5da3db SHA512 26f8dc75e6578c8c1de2c7d46c74e6f725fe0b69e28c766e7a3226f9d32efc290d633306e6c3ba84137ccac2b1be20a8c7c3b9a3117cb7058e77152f5f1feefe
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch
+++ b/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch
@ -1,52 +0,0 @@
-From b938b0b658852c682ae17d56e0ad9322611e9516 Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <oss@cogitri.dev>
-Date: Wed, 11 Mar 2020 11:49:08 +0100
-Subject: [PATCH 1/2] meson: allow building without gpg(2) installed
-
-This avoids circular dependencies, such as gcr -> gpg2 -> pinentry -> gcr
---
- meson.build       | 7 +++++--
- meson_options.txt | 5 +++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index a26a0f9..02b4c3c 100644
--- a/meson.build
-+++ b/meson.build
-@@ -41,7 +41,10 @@ gobject_dep = dependency('gobject-2.0', version: '>=' + min_glib_version)
- gio_dep = dependency('gio-2.0', version: '>=' + min_glib_version)
- gio_unix_dep = dependency('gio-unix-2.0',version: '>=' + min_glib_version)
- glib_deps = [ glib_dep, gmodule_dep, gthread_dep, gobject_dep, gio_dep, gio_unix_dep, ]
-gpg_bin = find_program('gpg2', 'gpg')
-+gpg_path = get_option('gpg_path')
-+if gpg_path == ''
-+  gpg_path = find_program('gpg2', 'gpg').path()
-+endif
- libgcrypt_dep = dependency('libgcrypt', version: '>= 1')
- p11kit_dep = dependency('p11-kit-1', version: '>= 0.19.0')
- p11_system_config_modules = p11kit_dep.get_pkgconfig_variable('p11_system_config_modules')
-@@ -65,7 +68,7 @@ conf.set('HAVE_GETTEXT', true)
- conf.set('HAVE_LOCALE_H', cc.has_header('locale.h'))
- conf.set('HAVE_TIMEGM', cc.has_function('timegm'))
- conf.set('HAVE_MLOCK', cc.has_function('mlock'))
-conf.set_quoted('GPG_EXECUTABLE', gpg_bin.path())
-+conf.set_quoted('GPG_EXECUTABLE', gpg_path)
- conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
- config_file = configure_file(
-   output: 'config.h',
-diff --git a/meson_options.txt b/meson_options.txt
-index bbdc8e3..ae0f524 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,3 +13,8 @@ option('gtk_doc',
-   value: true,
-   description: 'Build the reference documentation (requires gtk-doc)',
- )
-+option('gpg_path',
-+  type: 'string',
-+  value: '',
-+  description: 'Path to gpg, autodetected if not set',
-+)
-- 
-2.26.2
-
--- a/app-crypt/gcr/gcr-3.38.1.ebuild
+++ b/app-crypt/gcr/gcr-3.38.1.ebuild
@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
-
-IUSE="gtk gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-DEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=app-crypt/p11-kit-0.19.0
-	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
-	>=sys-apps/dbus-1
-	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="app-crypt/gnupg"
-BDEPEND="
-	${PYTHON_DEPS}
-	gtk? ( dev-libs/libxml2:2 )
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.19.8
-	test? ( app-crypt/gnupg )
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.38.0-avoid-gnupg-circular-dep.patch
-	"${FILESDIR}"/3.38.0-optional-vapi.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use gtk)
-		$(meson_use gtk-doc gtk_doc)
-		-Dgpg_path="${EPREFIX}"/usr/bin/gpg
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@ -1,6 +1,4 @@
 AUX seahorse-40.0-fix-segfault-with-ldap-disabled.patch 1056 BLAKE2B bde592e3c78f28503d0e113da676639c76d9ab8c17226bd94e82b2e3cd1612088147b62d064cc0d7268d8cd75912c8239e52ec7c7c96f4f8aeff5120a955b367 SHA512 9c69c11540ea9dab84bafac8ee12302eea47e67276a6023a91768a612d42325a9496ec7472ba988dab7ad79cc7b6f5c012e5c0cb94b90f9509f0c71e72cc3c97
-DIST seahorse-3.38.1.tar.xz 1725480 BLAKE2B 348d9fe1208a9205c58c5655ce97b79c279e2e3506f041a1ebac1f7c83666186ec792bafe7f23b470dd1202a12bc974376b8c369888c6fa194739e7a15973d63 SHA512 1a064ecaf1a25aa84010f914043c3776eba464844598b15e0822217ad330396516df64afed1aeffb3c7b6102d1477c280ec8ec32101cf9f5120c433431b9df32
 DIST seahorse-40.0.tar.xz 1309064 BLAKE2B dd179ef13c79454b30571959b33c02a523591fa9d59957e0c30ec5d75a52bd8e9a5b420214f85d5feac0849d69a51ddcee808ab47e4bf97d7ac99094f853bc9a SHA512 c389420fb1b3d54c1b9a1004f2c8b9e50118a1ffcba02aa8cfdd2223d1bc117368c9a1ad875c59abd319d95eb93ec3de2e9cedadbfc1d6a0997d613c8256c60b
-EBUILD seahorse-3.38.1.ebuild 1616 BLAKE2B af4870e0d0ef260b59302ebb21c93bd3f544ac4a64936635d0a0aebef03374209a6729b4b5cba75c768df5db8bf736abe69ae4c42e7e72d99fa1951b69cad726 SHA512 323b55432d52530effd6214110000d2dbb01d029605b4846a0fb9a6a3b2e854c38701c73ff7caebcbd8b6cadefaf44df956d93e7f5a0fb6ebcdfbe02829c73ff
 EBUILD seahorse-40.0-r1.ebuild 1688 BLAKE2B 1467777527251f2dfb6501ec2ea5054428cdbc52d0cbd08bb9f4cda244de7bee02a64c666274e724e07d8a8a1750c47cbed1886a3741c7201743d5a2d458ccb3 SHA512 a23db51158cd52eeb5db93b1479f726be7d00a4f69766fcd8d48a0304b1420420a5b3f635c44f4a9b0f7c1bc4848edf79e7db23e1d7ed8aeab01fcd994ac8ac5
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
--- a/app-crypt/seahorse/seahorse-3.38.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.38.1.ebuild
@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="Manage your passwords and encryption keys"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.58:2
-	>=app-crypt/gcr-3.11.91:=
-	>=app-crypt/gpgme-1.7.0
-	>=x11-libs/gtk+-3.22.0:3
-	>=app-crypt/gnupg-2.0.12
-	gui-libs/libhandy:1=
-	>=app-crypt/libsecret-0.16
-	dev-libs/libpwquality
-	net-misc/openssh
-	ldap? ( net-nds/openldap:= )
-	>=net-libs/libsoup-2.33.92:2.4
-	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	app-crypt/gcr[vala]
-	app-crypt/libsecret[vala]
-	gui-libs/libhandy:1[vala]
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dhelp=true
-		-Dpgp-support=true
-		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
-		-Dpkcs11-support=true
-		-Dkeyservers-support=true
-		-Dhkp-support=true
-		$(meson_use ldap ldap-support)
-		$(meson_use zeroconf key-sharing)
-		-Dmanpage=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@ -1,5 +1,3 @@
-DIST gnome-dictionary-3.26.1.tar.xz 662048 BLAKE2B 3b77d3632629f8502476f029ab9ba3c66225cd619992e185b1403adfeba718b7e0fa0f32762eb086c1e9ef80a08cf79cd872e2ca3026b8cb3975954077c5f7c1 SHA512 da7169795740295c13f02143f5263603f0f6c621e96cecf88a4ee089114399d59f083987bc4571821467da64dc43f00bebbe4ea66b46a035088f85d35d6aee27
 DIST gnome-dictionary-40.0.tar.xz 603388 BLAKE2B 1fae73ea5b554786f1ee1bf641b0dc94ee8953a045e4a59b72823075b8c0905d0098827ad35f94e26d26fcbdbed1fd2980391ce582871ae6df4d273d9de5add4 SHA512 96e8c5efbba43e1a7d247703ac17cbcb8579cc633f6db74b6fe4431e0b1aed47ab76fd15cc114497b5ee76fb33b57fd9936cc869ffe905f208c836b5a231b126
-EBUILD gnome-dictionary-3.26.1.ebuild 1007 BLAKE2B 45d40936058cf017a4dbcd8a25c5185948049d842ea7f6aa53c6f89ec1a617d8107d1c3d6c887b3e1111d7b416cd62e9b4fffdb4157f9a8a86b19741df06a353 SHA512 ed7f62cc3ba6796ca60da8910d842f87a533031cd5ad33bb008de19c71cb275987f32ee19919cd2a5ec82a926a73998f9dbf1a42e414f65f9a33fa2615bbacdf
 EBUILD gnome-dictionary-40.0.ebuild 960 BLAKE2B af8632e4c6374acf8d73d3f8060464c1803ebc290cd239bbad70899292f979b05e96504e1b26ec685326125cdfede8cda6fb36e8ff208745cb7f78bd6f9a013f SHA512 3e31a959ac785b7d172ae1ae48d22c6cce5165e43c41f1a05bd8276ec56cd11e1b484a88c95aabc271317ae076044b1f296f82d2a3676ea5b27757fec36fb5fe
 MISC metadata.xml 316 BLAKE2B 61e50cf64e718dff6380a8840d59f5679e8f084efadcda41cfb45af74177d1121af1db7485fe57690090b0d1deaceaf9d53733fe39447827643c1785b4c68f3d SHA512 c46d3611dc1954a3229a98892c23aa1ebbc74c572dc5562660fce3390cfb74252515ee3a3048418c855c8165a5cea8e5df1fc10c94f81915eac400d7c58850aa
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Dictionary utility for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0" # does not provide a public libgdict-1.0.so anymore
-IUSE="ipv6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.42:2
-	>=x11-libs/gtk+-3.21.2:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use ipv6 use_ipv6)
-		-Dbuild_man=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@ -17,5 +17,5 @@ EBUILD emacs-26.3-r4.ebuild 11793 BLAKE2B 763f18c158963b680ffe0c6a165acf752b98ca
 EBUILD emacs-27.1-r4.ebuild 14342 BLAKE2B 6cbe2e3957580b67a16456b1e052f5fb27b0f366577cde2c2a75b189cf0b81d3c78fbb716be84475a288ec0d0ca6e92f9d34c613811508d642b2eb5c1bb05dd8 SHA512 f41f5465285f7f2dc0b14100cd5746b5c795be62b16800cbf0393c9c6e057d542c5b4a452c1bffd83477f367ae7755e0676c9be699428e9f268f41523f05a1b2
 EBUILD emacs-27.2.9999.ebuild 14306 BLAKE2B 1f2be5d61cf735985c853b910ee13c2d5ca715a65180ab87d0c5299b4c452bc7ad1f2472820673640d4421647528d29e37adbf103bcb902850e5effe0f96e796 SHA512 1c3ba3a69acd55af91c72466a1f79f490d9f67620936d82e09ae779161c3b0a8a14a5d9171f19371008353be18bd202cd25ef831f17daceb9a148e5c0ed01b00
 EBUILD emacs-27.2.ebuild 14307 BLAKE2B 9faa2dcb6062acd107fca6da404aa7066095577dd7db174cde7c682a4d2291df150566b376940db984d70726bf6dcd08149505c29323f1da5dd9100e6518c32d SHA512 727e6ebbdb9776c2b420ff555947f14642fa771fe73cc43b1dda47642d8b0b7830093df683901fe3c4d13e8910f975fe5337e74868e1c6f08d0eea0d846f1ae9
-EBUILD emacs-28.0.9999.ebuild 14192 BLAKE2B 5fa9b173b7d24fb1ff0a648d7f6d54230627b9671250f51764011f3bd4f1f199f3df059fdd29c58f99c97f365b01755983c04a0405f5195faa3df894d9363898 SHA512 58912827a64f4c0da66b979d40dfd0c756ae92396853428a9a3384411762b586c712312bde002f276017b9819cffb4735bf48ff0cec77f64bd74813a292abb5e
+EBUILD emacs-28.0.9999.ebuild 14193 BLAKE2B 799248d76ae76b7161239fcd767fce691512fb4589e2eec87f06b129b4f8ef45b385aaa2996db492a150b2c55919d82cb479993d405ccf5a71494e91db1648f5 SHA512 cef7de5a0f85c74a9e5ebd206df42129d57e4da3cccf44f8961c374821e317ea6527b973294e93859173ffabacf8b12b47c3e836786c3ef5b799ef8ea6b4338a
 MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@ -300,7 +300,7 @@ src_install() {

 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die

 	# move info dir to avoid collisions with the dir file generated by portage
 	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@ -1,7 +1,3 @@
-DIST gedit-plugins-3.38.1.tar.xz 957616 BLAKE2B 9cf5fe5343b513bd841add5d4e85f8fe2e8f62524af7c124bdfc41b81e653a41d1a7417f8cc06f764cca730927f471598cae914a1581c5cd3712b89c464a075d SHA512 d5cc3e82ac6a488f5ab06eaf4eb5ad32bdbe50b74f2f215e114b5cb3bb0a089da00caa3815d6638a679c1c902983a0754a16ef88e15ff88d8321a247288ad237
-DIST gedit-plugins-40.0.tar.xz 950560 BLAKE2B 783803dd4913a2b384a714c7564f18686b6ecf7da2f10d421322b6421e9b10271f97dcbf819e3212c97a0e4ba2b54dcb12ba5efc392396caafe705844e2cd407 SHA512 660e82dc1a1187262afd921196074dd2808a400b5acbc88ab36f522c50f1b9d221ff1821c2e8c0c066c7556862779e8d277f52a758070c59b17e6b53791ff39d
 DIST gedit-plugins-40.1.tar.xz 951024 BLAKE2B 8a5fa07d6b9a5848e66de995c05f389b288e7863fa506476fd82157dc203e472b8ac8b8bdd15b09513e5d819fc58ce4d1077e62e6c5b90f93b14775052bf2737 SHA512 71649d157ac5591e4dd317c44ae167c98fb59e253c45f8c1ff8ef397a9e3f0bb968f0ef2486f9021354269e77defb9e5e305f1538f69818480a250966143c7a3
-EBUILD gedit-plugins-3.38.1.ebuild 2720 BLAKE2B f90c19d1c5ab039c3ec9797a643db60bc449dbe61710fa32c98bcf3961742adea05d21f1c824da5ffd27133f71b3c9e1f8e2949d068f4ce2f5aece114d8662db SHA512 432e71c98caf77e46e87080685f96e580a410ab9016922539e762a0ce18142dcc2cb5e532d7ed57042eece3d095cf1b3801cf0f5f2b6d7f05bf5a05b4e37d5f3
-EBUILD gedit-plugins-40.0.ebuild 2715 BLAKE2B a155f67ecead8da85a437a06b49a411bf41052ee5af4d2457b23cdd14459502b0caa8162d13e3f48929d51915824f989ca14bc426965d97a0f82013ffa1ee4de SHA512 91eabb78e3860d8d4ae91ce92428bbc692e5f4be3befb689b4300bbcf83cf430223edcff3a3166925e2b34fc059a86aa06b873e74a6dc0ae1af29e44220e120b
 EBUILD gedit-plugins-40.1.ebuild 2713 BLAKE2B 4f49a0f7cab96c1a74b932270dd944622d729d0960796711fcb3ee63e02535eb1ed942b86e549034a08248b3fe5718a5125768e1db664e6ab34babe9a08375b2 SHA512 b1397ebf9a587d12985bc980055462f66f0dd852a07de0c97589ca0f9e3b93023440433d647d08d778cb6912295984f112b317c99b51fc3d56445c744d398041
 MISC metadata.xml 480 BLAKE2B 5584c44a255c0d13a2b93342a860388799ab1f86565bb8325a5a37e839ef01c2030b2d45ef491fc420bbbe5c113b6d9ad169352138ea09067d93e23d0bf200bf SHA512 9162def76b0460099da66501b6c0dcad1daf1f5e9e85d5cb19c6076aaafd946dc6d4d92965c66ccbbb19b13b48e9e957f65b7f33abd15e28678b7d8da258fac3
--- a/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild
@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-IUSE="charmap git +python terminal vala"
-REQUIRED_USE="
-	charmap? ( python )
-	git? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	terminal? ( python )
-"
-
-RDEPEND="
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=app-editors/gedit-3.38
-
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.9:3
-	>=x11-libs/gtksourceview-4.0.2:4
-
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=app-editors/gedit-3.36[python,${PYTHON_SINGLE_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-			>=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
-			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-		')
-		>=x11-libs/gtk+-3.9:3[introspection]
-		>=x11-libs/gtksourceview-4.0.2:4[introspection]
-		x11-libs/pango[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-	)
-	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
-	git? ( >=dev-libs/libgit2-glib-0.0.6[python] )
-	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
-" # vte-0.52+ for feed_child API compatibility
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dplugin_bookmarks=true
-		$(meson_use python plugin_bracketcompletion)
-		$(meson_use charmap plugin_charmap)
-		$(meson_use python plugin_codecomment)
-		$(meson_use python plugin_colorpicker)
-		$(meson_use python plugin_colorschemer)
-		$(meson_use python plugin_commander)
-		-Dplugin_drawspaces=true
-		$(meson_use vala plugin_findinfiles)
-		$(meson_use git plugin_git)
-		$(meson_use python plugin_joinlines)
-		$(meson_use python plugin_multiedit)
-		$(meson_use python plugin_sessionsaver)
-		$(meson_use python plugin_smartspaces)
-		$(meson_use python plugin_synctex)
-		$(meson_use terminal plugin_terminal)
-		$(meson_use python plugin_textsize)
-		$(meson_use python plugin_translate)
-		-Dplugin_wordcompletion=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-editors/gedit-plugins/gedit-plugins-40.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-40.0.ebuild
@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-IUSE="charmap git +python terminal vala"
-REQUIRED_USE="
-	charmap? ( python )
-	git? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	terminal? ( python )
-"
-
-RDEPEND="
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=app-editors/gedit-40.0
-
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.9:3
-	>=x11-libs/gtksourceview-4.0.2:4
-
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			app-editors/gedit[python,${PYTHON_SINGLE_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-			>=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
-			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-		')
-		>=x11-libs/gtk+-3.9:3[introspection]
-		>=x11-libs/gtksourceview-4.0.2:4[introspection]
-		x11-libs/pango[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-	)
-	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
-	git? ( >=dev-libs/libgit2-glib-0.0.6[python] )
-	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
-" # vte-0.52+ for feed_child API compatibility
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dplugin_bookmarks=true
-		$(meson_use python plugin_bracketcompletion)
-		$(meson_use charmap plugin_charmap)
-		$(meson_use python plugin_codecomment)
-		$(meson_use python plugin_colorpicker)
-		$(meson_use python plugin_colorschemer)
-		$(meson_use python plugin_commander)
-		-Dplugin_drawspaces=true
-		$(meson_use vala plugin_findinfiles)
-		$(meson_use git plugin_git)
-		$(meson_use python plugin_joinlines)
-		$(meson_use python plugin_multiedit)
-		$(meson_use python plugin_sessionsaver)
-		$(meson_use python plugin_smartspaces)
-		$(meson_use python plugin_synctex)
-		$(meson_use terminal plugin_terminal)
-		$(meson_use python plugin_textsize)
-		$(meson_use python plugin_translate)
-		-Dplugin_wordcompletion=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@ -1,10 +1,6 @@
 AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01baebedf4cf1bbd7971b89e4b14c55941fdeb824405f6ab6c9035b9b9d6fcac7ab8cf80270bd7d52f880b3f628140f74b0e4 SHA512 857955914028623ccb3f41b91e3a1d895901e7810764085fdd7daa40f455582dbf999cffede29519ba8097f09bbb02999a969bbff406d2822fcb4fd2feb82275
 AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50
 AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e
-DIST gedit-3.38.1.tar.xz 6861368 BLAKE2B 3b202dbb7df8e91b58bd345fcaa309546af07bce60dc4638a3c344996d6c04ef7fe8a4824360c0f55970b759f9d7e2929c207992a9c80ad686d39e94ff741b7a SHA512 cd52cbcece3b007692294ab01b95fae7deb744b08a44da2d3cafa82a86d94c104abcdd4dcbe10630e0d633c8cc3c75f5e5dc6c8452a8c4bc2e6bb3c0de7d5547
-DIST gedit-40.0.tar.xz 6852672 BLAKE2B 80af344cb6e848338f0c5921ff15e1d3e8566967756fbb832767c5d39914915f1c746c78c45e22d534dd8fc02c7e214e793b5a315ce2357e2afb3ca97312e45e SHA512 b1f6fc4f4894c3ada8e85b81df2fca6870acf725074b56b2c85b1c8f04e004f193e8fad3ac0c641bd0df6a704604ec054e130c60f0480c1abf62a91cb181429e
 DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09
-EBUILD gedit-3.38.1.ebuild 2270 BLAKE2B 69d117a04236aa8643c992c683412290991609ebf9131035fdbb2c2c84a8e4157d868e47243794cebe91513051638fe04b76c741de8acbfbfe9196c7ce379a8e SHA512 5fa553b145169481336968982b42cc3b51ca703aef3de7e833ff8f31d9255ed049d8975ba888a4b3ee21fd72114d3309a230436b89206fb32a270b06c0c18d18
-EBUILD gedit-40.0.ebuild 2272 BLAKE2B 5f3998439f2d0badfc1a65a65e3162869e17ddd17046fe43100931cf6eb4ba06139c44693f607c3569033c256d80bfccb46efce3cbb7fbe28351df112a578401 SHA512 f4acbc22dbf93d5b9f27acbc4365861805fae54339029b7b05a6917191526671e501a2ff9512db384156b15d614aba5ec69693a46a59b3976783e5b64a8f024c
 EBUILD gedit-40.1.ebuild 2270 BLAKE2B bf7a66b16e75dd44165ddd9c11be3621f7f8533d005ff73c5027267b56a4bb52c664d13e11f7b594bc1c59be045016019307dd78f59b7bbaee9e10d830d30a2e SHA512 dcd72286738424b24da6721a55f875131f343674ae2c306460352da986521079d9ef3e8245c4a8cb22e365b0ecf2d6ad841aa61f41e4ff037a8390747e56b5c9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/app-editors/gedit/gedit-3.38.1.ebuild
+++ b/app-editors/gedit/gedit-3.38.1.ebuild
@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+python gtk-doc spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.22.0:3[introspection]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection]
-	gui-libs/tepl:5
-
-	spell? ( >=app-text/gspell-0.2.5:0= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-"
-BDEPEND="
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-PATCHES=(
-	# Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily
-	# disagree with; those wanting them off in general would set that globally for gtk
-	"${FILESDIR}"/restore-overlay-scrollbars.patch
-	# Make gspell and python optional
-	"${FILESDIR}"/3.38-make-gspell-optional.patch
-	"${FILESDIR}"/3.38-make-python-optional.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use python)
-		$(meson_use gtk-doc gtk_doc)
-		-Duser_documentation=true
-		$(meson_feature spell)
-	)
-	meson_src_configure
-}
-
-# Only appdata and desktop file validation in v3.32.2
-src_test() { :; }
-
-src_install() {
-	meson_src_install
-	if use python; then
-		python_optimize
-		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-editors/gedit/gedit-40.0.ebuild
+++ b/app-editors/gedit/gedit-40.0.ebuild
@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+python gtk-doc spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.22.0:3[introspection]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection]
-	gui-libs/tepl:6
-
-	spell? ( >=app-text/gspell-0.2.5:0= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-"
-BDEPEND="
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-PATCHES=(
-	# Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily
-	# disagree with; those wanting them off in general would set that globally for gtk
-	"${FILESDIR}"/restore-overlay-scrollbars.patch
-	# Make gspell and python optional
-	"${FILESDIR}"/3.38-make-gspell-optional.patch
-	"${FILESDIR}"/3.38-make-python-optional.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use python)
-		$(meson_use gtk-doc gtk_doc)
-		-Duser_documentation=true
-		$(meson_feature spell)
-	)
-	meson_src_configure
-}
-
-# Only appdata and desktop file validation in v3.32.2
-src_test() { :; }
-
-src_install() {
-	meson_src_install
-	if use python; then
-		python_optimize
-		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@ -1,7 +1,3 @@
-DIST bijiben-3.36.3.tar.xz 528772 BLAKE2B 2445f0b3b40aa9c556635d25e85b31f620a83a4be4ed4c6d3091d3f3c5f19d5b8fc13769ed56bea6a731184b9dfdd2f604a3f29ad8dbde9c019a1f58f4c41447 SHA512 dba2d9da6ae62dd10a75662b9b04475e0ba64f50065d1dab8da8601b6a4dc44cb4f2b6129dec1f4a415844bee80ff534704e703118838a993a4ffe3ebbe2d254
-DIST bijiben-40.0.tar.xz 642760 BLAKE2B 9c0f9f1d103e9775ce1369b16844828c11c2c43ba9808a5978d7090fe131d9dd54a25cd4fd06cb565b2d7936c6298a87f4a774cc5c30aa0cd6a86ae012b45043 SHA512 3fef381014109fe716d05b4b150f80778196c29af588e3a476b663aac5b113659f8ddfed82417811292bf9039a3d0982591503f72550130179ed1a7fef39edcd
 DIST bijiben-40.1.tar.xz 687344 BLAKE2B 187e6d0af40649ef35453af4ce51f286196bfd0570370136611cd2191e6c0c6b578e95eb4b6edf448bac6ae7b93b729afef161d3cd4d2cbd9c40f873ed5004c3 SHA512 5d2e0694f9eddca9a152eac5c208b51a15d2a5651ab77c79c1bb94425c0f1541c916887c3aab5fb8b105ca50d0f14c432ac18cd8ac64d03e2a0ee46c91901f10
-EBUILD bijiben-3.36.3.ebuild 1055 BLAKE2B 71f215d69edb0bc91637bd0361ac38d4c80900d9a04015a3df6354573cde3e368afd74e4b6b26cd704773267be6321b2068f4cb870deeb92c5512d1df396d83c SHA512 71f6b947acb39badc539d3f20b21a87ed20c7502b1a937de5a714836c9bd3782239d082d7f51dc3acad5bd128d8d828958fb2559222cf956f08181e15dd9205b
-EBUILD bijiben-40.0.ebuild 1106 BLAKE2B f2138107d53d7501984492309c87da72ccc7e318d3e7ce3b145316a4bfffa11ef4ab6ea057c9d5ba23117415f047ce647d352d96c2fbf63a781044ccf4adf4f7 SHA512 f525c1cdf291885dd5234a517811846f2108cc557aca493e72899559a0d0c1e96e155a1c6bf2fba2bf0963cd618fbd934f81bbc6b0b5d3a6467073bf17267429
 EBUILD bijiben-40.1.ebuild 1104 BLAKE2B 63667725e00dfb8d9b2abc5398ee6d68baed6ab2bf6c70a050a1f947d37236beedffa5d664030b3c8291dcf99e0941008f5d7f9fc497281ce1b4e65ec099f488 SHA512 1202efa06d90c99f2fd48901bac9b1319ca1f80e9cb2f64088e2765e3d1a7b9a9683145d8fbc9f7870b4bfbe146e99347ea85bf3bb7122f7546ea0aa6a622d7c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/app-misc/bijiben/bijiben-3.36.3.ebuild
+++ b/app-misc/bijiben/bijiben-3.36.3.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	app-misc/tracker:0/2.0
-	>=dev-libs/glib-2.53.4:2
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.19.3:3
-	>=gnome-extra/evolution-data-server-3.33.2:=
-	>=gui-libs/libhandy-0.0.10:0.0=
-	dev-libs/libxml2:2
-	sys-apps/util-linux
-	>=net-libs/webkit-gtk-2.10:4
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dzeitgeist=false
-		-Dupdate_mimedb=false
-		-Dprivate_store=false # private store is mainly meant for flatpak builds
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-misc/bijiben/bijiben-40.0.ebuild
+++ b/app-misc/bijiben/bijiben-40.0.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-misc/tracker:3=
-	>=dev-libs/glib-2.53.4:2
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.19.3:3
-	dev-libs/json-glib
-	>=gnome-extra/evolution-data-server-3.33.2:=
-	>=gui-libs/libhandy-1.0.0:1=
-	dev-libs/libxml2:2
-	sys-apps/util-linux
-	>=net-libs/webkit-gtk-2.26:4
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dupdate_mimedb=false
-		-Dprivate_store=false # private store is mainly meant for flatpak builds
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@ -1,8 +1,4 @@
 AUX gnote-3.38.1-cstddef.patch 988 BLAKE2B 8281bd3b515d642b57e49e365b76b134a3ccc9021b4b95b46934d4713f39cb107a644db948cac73175fa6dcdbdf566639894521b1415957af2dc8b661aca08e1 SHA512 3f4cdb300299fc224f3c5fd2cc8a4f8d47a7eb41af47eb233555f714879cdf1d0e294c5045a4fb89b4b721b6029f5c38dac7fee5d6c1c11461efe0523a3edefe
-DIST gnote-3.38.1.tar.xz 3530348 BLAKE2B d3312162ffdf505dea31f8e8848bd755d6fc54a5f95250ce6b90a28e04801fb86a8c4e239471442a4501068a841e38e4764da8f16528849fdec57a88bd271891 SHA512 ccfe35ff3dc8e90fa96307565875401540c9e03a18ffd5b2c25fdb053927c4bb2b6b5515456f5260c053948b1a63bf6959a73e1ab09feefce61ed2adc257734f
-DIST gnote-40.0.tar.xz 3418516 BLAKE2B 93834a3d9cdae89604be01b96c5293741263a1812ed23cc51a151c250f42c33c560456ac78a5a97f713dffc095b6f53ffe465da89867df89497239443939f3c4 SHA512 098273ee2de15152e7da739b857a8f7c43561e51013d1f42a631b0a9f52edebcd089817a9009556697e4c4b43506834919cd0f8cae7b3d899517f4b6d42eeb31
 DIST gnote-40.1.tar.xz 3420216 BLAKE2B a84604b25301fb0332da161a7f1f258542f1dfa16a02f34e700280e87393a3eb6d9005a5ed18204b91d0fccea2f6e44738789ab57dae543707650bfce55165c8 SHA512 6f4286fef18b060bb46c1c9f43772df7d9d913d6d1e3e3801e38e277fa660aa213e46f4a825788795f153821f705bbea22df7d1ff90ee949752497274455ad37
-EBUILD gnote-3.38.1.ebuild 1604 BLAKE2B 3de1688743a57faa5d11f39adeb2fcbd337a58ed4e7e9b2784cf79916fe54248d19cba834890336ea22c7cc71bc6b481a44634e34485da1890f0368bce43d3b5 SHA512 ee634cbf38dbc32bc1c5804fe5bfb58a4f405ad1c3032a204041192c2ac54321027c3b0ebe41f0c1df984912a366de178adf671345cde65bbea5d4be41fc4a5d
-EBUILD gnote-40.0.ebuild 1563 BLAKE2B e9112a82cb20c0bfa6cb0d19c2cbc811fbc42251e76f84026cb5e849d728f7042315e4d7d3cafca19dd948b043d5054da938ff87312ed3ae20e09965a991d139 SHA512 070dee31791766de946e674387c3a65e57c5385d58571b07a45d86caa4b251d892064a38d20e94aaa1ebb03c828fe363b66f562af4deb7b7dd31eba5a237ed04
 EBUILD gnote-40.1.ebuild 1561 BLAKE2B d408ae3b6729f5b9bf8e780898224abfbbe4057caa5c50d739c9fbff644f4071ccffa8017a83ced5cd2ef6dbb8aa82ec9fa2116e84b41a1fad30626f0ae772ea SHA512 11d3a079ee001ab75c7df3c382e5dc58de58db141eb5010f694f86c203f6ce4eb2ae96001738a497bc36572d83e04cf4e03e11c58a0cc07efbcc4694c694831b
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
--- a/app-misc/gnote/gnote-3.38.1.ebuild
+++ b/app-misc/gnote/gnote-3.38.1.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-# Automagic:
-# glib-2.32 dep
-# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-COMMON_DEPEND="
-	>=app-crypt/libsecret-0.8
-	>=app-text/gspell-1.6.0:=
-	>=dev-cpp/glibmm-2.62.0:2
-	>=dev-cpp/gtkmm-3.22.20:3.0
-	>=dev-libs/glib-2.32:2[dbus]
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.22.20:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${PN}-3.38.1-cstddef.patch)
-
-src_prepare() {
-	# Do not alter CFLAGS
-	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-
-	gnome2_src_prepare
-
-	if has_version net-fs/wdfs; then
-		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
-		synchronize notes."
-	else
-		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
-		If you want to use that functionality just emerge net-fs/wdfs.
-		Gnote will automatically detect that you did and let you use it."
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
--- a/app-misc/gnote/gnote-40.0.ebuild
+++ b/app-misc/gnote/gnote-40.0.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-# Automagic:
-# glib-2.32 dep
-# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-DEPEND="
-	>=app-crypt/libsecret-0.8
-	>=app-text/gspell-1.6.0:=
-	>=dev-cpp/glibmm-2.62.0:2
-	>=dev-cpp/gtkmm-3.22.20:3.0
-	>=dev-libs/glib-2.32:2[dbus]
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.22.20:3
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${PN}-3.38.1-cstddef.patch)
-
-src_prepare() {
-	# Do not alter CFLAGS
-	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-
-	gnome2_src_prepare
-
-	if has_version net-fs/wdfs; then
-		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
-		synchronize notes."
-	else
-		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
-		If you want to use that functionality just emerge net-fs/wdfs.
-		Gnote will automatically detect that you did and let you use it."
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@ -1,12 +1,6 @@
-AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
-AUX 40.0-avoid-changing-soname.patch 2136 BLAKE2B 3e9c25711ab9e5e83f3e9407fb03f8259c6bc035e384d1394319df987584cbd71dfe2970a503d0d7939ec4f7744bae498466a34512a35e1b4c1f2e783f621eaf SHA512 c723fce354f0a034f2ad4846d4b9f637f4985a03bdb7caef348328c74ab9488ef3d2f2204583248e35e0d8a27456b7327ac2e8e0ca14e0ab92e8db25e0197dda
 AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a6816326a17527d91b68d481d23ed3ad982211c07c412a61157d17cecafa591cc80482ec22abad3ce29101068bbd5 SHA512 703d9b5ca4e718660fe5af2d59a60b3187beda965e3a7b6eeaf1f7bf61013f3acde54b0ba89c8b493b1f0b1950cd52893ff1fb00a74c6d97645df29a1829902c
 AUX 40.1-build-Fix-t1lib-detection.patch 1017 BLAKE2B fbb53e5c0a0da025b0410af62ae7251d369106c39c22ca5af58854c637a9f59119b96c63e0c76c64e918385f66ec37a9bda4808a2b3a5ddae5640d57e62304d7 SHA512 f77640a39fdc6c4e6aeea312380c0b922395b938557e04d718e29e55a6f0bd7cab8efc738668051f4f45183e68298911234bc35af82f0eb3d79e681ec20712c4
 AUX 40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch 1207 BLAKE2B ebcf5f7fe0419ce853c492699b97cc17b0df17c2d86f66ccadd4aef7e08e324a79d358a81c7148b73efc6a4788eeac128532665b9f8abb41a65908771c051219 SHA512 4816954209c20debecc6d6ca20650ac0bb06979d4b0e8d7fc63bda5445372f405fabc6accf44f0c62fad37070dada8cbb157f615e093f7ec894dccabf6069a4d
-DIST evince-3.36.10.tar.xz 2430584 BLAKE2B 7c8b5e3dec7168f4ab6976022bb85041fd8cc9f55b8c032bbf03cf492d243dc49f00d6913c1f2f09498c1b4091b4be126a9367dd3ed235635e9d08e6a9ae5a0d SHA512 2a17fc1fbd18e2685c254194d0e195ec0c6126f37212ae64297fb06f30f2e07f926cb768affb4d5c9c407c4dfc43db3578ffd244c9a6e121d1d3c9b5e653b4d2
-DIST evince-40.0.tar.xz 2928668 BLAKE2B 852c532b595f50e849893670b536b5b8c25f0407a719cbe659faa3f72b51f43a0471c3df9197fa5bd11735c14e0779d8cf28a88cd79aabec4dffa797443b9819 SHA512 995693e4a6e1a3bb31e1d4f3538dc53519102a5a6afa58ba61454a1e2ca582df26bd368876210fce6fab8ff4e218305644fa7a7a88c99e1a1ca5bda8d8f1ece2
 DIST evince-40.1.tar.xz 2928924 BLAKE2B e9376c186da9fed132b820b2e9a1ef6bb0997f22abca3d7b271691291ea4870132b48075ada5a992e056193e6af51bdf95e6bbdac79c789475fb985d692f9ccc SHA512 c688ee962cfff8b024b572161bae689d25b5b566ac623abeff38b4b8e6e541ce343023ed2c1ba0df1f65d6ec9a631aac3a748c940db556dbb89ab45ac565147d
-EBUILD evince-3.36.10.ebuild 3083 BLAKE2B ff940dcedd304464ba5cb06451aa14a1c8943d45f616532e93eeca3b5f6399ff9f6949c676473646f9c4f5d863086dc1388800077022afde3497feb5bd09027e SHA512 58b7f5b0013c9fb6af17e9782dc5b9738412c5bb6c63e744ec66018e4a25dc5b997d5bd75b9e165b4df0f1eed781ea310a8005c1116e11b23f5abca5d92e01a9
-EBUILD evince-40.0.ebuild 3281 BLAKE2B 5fee649a184d6340a05f80503d4737f5a4b58f6aed88b805324a988c4bba0177a909a42fcc0d6f8cc8f6f488edbd2f75f43909968a343de60e6b2f02158ec2ef SHA512 9d2a0a6eba4cfb68a07d5ccfcac21dceb42799fc3b921f67358685d5d86b1281d68615ca820993b5d9567c4111e9befd55d03e06007f4b09e59ffcd65dd292fa
 EBUILD evince-40.1-r1.ebuild 3247 BLAKE2B 578562594a55320dd6e9d2c9f437cef0e737071cb74e396d1ee0c0e06c0244356bf1dd918b563c72c8dce2ff1d5a29d2c86361383cdbd404e912a90f4ee42b3c SHA512 492261623631a1a5c1192a26c7e3d06839554bbd389303641c7f488b3846ff5662ee06ca565c1db8ab7ab5c97a7c07bf1cc909e5f3a7da95b4498f533cda905d
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
--- a/app-text/evince/evince-3.36.10.ebuild
+++ b/app-text/evince/evince-3.36.10.ebuild
@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.38.0:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.76.0[cairo]
-	>=app-arch/libarchive-3.2.0
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-3.28.0 )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	spell? ( >=app-text/gspell-1.6.0:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	app-text/yelp-tools
-"
-# eautoreconf needs:
-#  app-text/yelp-tools
-
-PATCHES=(
-	"${FILESDIR}"/3.30.2-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
-)
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable gstreamer multimedia) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable postscript ps) \
-		$(use_with spell gspell) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
--- a/app-text/evince/evince-40.0.ebuild
+++ b/app-text/evince/evince-40.0.ebuild
@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.44.0:2
-	>=gui-libs/libhandy-1.0:1=
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	>=x11-libs/gdk-pixbuf-2.40:2
-	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.76.0[cairo]
-	>=app-arch/libarchive-3.2.0
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		>=app-text/libspectre-0.2:=
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-3.28.0 )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	spell? ( >=app-text/gspell-1.6.0:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10
-	)
-"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gtk-doc-1.33 )
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/40.0-internal-synctex.patch
-	"${FILESDIR}"/40.0-avoid-changing-soname.patch
-)
-
-src_prepare() {
-	default
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
-	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
-
-	# https://gitlab.gnome.org/GNOME/evince/-/merge_requests/336
-	sed -i -e 's:T1_initLib:T1_InitLib:' meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dplatform=gnome
-
-		-Dviewer=true
-		-Dpreviewer=false
-		-Dthumbnailer=true
-		$(meson_use nsplugin browser_plugin)
-		$(meson_use nautilus)
-
-		-Dcomics=enabled
-		$(meson_feature djvu)
-		$(meson_feature dvi)
-		-Dpdf=enabled
-		$(meson_feature postscript ps)
-		$(meson_feature tiff)
-		$(meson_feature xps)
-
-		$(meson_use gtk-doc gtk_doc)
-		-Duser_doc=true
-		$(meson_use introspection)
-		-Ddbus=true
-		$(meson_feature gnome-keyring keyring)
-		$(meson_feature cups gtk_unix_print)
-		$(meson_feature gnome thumbnail_cache)
-		$(meson_feature gstreamer multimedia)
-		$(meson_feature spell gspell)
-
-		$(meson_feature t1lib)
-
-		-Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-}
-
-src_test() {
-	meson_src_test
-}
-
-src_install() {
-	meson_src_install
-}
--- a/app-text/evince/files/3.30.2-internal-synctex.patch
+++ b/app-text/evince/files/3.30.2-internal-synctex.patch
@ -1,28 +0,0 @@
-From a4a831f998d513c6d01394d9b106aa42faf60dd3 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 23 Feb 2019 21:05:28 +0200
-Subject: [PATCH] build: always use internal synctex instead of automagically
-
-We don't have a separate synctex package and would have to pull in
-all of texlive-core; so instead of fixing the automagic use of it,
-just remove support for external synctex, as that's easier.
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 13bdd600..e5334319 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -539,7 +539,7 @@ GOBJECT_INTROSPECTION_CHECK([1.0])
- 
- dnl ================== libsynctex ===========================================
- 
-PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=system, has_synctex=internal)
-+has_synctex=internal
- 
- dnl not found? use internal code copy.
- if test "x$has_synctex" = "xinternal"; then
-- 
-2.17.0
-
--- a/app-text/evince/files/40.0-avoid-changing-soname.patch
+++ b/app-text/evince/files/40.0-avoid-changing-soname.patch
@ -1,66 +0,0 @@
-From ca4b7aaff690095971de96370317fdf1bcd3af8f Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Fri, 26 Mar 2021 14:48:51 +0100
-Subject: [PATCH] Avoid changing soname
-
-Bumping the major version to 40 in commit
-288be740b5bbb59757db5038ab435ceb7a334dcf inadvertently changed the
-soname for shared libevdocument and libevview.
-
-Fix this by making the soname calculation independent from the project
-version as the library ABI hasn't actually changed.
---
- libdocument/meson.build | 2 +-
- libview/meson.build     | 2 +-
- meson.build             | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libdocument/meson.build b/libdocument/meson.build
-index 74fe2fb1..e09de7fc 100644
--- a/libdocument/meson.build
-+++ b/libdocument/meson.build
-@@ -138,7 +138,7 @@ cflags = [
- ]
- 
- libevdocument = shared_library(
-  'evdocument' + ev_major_version.to_string(),
-+  'evdocument3',
-   version: ev_document_version,
-   sources: sources + enum_sources + [version_header],
-   include_directories: top_inc,
-diff --git a/libview/meson.build b/libview/meson.build
-index 20179aff..74c86d51 100644
--- a/libview/meson.build
-+++ b/libview/meson.build
-@@ -82,7 +82,7 @@ if enable_multimedia
- endif
- 
- libevview = shared_library(
-  'evview' + ev_major_version.to_string(),
-+  'evview3',
-   version: ev_view_version,
-   sources: sources + marshal_sources + enum_sources,
-   include_directories: top_inc,
-diff --git a/meson.build b/meson.build
-index 1ed37e96..cafb9023 100644
--- a/meson.build
-+++ b/meson.build
-@@ -43,13 +43,13 @@ ev_document_version = '@0@.@1@.@2@'.format(ev_document_current, ev_document_revi
- ev_document_current_minus_age = ev_document_current - ev_document_age
- 
- # Libtool version of the view library
-ev_view_current = ev_major_version
-+ev_view_current = 3
- ev_view_revision = 0
- ev_view_age = 0
- ev_view_version = '@0@.@1@.@2@'.format(ev_view_current, ev_view_revision, ev_view_age)
- ev_view_current_minus_age = ev_view_current - ev_view_age
- 
-ev_api_version = '@0@.0'.format(ev_major_version)
-+ev_api_version = '3.0'
- 
- ev_include_subdir = join_paths(ev_name, ev_api_version)
- 
-- 
-GitLab
-
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@ -1,5 +1,3 @@
-DIST gspell-1.8.4.tar.xz 424356 BLAKE2B 031787c4f5c3f3cfe21d5f74ec72117818da43313c5e6dffb79581ca07033aede2ecf236ffdf2197938d62727c5bd3913d1362e02be7109b0d498304949e1d44 SHA512 adb481590442d81040151746c7747791d76248b1b35af1702dc5389efbd2e0c6bdda070b8e84384d22f4922b5a382ac2c6519e425f417ec85c8efbe22dc38c82
 DIST gspell-1.9.1.tar.xz 424252 BLAKE2B 436e6af50f7d1058dd7692c22b5a5e18c25cc76ea6816193e48728f7e1d55ef29af26127403a40d594a2125e4d3e1ee889abe067d2c065de74ae95ca431e5fbe SHA512 72f1fb384e02bb73397b457c3e8a7b98393c9fab5c0dad07f84d1db3f6b75c093663cc83c13fefe868424c503abc2fb89c8b045d0495dd43ddcedad025f23bca
-EBUILD gspell-1.8.4.ebuild 1477 BLAKE2B 1f646c4fbff986066b6ac3304082a6fd724dbec71bcec313d17039c2d0849f9ef7ee1679c633d8dc98b38dfe12db10358f76a1d5bd93bdff34ceaa6714fc4e36 SHA512 464249fffd2f300ccccd0f59443010b132328bec054863760a097816a100588a83af5df29162351c2ce37315ceb9d3ecc034d1501245b0441a404811b98d82df
 EBUILD gspell-1.9.1.ebuild 1491 BLAKE2B 1451fb6f626d5b5a2d868ce41b931ec5f2c06e3f8b058444735b608425b89fd9c56c5d2d2b4e812935bcc98cb0efc5fb55ae38a5125353da8893da683dddeddc SHA512 2151c268607ef4ee5ae91a549d09764ce7eea36a471002e301a662231b44c57a03d2cfaf74b8ccf2e16726109e8e6f5ed3d153f7ba7c5398863ede4f379bf479
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/app-text/gspell/gspell-1.8.4.ebuild
+++ b/app-text/gspell/gspell-1.8.4.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Spell check library for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	app-text/iso-codes
-	>=app-text/enchant-2.1.3:2
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.20:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? ( app-text/enchant:2[hunspell]
-		|| (  app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) )
-"
-# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
-# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
-# however a different backend like hspell or nuspell + their en_US dict might be fine too,
-# but we don't support them at this time (2020-04-12) in enchant:2
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_test() {
-	virtx emake check
-}
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@ -1,5 +1,3 @@
-DIST gtranslator-3.36.0.tar.xz 2121776 BLAKE2B 745ae74a9a1a47af609b30712f5e6e99474081da9136cc15ecf0bd121e0dd01d326574466ddf4551df7255247a6a895dd468b085cee91735fe8883e4feb16c97 SHA512 63393a33db031ea549763113d6bc55cd00c081e671a31654d225968d8d31d671ca7e577b4df8336603fe2c769c5c443e9ebf69d558c888438d194a503e044044
 DIST gtranslator-40.0.tar.xz 1509940 BLAKE2B dbf4c4a8765167177959c058b29563a2c3190e103a9f462a976bfc416c7cd995c649b549a40aa6f7c9b26502c5d56f3e4252a52919de979167f7adb5381604fc SHA512 214c5360ada6c98e9e7cd6a653bdc9a1dc5dd6cca995295369f8f9aac7261680fa521f2d2528f275233479d55ef1b03ee9ddc4a4e734e27a25bb24172c855a47
-EBUILD gtranslator-3.36.0.ebuild 1047 BLAKE2B 078ac2c56e4a4cb779bbb195f4bf5a04735c18eb7e4cc3250ba2d2b2e2a5f456aa0688a20f3787a5c5e8a1b364ae8c06fdad7c4061f2a2e69e716c7120b75039 SHA512 5810d411679934605ac7b8285ff87abedd8eb1ad443392278d8fed50dda3557b8bbcc006abb614879d07c4ece98c5d9a4d7c87ec801ea5c748d17edc4be73fc2
 EBUILD gtranslator-40.0.ebuild 1082 BLAKE2B 43c21ae6404f66834f7c0d51fff3c0b185e391c14df85b459159a8de4b6cfbe05618dff11b28438882612e82e1ec83c1999a8ab31207845bf93977d2932a8c16 SHA512 530b34d6b13f54b5480f5819b6f3b776553c96e2455a41fd4b88c9c16795145d731679032f06aa1c772f5ce090d6e26cd4c7c0b417604d82c92b0e330550ec8d
 MISC metadata.xml 812 BLAKE2B 9a347a373b7b39cd522c7bcacd845252798a5b9b06cef89ce14b71160e6b6673d65d5d9eee806c52aa104dde2d937894cb0e12a8d51b8d53feecb4bd52bb3db2 SHA512 e9cab01e3126862ab79cd223d87ed3bb927844b6a0cd7a40e94dc6ece54a2e2c4fe820032b4dd3c25b876a6704c866f3429f5ad98d82b9893ba9337a3a85d6a4
--- a/app-text/gtranslator/gtranslator-3.36.0.ebuild
+++ b/app-text/gtranslator/gtranslator-3.36.0.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME Translation Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="gtk-doc"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2
-	>=x11-libs/gtk+-3.22.20:3
-	>=dev-libs/libdazzle-3.33.90
-	gnome-extra/libgda:5=
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/gspell-1.2.0:=
-	>=x11-libs/gtksourceview-4.0.2:4
-	>=dev-libs/libxml2-2.4.12:2
-	net-libs/libsoup:2.4
-	>=dev-libs/json-glib-1.2.0
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.28
-		app-text/docbook-xml-dtd:4.1.2 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/app-text/openpaperwork-core/Manifest
+++ b/app-text/openpaperwork-core/Manifest
@ -1,3 +1,5 @@
 DIST openpaperwork-core-2.0.2.tar.gz 67268 BLAKE2B 85fcd8d4e1c8a054267b28eb5ec826617e13f93bf7cd54d6defffd62be65fb0306a0ae4fadb1cc8e875c23933c3559e41aab46b58a333489fed0174776ede597 SHA512 fb47d1d8b7747274a6b60248180786f4142110feffa1a8f886b0486a1e1cefbe11d06e3ec1f3a3ee33e38cd40d8e7460afefb466ee938e847deb2518d642ed00
+DIST openpaperwork-core-2.0.3.tar.gz 82231 BLAKE2B d113324f5f0f03d0a7c1c9f28bc4bdfa8dc296104f4f7aef4f172ba9ff94bc02caad928aa3db0f314df64935052b6dc4995b8d6e78e2c33367b080321414f40d SHA512 613e1b07b0ef4be3a429cc88f1fed41d1d79adab0cad70ee4e1d74c06cb8917c7fc6f8d2ffca5fcc95f97fb5c0690cdc21aa5cf7966e19cfb5ae5d2ab0fec6f3
 EBUILD openpaperwork-core-2.0.2.ebuild 491 BLAKE2B 9c2f7ecde6a10693a0f7496ce60a4ee721fb987dff963d7a638b1b26f471de31a1d3dc2dc936ed5ff122fa574596b12b51f37cfe91aa05833ae83c0732ab1e01 SHA512 1f68412e29852a2abd6f62907735e813757f1efecbcec7b3575b669e3ba56a49345d1fb846190c3cde642e6e9088a8b3b7456dcef0770580bd692746f0cf9f93
+EBUILD openpaperwork-core-2.0.3.ebuild 491 BLAKE2B 9c2f7ecde6a10693a0f7496ce60a4ee721fb987dff963d7a638b1b26f471de31a1d3dc2dc936ed5ff122fa574596b12b51f37cfe91aa05833ae83c0732ab1e01 SHA512 1f68412e29852a2abd6f62907735e813757f1efecbcec7b3575b669e3ba56a49345d1fb846190c3cde642e6e9088a8b3b7456dcef0770580bd692746f0cf9f93
 MISC metadata.xml 343 BLAKE2B 3b3ef7b9f3c0aff87d5f7f743a17d16a160ce7e03a21ad0f9e61127e591e0dce9a2a9b9483e04ad56779c7c848c5ffcf1f62ba06edd6780b9263fe066ecf6b65 SHA512 8c2967efd1bb4b024bc97b76fb4e3b92a01b08c82e12b5f86015eeadba7a22d5ceea1c9219d7517f79469308afd62e2cae20930931d918afb3b45dfc6400f8ef
--- a/app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild
+++ b/app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core part of Paperwork (plugin management)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/distro[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
--- a/app-text/openpaperwork-gtk/Manifest
+++ b/app-text/openpaperwork-gtk/Manifest
@ -1,3 +1,5 @@
 DIST openpaperwork-gtk-2.0.2.tar.gz 37740 BLAKE2B 40e1570364dd23cda97184211205186dadf7826624c1d8846a7fb31378fdf0ea9aa715c07adbf657eea9b08f4c583d86eb248b8907317b572bea51ac52c9a54b SHA512 c24f19a47f1ea1452f8efcf5cf1e4492f49a4f1c7fa7572f09341f4a8f70c2e9cfea478c32635d4ad998be90a069a55c4fe2a4c0e12a9835b9fa7e6b707494d7
+DIST openpaperwork-gtk-2.0.3.tar.gz 50590 BLAKE2B 69fd8b9b6b964a375e511dd7ef535a8fea58e6183165a4b7b96239a6a35486f791ca9fc8aced7a5b84cc21cc1ccab12c114276de87e1d1cf55b2565dc44da7fc SHA512 8da5651b7d949dfb4fa32ef84760530bba6d718674e6616ae80d1a274ae51cf5e28a55f7e08fc34e4681f61de8aef9d2094f2c4aa4862f8989b7c81da47e48c8
 EBUILD openpaperwork-gtk-2.0.2.ebuild 578 BLAKE2B 7daf9f8ef3265a47c0e9372c0427c21ae6f60d8493557979584a5b2f90bc1da6f4a93189801a9e9d44b40b9ee50624d52be53f9eefd2782b5a7b303e5a2bc1f2 SHA512 9462ee2ffcb3ceaae642934effffcb2437af109cc993ec0a65918d0ce90d36815845858d279788c43dc10e39dbfb0c139b7edffe977aafef5826354fad859400
+EBUILD openpaperwork-gtk-2.0.3.ebuild 578 BLAKE2B 7daf9f8ef3265a47c0e9372c0427c21ae6f60d8493557979584a5b2f90bc1da6f4a93189801a9e9d44b40b9ee50624d52be53f9eefd2782b5a7b303e5a2bc1f2 SHA512 9462ee2ffcb3ceaae642934effffcb2437af109cc993ec0a65918d0ce90d36815845858d279788c43dc10e39dbfb0c139b7edffe977aafef5826354fad859400
 MISC metadata.xml 342 BLAKE2B dba2557bfd27cb470cdb5a6c4cbdb2b444a02b3f9dd28186075075a31613f33c2f308657c6908060a20967c569a5c2c310fd99ef83d2a2762b4df01bffa4258d SHA512 25e1a179c9d45ca0a587fd60bcd77d05b66b20aa001ed0f45c2163b2f224b486ac337af7bcc3cc2aca4c3a236fe0f7984e02fc2089004062182df69ca33ecc07
--- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild
+++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Paperwork plugins"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@ -1,3 +1,5 @@
 DIST paperwork-backend-2.0.2.tar.gz 1293642 BLAKE2B 3785f69e941c14c1146ff1c9a5afa149559821f915ff1068b38f94c3fc3fbd591c2144f24070232e885b616eeb88b5dd1a7c86d608d9ad42f6512688db79b1fe SHA512 36261b89078e7ca10ddda3ad03871db34931d8a04f16edd663873a2f7c46b527bd607c27d0f4ff005ed869c16e0b7065992e629e257677b46d5ccb4b9a1dc7b2
+DIST paperwork-backend-2.0.3.tar.gz 1315449 BLAKE2B b5f788d1f3dd02ae9693ffbde6909fb343d5d68555c2d7225300371d545fc96550a34d5214b7b68594e6c5558aad6c50b38de26e444a7a2ca4f9318a7fbc4c84 SHA512 ed705910a09aedc124d6f14c1fd6d76d5e3790d2d01363bcea3cbb28955c1a08725276f09828ce1e286df06d7310b78630b95201146940d1680395c6420190a6
 EBUILD paperwork-backend-2.0.2-r1.ebuild 967 BLAKE2B 02d46b13c45a45c4b67fe811bed5b79fc9b3ebc89723db821a67d26b2224bf91dad806652fa2a99f558ddcf045525279ff9e5a2f3fb903a1c07b62cd49003995 SHA512 4f0bba571dbdfa8443303bcbd5148480bfa900b415baef8b1698af2f62bcc2268827816abb25b122b960fee955898a26429eee22cef99245930fd06ae1b5d119
+EBUILD paperwork-backend-2.0.3.ebuild 966 BLAKE2B 031fa22522183602901ef701f4f917da55d622d2ba5fd45549c848fc8bf624bcec5e5d90347f06e47ff60e96dd07b7b65c5c2673c24dbe785f0a78017d220602 SHA512 84237765d3e21a2eb6cca39b4cba61d5721be97d9de40a7487508f84e7b03b14a36e8cf9438229f0688d0d41926049abe72e5e6a4ee87251ea36f080b6b7aa08
 MISC metadata.xml 342 BLAKE2B a73c59727e066a3ffa217b622c58343a42d34351791f6619aa94d1a659b9d43ccbdfc9682901fb074c876a3e66b19403c02657aac3956502f400a93bd73ba6b9 SHA512 5a3a63678f9d83107a83c1bc6e4181544627279e89b3b589fcd2b745221dddb0201779f7b8c3ec1d7b2812a92ec7ad8d290ba58c11860f46f3c5329840bf1730
--- a/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]
+	sci-libs/scikit-learn[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@ -1,3 +1,6 @@
+AUX paperwork-2.0.3-desktop_file.patch 604 BLAKE2B 7c7a4b8a7fbae4b7d9813b2e5c10edea33a796fdf4cd675d2842f73390e03e5be936c0dc7fc230b06322448791160843bcdacc303b417a12f08081a12cd33696 SHA512 f43469849e1c7926047c515650dfcf417af201457cc872127776665e36e16bbdcf7ad972c370c0bef4ddb1957ae24d1eac49a5f99a0cd56ca9788d6824fb3021
 DIST paperwork-2.0.2.tar.gz 6222075 BLAKE2B 6dba798ae2b18ba81891c8f9c29e1e2bc8670f24a65e554aa169f05fbf1a89382b9ea24abaa1784da657ac5b9d9d145ffbadaff86ddc3583023f164ffb40c351 SHA512 bde28c167eac5b134b4bdf0f2ac8d93eca4f99c1881ca0edc105c33674114b3a4e3508a1f45048f45ce1c2f6b690a0f765c1b980dbe42c7e1282172f12c3a853
+DIST paperwork-2.0.3.tar.gz 6224520 BLAKE2B 099d76893b0b89e5f7914456ec31346f28335333361a4528efed6ab4c596fa24893d375557d6c1e89f7c83f4a1acac161004138b7e1537aa2f3cb2de0460bcc3 SHA512 d5cf30ef8a6011817947c9878d4defe93a0c82f77562fd707c198d944657db754ba57d703ae3f931ac9e2d7f9f1eb7f9f9093a1d26f25dac0e336b03f9b25ed3
 EBUILD paperwork-2.0.2.ebuild 1026 BLAKE2B b9b3e3cd09c0b0575b566119dac1f192044b958c1bfd6e4ec16a588babab28617c3ca23dd3dca7b9e0e4a5efb5355a2315f8d246394b8a12fff02f427097681a SHA512 5814f5c4c2e96fb2fb2204f1423426577b8032f3e536bed454f26f89a6f4abb368305e41eb0d531df776751c0aa9551aa65bcd0c6c32808efff84d2d5cf346f6
+EBUILD paperwork-2.0.3.ebuild 1288 BLAKE2B 334f807727117b11e035a83240cfb6dddfe3db7a9298a189e47e308cebb5559ec3c4745404049323096c3128ad545f0292ab81b530a14ca771cd0ce44cc9ae29 SHA512 0bf82bcb3b9988b5d7b15916abaaa67ad368fdcce31e1721a572fd6753e65924bb59e942f9072aec8030768d98717598cf08e398d758a32e728cbd864a47ad24
 MISC metadata.xml 719 BLAKE2B c97e258d05155df5380f08accfa9736ce44514ef9fa9b0fd0a4d5966a48df7ae940902ce929893ffb828f30883c4591c93a2bc5c8ca0c7a6f636e477e8f52eae SHA512 a36e28273a451c529451602b80ec70bca26d2db40a683e6fc7297db185c88696cc359c3f80951ff9580e81e7e221379913f7d1db3af3d00fb02128e1994e7f4d
--- a/app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch
+++ b/app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch
@ -0,0 +1,12 @@
+diff -Naur paperwork-2.0.3.orig/src/paperwork_gtk/cmd/install.py paperwork-2.0.3/src/paperwork_gtk/cmd/install.py
+--- paperwork-2.0.3.orig/src/paperwork_gtk/cmd/install.py	2021-02-05 17:46:17.000000000 +0100
+++ paperwork-2.0.3/src/paperwork_gtk/cmd/install.py	2021-05-30 12:26:21.316348652 +0200
+@@ -122,8 +122,6 @@
+         # PDF and all image formats supported by pillow
+         entry.set("MimeType",
+                   "application/pdf;"
+-                  "image/png;"
+-                  "image/jpeg;"
+                   "image/bmp;"
+                   "image/gif;"
+                   "image/ico;"
--- a/app-text/paperwork/paperwork-2.0.3.ebuild
+++ b/app-text/paperwork/paperwork-2.0.3.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
+	~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}]
+	~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	media-libs/libinsane
+	x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-desktop_file.patch )
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	PYTHONPATH="src" "${EPYTHON}" src/paperwork_gtk/main.py install \
+		--icon_base_dir="${ED}"/usr/share/icons \
+		--data_base_dir="${ED}"/usr/share
+}
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@ -1,5 +1,3 @@
-DIST yelp-tools-3.38.0.tar.xz 213692 BLAKE2B 87da439f864df8be78f8c2ae3fae387e9d70a5dca7f4ad6b584602fd4a6beec49cf0403dd7a53045d38cfd1ac6945802032689092f2624ba8b421ab5d4d43fd1 SHA512 2042e37f8efbe9974f5a507910393b837a0b9154beb918a5e8d145205fb519c8244bb405cf328ff5014287086be5b6d33ad631951bd0e950c2ad9efc60065d59
 DIST yelp-tools-40.0.tar.xz 38708 BLAKE2B d9533fefc6a9416ed6f887971db62a7db6baed4f65aaf1e03d20c98fa23efb3af9f10189af0284bde3837f58f662f4ca4be8275d597a7c799a14585c87e6ec10 SHA512 b89e514cdc2c6ff96097af0cab5694e9f1dfd2a125e08f99a69c0e7dd51e1e1a859c2e6eec656ecea6103bfc65733e1256a77ef992454db4a554567b46fa2628
-EBUILD yelp-tools-3.38.0.ebuild 642 BLAKE2B a513dd1e389863f653724f48fcccd262e54de3b81bfb01eb80d3a94c3a0ee286e1ca259b6917c13adf47f78a05dac2c841582ad6a8f62af1ef36b965add177d6 SHA512 549c5a7942fee9c90764fb94a6f4de995cd83832947eb666688b9d38577f6290743f20c7e5eff5423a039bf75f90e84ea83a9bfa3a488dbab64c14df38066dee
 EBUILD yelp-tools-40.0.ebuild 930 BLAKE2B ae69d549479ff89b360cfe046bddb22459e38ad6cba2d5da38a0b8e5f5b2d9bbc4425f6de60975257446857196c088e467344cf0e7c55187a0bca0a61526bd47 SHA512 789e8f4141f3094d47f835359b8d495c62436bd0063f96b0cd9ac5ab6f70302de08790aad0375d352f33099a092d0162a1335f0e9cdfde23aff8228a2c4a3855
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.8
-	dev-util/itstool
-	>=gnome-extra/yelp-xsl-3.17.3
-	virtual/awk
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@ -1,9 +1,5 @@
-DIST atkmm-2.28.1.tar.xz 688912 BLAKE2B dd18c2e0151192eb56cc81ceb6d8da2b41850e9c31e357f14822ac99418f57237e5ffe876b0c0b05768ad93ffb9d2e5edfddd518c838a1cc916b40df7b7c0933 SHA512 9f336b594930b62e9789011f4584f569d40b6153e5f3f04ac0f5b48704c50fb7b99d3f5d8639eec8dfd42b9c268df3cf21c2ae2372fdb781729fa29c57365916
 DIST atkmm-2.28.2.tar.xz 689944 BLAKE2B 24a71e98af483ed5a5a0c517fecca775ad0206b972fc3906b9b002910ca07dd1d1ae1a9aa6f044231470b484d36d580d8d263ac7b8ddee668d3a0e1845bd47b0 SHA512 df20b89b603a6ae419db24b21acbd6a9d0e91c07e374b4b774f6a67581ce1581affb0d079a264f0d7f2e6d8b63210639dd7aa15e7e94fb5904d161e9a2aac286
-DIST atkmm-2.36.0.tar.xz 735400 BLAKE2B d8b821fdddd27d10f1995aa6bb8ab8a2ccc3357c7553656e30ee45e4ad677457b7a64a86ee9511124547c1680b5f95c3fd306fb315f3911787a6f0817ca5e130 SHA512 8527dfa50191919a7dcf6db6699767352cb0dac800d834ee39ed21694eee3136a41a7532d600b8b3c0fcea52da6129b623e8e61ada728d806aa61fdc8dc8dedf
 DIST atkmm-2.36.1.tar.xz 736828 BLAKE2B 5dc5d8fb9a29fe16bad0aea7737110df08f10504b5994239015a85ebfd98b6e38414259ecb6819e1dd9459fdf49e0f6b85c5ed9936802bd56d5c154c91443add SHA512 23c831afac6bb9a0f9f2e622f8f9ffea29445a33b1cd650e0c07ee77e60b28ae5ee978c029e8e0f9b94e9ff4679d69ebde833f15e0a5403d97914cc7ccf98a6a
-EBUILD atkmm-2.28.1.ebuild 1013 BLAKE2B a3c70945d9d5ff0627f91acd206195a74036c5c8e537726d8cb2f0796a600f526ceadd344e47adb600c77be9a8a633ed5874226f3c7c80ff7cce82e93a9f2729 SHA512 8aede60c462a167a5395795b1d9582f23d527065414355ffad99c30c9682ce34aca64c2f611d485714d1782fab1c0a85e19822261eb92844feaa5fdb828afb10
 EBUILD atkmm-2.28.2.ebuild 1013 BLAKE2B a3c70945d9d5ff0627f91acd206195a74036c5c8e537726d8cb2f0796a600f526ceadd344e47adb600c77be9a8a633ed5874226f3c7c80ff7cce82e93a9f2729 SHA512 8aede60c462a167a5395795b1d9582f23d527065414355ffad99c30c9682ce34aca64c2f611d485714d1782fab1c0a85e19822261eb92844feaa5fdb828afb10
-EBUILD atkmm-2.36.0.ebuild 1017 BLAKE2B d3686cf5ea906f85b8dbc952769a89b81b27ce6a5009c092db272e614c58303c3bb153d29a484f6fdf37bdfbdfe521bcb5e616543146362c91dbdd8037bb3f93 SHA512 efc463b57e62eb5829d9c1ca48bc36d76fb11e00bc234e8760172ebe89bf90f0244b9c0370c062dc2a7cfc53cd7cd0f7c79afbc209769ea897c56b16db66d1c7
 EBUILD atkmm-2.36.1.ebuild 1017 BLAKE2B d3686cf5ea906f85b8dbc952769a89b81b27ce6a5009c092db272e614c58303c3bb153d29a484f6fdf37bdfbdfe521bcb5e616543146362c91dbdd8037bb3f93 SHA512 efc463b57e62eb5829d9c1ca48bc36d76fb11e00bc234e8760172ebe89bf90f0244b9c0370c062dc2a7cfc53cd7cd0f7c79afbc209769ea897c56b16db66d1c7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/dev-cpp/atkmm/atkmm-2.28.1.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.1.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
-
-DESCRIPTION="C++ interface for the ATK library"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="
-	>=dev-cpp/glibmm-2.46.2:2[doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.18.0[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[doc?,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
--- a/dev-cpp/atkmm/atkmm-2.36.0.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.36.0.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
-
-DESCRIPTION="C++ interface for the ATK library"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.36"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="
-	>=dev-cpp/glibmm-2.68.0:2.68[doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.18.0[${MULTILIB_USEDEP}]
-	dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@ -1,9 +1,5 @@
-DIST cairomm-1.14.2.tar.xz 603804 BLAKE2B 37417fc13f3213c1cd51ac2b0f17e0624c0592f6115a66c96295b6fa2f9974bee7c138f5087b130211a6e4f9fba045404d85e9aa08a36d9000415132400d4da8 SHA512 aef374fca25ad22770407e36512046b266d71ebeccd47fb629cfbf2f67783aa314bb335b972088a88d98417a4774d6f144cd2769c452f8aa23770eae08dca592
 DIST cairomm-1.14.3.tar.xz 604572 BLAKE2B a626ee20a229c4597622e7ead3320e5ff971632548488e970b877712d5579731093a14791a13416bec783e180a4f8432be1a743c7a5d77af2fdf30fa36ee3caa SHA512 8dc8a0de733904742c54d4935b596d4103f2e498c6735894bc6a5a81eb4962c6ea944bad94102b18b25850f78e948d38f117c566b197bc76da23a4e88b62ee4e
-DIST cairomm-1.16.0.tar.xz 579604 BLAKE2B 3aaac8039d13f13ef8fb844e38cb0cd9b0565559544c7a4cab544a46f8f8bdb6d4ee1b8318ec5d9991c33264cd3335a8796e6a49553735516a184565875e1d08 SHA512 51929620feeac45377da5d486ea7a091bbd10ad8376fb16525328947b9e6ee740cdc8e8bd190a247b457cc9fec685a829c81de29b26cabaf95383ef04cce80d3
 DIST cairomm-1.16.1.tar.xz 580020 BLAKE2B 219e83fb328a73cc7c5801aa155156e65245fbccfb3899d98573266f78f9f489ef968fac3c8c577fa98fbdc61af6d873293783c41dd00046e5db327443bdeda2 SHA512 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757
-EBUILD cairomm-1.14.2.ebuild 1189 BLAKE2B eedd45b0933749fa2adc2c51d326434ca2deee616821379dcc27753970855470554c213155bfc5f40b2387c2c85c3748bcb593c696842385007d8ccd9b010cb2 SHA512 53832cc83796fb52035bbf68d9aaa7a89fcf9269e8c582f5b23491dd01b2c4d11f990b21434afaaaa0eb4bfec9df8b28907494b6a4735dda9be0ae7bd4e96faa
 EBUILD cairomm-1.14.3.ebuild 1189 BLAKE2B eedd45b0933749fa2adc2c51d326434ca2deee616821379dcc27753970855470554c213155bfc5f40b2387c2c85c3748bcb593c696842385007d8ccd9b010cb2 SHA512 53832cc83796fb52035bbf68d9aaa7a89fcf9269e8c582f5b23491dd01b2c4d11f990b21434afaaaa0eb4bfec9df8b28907494b6a4735dda9be0ae7bd4e96faa
-EBUILD cairomm-1.16.0.ebuild 1191 BLAKE2B d25ecc89918250e42b368274c0fa3ae80373e11dbb57ec7eae80711ac3e7db005a12b8ef8105cfc707a045267d51bc26dee8a28d18baa03a2023797c9a78e56f SHA512 440ef8a3e993a42fa60783bc733f3410e870e446112f6f08da0a9ae4072992d297428a8986472484fe9555f867064cf68d29df525e98a72b316784e76393bfdf
 EBUILD cairomm-1.16.1.ebuild 1191 BLAKE2B d25ecc89918250e42b368274c0fa3ae80373e11dbb57ec7eae80711ac3e7db005a12b8ef8105cfc707a045267d51bc26dee8a28d18baa03a2023797c9a78e56f SHA512 440ef8a3e993a42fa60783bc733f3410e870e446112f6f08da0a9ae4072992d297428a8986472484fe9555f867064cf68d29df525e98a72b316784e76393bfdf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/dev-cpp/cairomm/cairomm-1.14.2.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.2.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib-minimal
-
-DESCRIPTION="C++ bindings for the Cairo vector graphics library"
-HOMEPAGE="https://cairographics.org/cairomm/"
-SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.6.0:2[doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.0[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[${MULTILIB_USEDEP}]
-		media-libs/fontconfig[${MULTILIB_USEDEP}]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-		-Dbuild-examples=false
-		-Dbuild-tests=$(usex test true false)
-		-Dboost-shared=true
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
--- a/dev-cpp/cairomm/cairomm-1.16.0.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.16.0.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib-minimal
-
-DESCRIPTION="C++ bindings for the Cairo vector graphics library"
-HOMEPAGE="https://cairographics.org/cairomm/"
-SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[${MULTILIB_USEDEP}]
-		media-libs/fontconfig[${MULTILIB_USEDEP}]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-		-Dbuild-examples=false
-		-Dbuild-tests=$(usex test true false)
-		-Dboost-shared=true
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@ -1,13 +1,5 @@
-DIST glibmm-2.64.2.tar.xz 7438116 BLAKE2B 6ff458e90a5dbc606a2e04ecd3589262a1b96e827dba245985467818a7a4ba80a9c4cb15686fe479636cb8ce7e1db3334195d6334d7ec56327076cad87e22170 SHA512 0130af9a16981a54630150db6f4b1a95458d72d650c5e4781ee97ce624ec98c600b79ebf234d212e025781453fd11d78b9e8273235ffa143397423418fe970cc
-DIST glibmm-2.64.5.tar.xz 7491108 BLAKE2B 3c0f2215542a6ccc65c37d566856df326b7c0d45999e525df6153862edd0841c501c64fc3cfd0e4c3f1bae29bbaca1eed44738acc11b3f1515ffc8a396b0791f SHA512 e90bb722a35292b0fc54dff82604ec8d23a9e72b08581de14fd515539392ed713d0691352bf7de42d5027579959f76b268cdc11a76a3d3033ae8268f486ee817
-DIST glibmm-2.66.0.tar.xz 7507608 BLAKE2B e6c8f9bac453e81a0a80850fe13b32751fd9644db40acd9d6a45e96f52cdccdbed633ad1ffde566103eb22af9cb073da11368d5c11db237d43127c0962768a64 SHA512 e6b38847a70d61412e7013a04fae2db1163cf746c1b8cb6bc43bd6985d66c1859ceb74dc2ca070ca88e5e4cd443325ccf8200c14fad9af47e33b5b49a0bb854f
 DIST glibmm-2.66.1.tar.xz 7509820 BLAKE2B 4750940093cadbae7c32d387ac8b16c8230eb08ed1645e457edfa27542a2e8a01d70de08bb41d1872dd1f03d1506bfaefc2af582250ca64ad480ce5f98f20d56 SHA512 caf57c2c9d163fff45041c33ed70d2692040d7bea44660d68e8c16a76be2609e0f857a5e16ad5220a0ec681a560c864dc86c2988a2c40741b4f29c9fe5b7d8b9
-DIST glibmm-2.68.0.tar.xz 7652260 BLAKE2B df87b3f3d8cd74b693f843dec15d5376f2a755b0a72042983383c15cca9fdb90c2fed6320bf0f3fe846fcda5be3ee15c0fc1b683d29cebe64e8dcdd101fc9bf0 SHA512 a13121052315e949acf2528e226079f1a2cf7853080aec770dcb269e422997e5515ed767c7a549231fb3fa5f913b3fd9ef083080589283824b6a218d066b253e
 DIST glibmm-2.68.1.tar.xz 7657712 BLAKE2B a8141e53f89c981a9916d5f71dfd8c6d08e45a653b98c507acaadfefbedf2f22e8130a722f3398f5e0dff8196ffc8efa6567ebb2c8290f7373e34377e281db18 SHA512 ca164f986da651e66bb5b98a760853e73d57ff84e035809d4c3b2c0a1b6ddf8ca68ffc49a71d0e0b2e14eca1c00e2e727e3bf3821e0b2b3a808397c3d33c6d5c
-EBUILD glibmm-2.64.2.ebuild 1466 BLAKE2B 1f88a4ed53ab42adc54ceca53f1766f0a6f4d8207129142f3f71e21ff3c561ec8bf9a935f827dd14d2bab1f2fb5be87a9b47deb8f89c555a0d5eabc96b3f2106 SHA512 4e5ea2477f1ab5ddaf6844dd765f2bdc127d9e4453b289ed51cd1eeab5ff8e9e0216226e35a11cc487c00caf9539970b62c5f6982fa64980c760a64d7d186d64
-EBUILD glibmm-2.64.5.ebuild 1536 BLAKE2B 90643f5aa0dc607869bf09b3a0355bce6bc1fdcb4daba7cfde5b330c8fdb2bef903b146af47338da39618a4104b11d9bdd1efc5eb34b2b1860c5c4d456872565 SHA512 8084c94c8757bd59d16a0e5bd5f701d5ae294aab79a8bdd5c320639cafc751a540cf6ad961c184066f9b826d2d894697f44c3f3cb740778669c73b13cbf0a854
-EBUILD glibmm-2.66.0.ebuild 1402 BLAKE2B fdfe6c6ff707947a55c50e8cd805fac966dc471988ebede5467e962d3b75b1da854f5d468175a0d10c5df2ba419e8cb8fde9a85a628d013934d4b49155fdaff3 SHA512 e8b55f88c0c68e254c0e41c70b927765bafb42cdc2b5434fa30217dadc2c45c276e4661d9f90136cc6258549244eb86cb82451640f3801b15a334602e39c6e63
 EBUILD glibmm-2.66.1.ebuild 1395 BLAKE2B 16be343fbaeda528b087a7013203ed134caff3cd4fb79c4eef7347029ec5ff299c9a14d62dd65925e160dfb8be1d174354ce2a3a283b20fa48e1da8cd680399d SHA512 d5e37a7e0528197c5a67b451c43936bf57c6918dadf65f59c660ca62bc6d92623d02bdfbe65deda74a43c6263cb1e8fd97ddb0d929134aa60134aa1fda29a456
-EBUILD glibmm-2.68.0.ebuild 1359 BLAKE2B bc0d66ed662df3a61153428fb01a0767c55a3a323e5338e45b68448d10ddd09702521acbe9824bb6b0778d95d67c1f7d5065155e2f954c89660f29e31089bc40 SHA512 8175e60c96ee44577b0d7aa7d3e59edbac17bf7e990d2f38b3712bbdab12ddac8dc518df4d92aeeb06c7d22641f299100ed22ef0f6602b3e5139431fef93a98e
 EBUILD glibmm-2.68.1.ebuild 1359 BLAKE2B bc0d66ed662df3a61153428fb01a0767c55a3a323e5338e45b68448d10ddd09702521acbe9824bb6b0778d95d67c1f7d5065155e2f954c89660f29e31089bc40 SHA512 8175e60c96ee44577b0d7aa7d3e59edbac17bf7e990d2f38b3712bbdab12ddac8dc518df4d92aeeb06c7d22641f299100ed22ef0f6602b3e5139431fef93a98e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/dev-cpp/glibmm/glibmm-2.64.2.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.64.2.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	>=dev-cpp/mm-common-1.0.0
-	sys-devel/m4
-	dev-lang/perl
-	dev-perl/XML-Parser
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-	)
-"
-
-src_prepare() {
-	default
-
-	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
-	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
-
-	if ! use test; then
-		sed -i -e "/^subdir('tests')/d" meson.build || die
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dmaintainer-mode=true # Set false and drop mm-common dep once tarballs are made with meson/ninja
-		-Dwarnings=min
-		-Dbuild-deprecated-api=true
-		-Dbuild-documentation=$(usex doc true false)
-		-Ddebug-refcounting=$(usex debug true false)
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
--- a/dev-cpp/glibmm/glibmm-2.64.5.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.64.5.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	>=dev-cpp/mm-common-1.0.0
-	sys-devel/m4
-	dev-lang/perl
-	dev-perl/XML-Parser
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-	)
-"
-
-src_prepare() {
-	default
-
-	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
-	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
-
-	if ! use test; then
-		sed -i -e "/^subdir('tests')/d" meson.build || die
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dmaintainer-mode=true # Set false and drop mm-common dep once tarballs are made with meson/ninja
-		-Dwarnings=min
-		-Dbuild-deprecated-api=true
-		-Dbuild-documentation=$(usex doc true false)
-		-Ddebug-refcounting=$(usex debug true false)
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
--- a/dev-cpp/glibmm/glibmm-2.66.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.66.0.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-perl/XML-Parser
-		dev-libs/libxslt
-		media-gfx/graphviz
-	)
-"
-
-src_prepare() {
-	default
-
-	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
-	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
-
-	if ! use test; then
-		sed -i -e "/^subdir('tests')/d" meson.build || die
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dwarnings=min
-		-Dbuild-deprecated-api=true
-		-Dbuild-documentation=$(usex doc true false)
-		-Ddebug-refcounting=$(usex debug true false)
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
--- a/dev-cpp/glibmm/glibmm-2.68.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.68.0.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.68"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.63.0:2[${MULTILIB_USEDEP}]
-	dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-src_prepare() {
-	default
-
-	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
-	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
-
-	if ! use test; then
-		sed -i -e "/^subdir('tests')/d" meson.build || die
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dwarnings=min
-		-Dbuild-deprecated-api=true
-		-Dbuild-documentation=$(usex doc true false)
-		-Ddebug-refcounting=$(usex debug true false)
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@ -1,9 +1,5 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
-DIST gtkmm-3.24.3.tar.xz 13539040 BLAKE2B 24664773ec7b0666575346aa0532e8961fc19d965ef34244ed97707f7e3eb4d1d0f016abf733531269bf3e3201defe31559990e32f4f43faa8d3bb5d1f02fdb7 SHA512 e373807ec245057708655fa5dbf18d5391656a55b008fd6aa0fdc5a56e80d288813c3bbb0093f39aa7679df866a176f1e6b0e842d4d1b18b775a5928eed9fef5
-DIST gtkmm-3.24.4.tar.xz 13534708 BLAKE2B 7fb6e2851d1f73d42612b964d706d55060cbd18806bbefb800e2086706b973cae5296f31df48407d8f7ce80d6e503a5a79bcd54a9e1b86c8ecd6b113665f3255 SHA512 e3a10aed9cf2df7369b5dac3f1de000b006e08aef6f2d953d2faf2b023bd744ed4c9c2ad5221adc1b0c919bcdc966d0c1c9dc698694d8630ceba56e39f91ac26
 DIST gtkmm-3.24.5.tar.xz 13540488 BLAKE2B b55c55e4bb56bc835be9c09dae59ee103fb0ae80ee99bb54c36c366686f4f1a0309435e91c2e323d7ebfabf7922b76ac85de6a1132c53ab708ba17be661d834b SHA512 8cc5aed26cc631123a5b38bc19643cf9e900beb38681b29ead9049f6b8f930f0b8ace317b8290279ab89cad85075dcb66863174082f77a2b67e4d8bd3c29de49
 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9
-EBUILD gtkmm-3.24.3.ebuild 1495 BLAKE2B 8166cb99c68c772da990809a1302f93a2a10c5f4f09c3deb72d9579557c2d79c19367e92bd55cdb6390e8f561eb961f6187a7af71dff5fe4e1a835b13c094ca4 SHA512 453cb63072525721025df38aa422d301dc94ec35138a1fde2e3f6a31291e6a67f395ee74b57ca2488bcef95cbcc0dc1afd6e68e9bee07f09438ed34caa5e9e16
-EBUILD gtkmm-3.24.4.ebuild 1501 BLAKE2B 157b2d4944c530f458da5638a7aeaa4392d4a9ded67ed56abee52835654efab4aadc640d80417faa34fd90f1c95039d2dcf0d12e5d2985676c28349c73c6ad96 SHA512 d199aca0fac51304a9cc035053a09b33c8688d1e3ac71c81221cf6ea90ffeb413d9fa7f184ff3def7dce8844300e4011b99cf7f714ad18e1aac9696c4335112a
 EBUILD gtkmm-3.24.5.ebuild 1495 BLAKE2B 8166cb99c68c772da990809a1302f93a2a10c5f4f09c3deb72d9579557c2d79c19367e92bd55cdb6390e8f561eb961f6187a7af71dff5fe4e1a835b13c094ca4 SHA512 453cb63072525721025df38aa422d301dc94ec35138a1fde2e3f6a31291e6a67f395ee74b57ca2488bcef95cbcc0dc1afd6e68e9bee07f09438ed34caa5e9e16
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1 virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="aqua doc test wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-cpp/atkmm-2.24.2:0[doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0:0[doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.54.0:2[doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/pangomm-2.38.2:1.4[doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[doc?,${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.2[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-atkmm-api=true
-		-Dbuild-demos=false
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-		-Dbuild-tests=$(usex test true false)
-		-Dbuild-x11-api=$(usex X true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
--- a/dev-cpp/gtkmm/gtkmm-3.24.4.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.4.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1 virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="aqua doc test wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-cpp/atkmm-2.24.2:0[doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0:0[doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.54.0:2[doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/pangomm-2.38.2:1.4[doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[doc?,${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.2[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-atkmm-api=true
-		-Dbuild-demos=false
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-		-Dbuild-tests=$(usex test true false)
-		-Dbuild-x11-api=$(usex X true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
--- a/dev-cpp/gtksourceviewmm/Manifest
+++ b/dev-cpp/gtksourceviewmm/Manifest
@ -1,5 +1,3 @@
-DIST gtksourceviewmm-2.10.3.tar.xz 742184 BLAKE2B bfd61f3ca29afa4b01fef651849189983fbc64c95c0258c19812b6fddfb2f9e793a1a684e44e88384dcb24632a2c247f4b6ec400f2ef3d19f878064e017d986b SHA512 e6ddc4f585251f68e48cf0ea2c33bce02a90031efcd885105a82837715d659a317ee0845b476fc54c1c4c71b518df41ce494505af1524db6acb733e51f44e6ca
 DIST gtksourceviewmm-3.18.0.tar.xz 1079780 BLAKE2B 973f06a3baed8d5ab541b2f179f773391fe562cab2fceffd0366748acafc4bfc1d4717d969bdd5a5716f892ff497b89338f8b3cd085aebb9c033a40b29d3c0b4 SHA512 143de4a650f2a6090efeba359e78d1f4982519a9e7a2be838f9888732c57dcc42db8b6ab45bd23ccd261d8f17bc743846a3bb572566f233cee9b4238c017c64c
-EBUILD gtksourceviewmm-2.10.3-r2.ebuild 995 BLAKE2B fc57b3fdd57c34444d732c0cf1359ab770d8b597e9a9f9f735743118e986555209bdc045f9d05bb949d501a75a34e3f71467518476439d82ca91054d9e0bf1f6 SHA512 04e3f64f7f049ac1d400ddd11891062c0cc92ae05d052df39c93242cceada4842bf090e90d1c21fd35af8c2089a8ec1be8bd8ca62c1217bc8acb1ac6984c7b39
 EBUILD gtksourceviewmm-3.18.0-r1.ebuild 660 BLAKE2B 176bc3af22e4143a622792e79c5749f9ece54493fcf7ca19634935ea8f9d5f8bab8e51de64895c6896ee61e02a00d02e74105ffb5079e885676c91e34220ddc5 SHA512 6cb7550b1ce300268b9b61a03b252fb4a72aff4cb632627eb38b845cb0e36163ea29065a5f5126db617dfbb9e00ce2ee6128e00e9d60ae6650e00efac9b7cfaa
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r2.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r2.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="C++ bindings for gtksourceview"
-HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-SLOT="2.0"
-LICENSE="LGPL-2.1"
-
-RDEPEND="
-	>=dev-cpp/gtkmm-2.12:2.4
-	dev-cpp/atkmm:0
-	>=x11-libs/gtksourceview-2.10.0:2.0
-	!>=dev-cpp/libgtksourceviewmm-1
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove docs from SUBDIRS so that docs are not installed, as
-	# we handle it in src_install.
-	sed -i -e 's|^\(SUBDIRS =.*\)$(doc_subdirs)\(.*\)|\1\2|' Makefile.in || \
-		die "sed Makefile.in failed"
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	gnome2_src_configure \
-		$(use_enable doc documentation) \
-		--disable-static
-}
-
-src_install() {
-	gnome2_src_install
-	use doc && dohtml -r docs/reference/html/*
-}
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@ -1,5 +1,3 @@
-DIST mm-common-1.0.2.tar.xz 271720 BLAKE2B 955a541290ffc9489a7061a1bdcc4b2cca7ac5e0a834a008b4e15173e3b6df38a5fb719f26fe6f83c073c025c7113bba3586f28a6341d37c7c98cfc93ec50f0a SHA512 106f3aae8bb836386148098037c52fef19c3779f5e8cfbafcbe52eca17340a6e2fb7e5c57154cc0a90b75c0bb23900a4274591a71d85f81391be780c53238de0
 DIST mm-common-1.0.3.tar.xz 272932 BLAKE2B 90459cfa75dbcab8bb9b0512f3f3f3703850000e4ea0124afb020c476fce9948ec0128d67510b13482d52f165ba0b7a8aa72e6b1afd4a88554fa52bc4f5598d2 SHA512 fdd79e9a2ca3d7ed311a6994bd04e7cbf2b1562c39968d309765ce3b5268128f98b3f1c08a434b460276e6d911d302a12ccc7aebd6cd67e4df13241a97034a70
-EBUILD mm-common-1.0.2.ebuild 567 BLAKE2B d34816e233e5e97a8973c4e0ebeb1729680c83f6140986978f053db23f4fbe18ab00a5e1f125b3afe0591e59950a707e3c66f136a42856d053539d9e64a213f9 SHA512 f6a326056c275761c43a7f49b65ce2c5bdf897aae1f2e0a4d99d1d7230c675e1c2da7dbf504237d39187edf259ae89cb9f2e188a9a30c598c85136d0746c6c69
 EBUILD mm-common-1.0.3.ebuild 567 BLAKE2B d34816e233e5e97a8973c4e0ebeb1729680c83f6140986978f053db23f4fbe18ab00a5e1f125b3afe0591e59950a707e3c66f136a42856d053539d9e64a213f9 SHA512 f6a326056c275761c43a7f49b65ce2c5bdf897aae1f2e0a4d99d1d7230c675e1c2da7dbf504237d39187edf259ae89cb9f2e188a9a30c598c85136d0746c6c69
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/dev-cpp/mm-common/mm-common-1.0.2.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.2.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org python-any-r1 meson
-
-DESCRIPTION="Build infrastructure and utilities for GNOME C++ bindings"
-HOMEPAGE="https://www.gtkmm.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-BDEPEND="${PYTHON_DEPS}"
-
-src_prepare() {
-	default
-
-	# Include project version in docdir name
-	sed -i -e "s:^install_docdir.*:& + '-' + meson.project_version():" meson.build || die
-}
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@ -1,7 +1,5 @@
 DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
-DIST pangomm-2.48.0.tar.xz 674516 BLAKE2B 58c3e93c6127a14b5bc866b43bff4ab25a1ac1a06813c73e4f2a4d02adad3f51b7ec922f7c6e3d4af518a1f8f31c19de4df0c11b91a10ee61c2e16df8aa025ea SHA512 0c1be5726740669c366214caf8b8b0bca1c7b223aafb2e6ce64f7a5a90d07c62ee509821ac787f3997ae78aa3a3ffd5cff7d33c73bc7ebd7fe642c56689d98a3
 DIST pangomm-2.48.1.tar.xz 675452 BLAKE2B bb012fc5cb66d5cb98f522e3706fdd35bcc5692fcd942f86ee1e20116590ceca26874c5a58bd3f8fac4f154700dfb37ea060747a6c3069e67adf83ba551e7abc SHA512 c204a1cb7a404f055d62880a760716c5567a835ca495cc5e01589ed59fabb332490e529de716c3438cefbc4428c025d6d01c71e4412b2843e3ab3a3175ccc2f4
 EBUILD pangomm-2.42.2.ebuild 1051 BLAKE2B 5bc6fb687bfa063c8ef24da32b635882a56203611336cbf36a46c9ecbd9365436e0ee7fb565e75a2e2b824ebd2c11b5d3a71146b31cde06c921a98159a8721f6 SHA512 d35deddcb90fde39fc517d69e2e8d5072d9fc611bff7681fe51c846abbdcea074f5ebf03f9398c9a8465dde239c0b58f85b539a7b342031b7b7f7b6528b4b531
-EBUILD pangomm-2.48.0.ebuild 1069 BLAKE2B 79cb13af7cc48eade2f248088278c34ee82d2b98e611976711103ecdadd4fdb7a4c892213df8b98091b64b7be21c9be73c162811dc188008bf1a0c72fa0d9752 SHA512 309d8cff184fc738a1febe012f10e37d9f3f785a7447730630f0d49a827696f2980e48640870ba483d8199800211c76d39552a454388267aa35c94900072797d
-EBUILD pangomm-2.48.1.ebuild 1069 BLAKE2B 79cb13af7cc48eade2f248088278c34ee82d2b98e611976711103ecdadd4fdb7a4c892213df8b98091b64b7be21c9be73c162811dc188008bf1a0c72fa0d9752 SHA512 309d8cff184fc738a1febe012f10e37d9f3f785a7447730630f0d49a827696f2980e48640870ba483d8199800211c76d39552a454388267aa35c94900072797d
+EBUILD pangomm-2.48.1.ebuild 1056 BLAKE2B 53a0bffa3d9717e84082a841ee2487b3b31f6d3cd3c7df46683366d8524fe82479a0bca797d5a38dafa000783e3d1c740b53089b52bf6e37fbba40a587390c20 SHA512 5efbd571a48911676ab51c342e6e3eb19071452512245a46e1b1ab4253caafd86a0436b6ca9abc34e5766674bd9812766629c287620e444904e4e6b7506ccec3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/dev-cpp/pangomm/pangomm-2.48.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.48.0.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org meson multilib-minimal python-any-r1
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="
-	>=dev-cpp/cairomm-1.16.0:1.16[doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.68.0:2.68[doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-3:3[doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.48.0[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
--- a/dev-cpp/pangomm/pangomm-2.48.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
 SLOT="2.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"

 DEPEND="
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@ -10,10 +10,11 @@ DIST perl-5.34.0-patches-1.tar.xz 20360 BLAKE2B e60074c49f357d4841708f58b5165a44
 DIST perl-5.34.0.tar.xz 12881416 BLAKE2B 4139e77fbb38b2b72671c0b130233cf5ed35112bbba3301b8ed724739c7ff96b041752aa505b938e257ef6ebf98a9b6dad1858e00f756c841a0520688d974e9a SHA512 691b4b31eacec357191fba777612b4e3eae59e946a22998a50766697c0d61db1d42a9b3bc1e41abf0d1ca1893e4a7c06d7bf3290480cf03d7f79befd7a8a3267
 DIST perl-cross-1.3.2.tar.gz 108350 BLAKE2B ddb352fdbec66a04de62425f5cae1aaa3bc7251b9d6f4837b66a0bd79c53c60212fad3997dad4c38055774a2769d45b5b83927bf48b0fb00a130fee429eba702 SHA512 d61d25066a8d87c34aeacc5b9bd86fab964b33c4c65e84a89e4077fe1d8011c0bdf810a304631af44fae32edcffd6c99fc17b0c584ea83d1ce5ce492aaedfea5
 DIST perl-cross-1.3.4.tar.gz 108461 BLAKE2B 28f207d235f51ebf681598cf85f7f16923574aafb593426a59d67578135ee3632efb12b9e1a672759195a79f80e49f5c929ec42b2b4571b1d36f5d8c8dceadc2 SHA512 7e1fc7b2b19d8c2e2fb8615e074e218b2e1a4d276b563ffabccfd0c7398bc8680fca96da89cc61d611993f38a2c67dfbb0201c58658e05437395ad8c00d31874
+DIST perl-cross-1.3.6.tar.gz 110210 BLAKE2B 39074d6f4a526f59de2b1c40432936552e625a5a4e44fbb7ce3c1c3828b12c5298d1ab49b7d34ea92e2a4c8c88f8bbef8cc0c582a3fbbed975cf46d331e89c08 SHA512 d394fbd75d890442aa599eae8893a26540c8b7af966583ad1c3213c3fe0e074415cfed8814de8f397830833fd78267bdc55adc5267168198f269634c2ef3b982
 EBUILD perl-5.30.3-r1.ebuild 20690 BLAKE2B 036c53922ed6247d01828cf6ce7f47be06877c0e9d63158e37a9aba1f35c3e717c3f0cbe6fffadceb513a1d34f2ef300cce7e4a98ec601e359d9414dce882c14 SHA512 17793920606af30aab84d2300dabf07a60147f94865124ccbb7feae94a309768492364ac5b26ca8b0e99d1860856d6be54ab9a0812aa59180c28ffbebbad1d6f
 EBUILD perl-5.30.3-r2.ebuild 26146 BLAKE2B e0756d8250acfd3dbbdeac414f2515270820a091a10dca4d59e1912c85d855b439558d25bf09420dd62e9c3a0dd204a87717fd24fbc4f29858bc15047bdf7a42 SHA512 e7ae782d61a1d841a6dd6138ff56109ba07a9e81ab1a9cbb4e7b4faf4c439766c646ababcc2f726a12cadcd3532c9d09b7f80cb5c95e0b3a1a39674f96edca29
 EBUILD perl-5.30.3.ebuild 20132 BLAKE2B a244f590c7be7a1f078e8117d3b2745c4118c8a7ec264caf950a0e4c051090b38d4fae431187486fa4b527b7a5ba1cf7000134e9cc2a25bc1a8397b72bd882ac SHA512 d32292624e29ad20f41a9c688b663297246c868455bc4c3d079b12ff90f4fd89f88623e3ca270c58e92ffefe1fcdd6a38910da18efee5954fc1d24de0c104a87
 EBUILD perl-5.32.0-r1.ebuild 25913 BLAKE2B a97f41da180ee9e0beeb163ffbbc1c1f944d8dae32954603c9a3a9bf24d9623db6146b8440917dc891ce24ddb41c6c782e04630e4cfa68649f526d7a3e57def3 SHA512 1223ca91df30ccdc247f8a9659376e4407920c1223753b00da91859935117f5361c128b3b1f5d38596f70a4d0ec0e6e6fda58f1b135525c67183fe906bbb2cd4
 EBUILD perl-5.32.1.ebuild 25758 BLAKE2B 581401462e8ea39175e4a2796a70aea34eaf0a7f7f31c49edf00c95b99f42bfd000faf2e12911198d8d48a07a552d0c95cf3574077919bd3e24f6c8fa46baccd SHA512 3c66bc03faf56fc1c812a26ce39839b9a679cdbb3c5a41efe0f5f4b94348956550c576be32dd01e180f34692f11ed963c3497f2e501b8bde0e53290065bf5002
-EBUILD perl-5.34.0.ebuild 25672 BLAKE2B aa0ba6b15d444973b0aa822933db672b136fb0d8601af1772f7593ae7840a63b109bd305fe9436e7be4c2262ad2eecc7bff086a8c6e992f560016550383ebbaf SHA512 07a66188031dcf5f112329fbe90aab217d36c9b46090b2b4119267e41169205a3740ccdde289d40e658761af345c14e091fc792f2be3bd4c676040280fda8df1
+EBUILD perl-5.34.0.ebuild 25672 BLAKE2B 0bdd8e01604d63d400157f05b0452f2a77c2f07ead198c8ab332f8c212e2aef59c4522d22c4afeb770e21946c008608e296fe9097c9ed48feb009b9a26206895 SHA512 35d10bf1e4129746d7d78d2a18ff2102626f9b2de341ca5adca5fa489962ee050d323a67fff09a596f424c7d72a505ba21ab87390bcec631e416f07d0acacd55
 MISC metadata.xml 430 BLAKE2B 65949096d565c5754b25bb708f80ab17e95d21b252f6a3b7a1104b01bed26db1f9351c100d1cc59cbf4161d662bba6fb17d232d146165e97f82681c410feb98d SHA512 b3aaad1820fb62287c8da2806ad385e1ced8d8d2a05fbcd2448214120a4682d503c3dcba60d03a5d02cd8e1b4f5b13568759a096a5d8a3a5ecc5c35c5680b670
--- a/dev-lang/perl/perl-5.34.0.ebuild
+++ b/dev-lang/perl/perl-5.34.0.ebuild
@ -6,7 +6,7 @@ EAPI=7
 inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing

 PATCH_VER=1
-CROSS_VER=1.3.4
+CROSS_VER=1.3.6
 PATCH_BASE="perl-5.34.0-patches-${PATCH_VER}"
 PATCH_DEV=dilfridge

--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@ -1,6 +1,3 @@
-AUX 0.14.0-conditional-tests.patch 2279 BLAKE2B 2b04f6cc1741de4d0efdaf2cef756c5879fe2d9ec988b8612658645c2fc46ce1bc5c96d3efb532e98c5e27a705d18d143e62e1a99a6505fa1f87162725f4ebe4 SHA512 b1742262a2b7fbc95b7417170640117578e77ad1498aff93ae6bd464952bd2d8ca773f3f0987378ccb743144a160c8bcac1a312eb796928f609745a567e98c6a
-DIST folks-0.14.0.tar.xz 520924 BLAKE2B 3154e0a7e6fe8c60aa81f4772af2b9d09b88785187c87e93869f668af46549383866cfa2e50d3d29009d0acb77c26cd852c7c9a3c6188ff3e5ef53c06b11b781 SHA512 94dc025668ac34df203ea351430bf82dddb4e275d936e2b959a1b9a4cf0fff0218a4baa7d3a89c152a2cb21a94250d731c8e7470d50ac4b658fbe1448974a69e
 DIST folks-0.15.2.tar.xz 489236 BLAKE2B 63bcfedb88205b37c6e9595c3e0c34f7fc869045648e04042cce9300776e4b7d102f91312434545581882f0959502be7ba1bc2f77d50ec2af7f649444da9197d SHA512 c327e39b7cf32b72db3f84504f8ec2a4bc2d98693ca5ff21c3b544e37b58a1df9241dd1be541a39be83468b62dd0f5d7b5a3a0ca4bde5e94d1e075d77d3be505
-EBUILD folks-0.14.0.ebuild 2576 BLAKE2B 84fe21b7e0138b6d62a6666dcfa426ec85261008441ab2b7c3576e160615c57699ae4b6bcdeb6ceb0c9a00d183a0bc663b0e67c6bb2892bc8a7fafd13757a54f SHA512 c21b9a13e3e3b4fff805d9a713e85b4db03dcf151b55628b94652603586681fa020588bdcca234780ef6c95295113ce853899e1277daf72abafa4e80e3388a9a
 EBUILD folks-0.15.2.ebuild 2208 BLAKE2B 9bfcddb38405b7f34d2b9f6f032d44aeb1c8409b6fa34ec27dd95dc220bde2c3d8780f746b381c3321d588c6c3a8611f59165cfcc2a35a2ba57943d61983a803 SHA512 776f71fdeb56953d5160098482a649d08c1e15723d941263fd017bf1c46f807abcd3ce8d7e8b4651e646e1d919cdadb042b2888a1f904c3839492ddec8cbd1f5
-MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
+MISC metadata.xml 395 BLAKE2B 3d62bb67ea7cfa05371530d79d4953a1b8c33a1c17e6545dea2bc5736c5f751180f495d1966a403a77c84247a4b96a752d9505c6412138df382162520d235f2a SHA512 9097dde175eab9cc701a05ab5435ce6aedaeef984ec05392f60806ac12d16563f837b916cab1018a9440d427e17722381e27763060073d329704291910873cc1
--- a/dev-libs/folks/files/0.14.0-conditional-tests.patch
+++ b/dev-libs/folks/files/0.14.0-conditional-tests.patch
@ -1,72 +0,0 @@
-From b9e27e284c481e876370e2eb73f95d0953fb9cda Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 23 Aug 2020 11:49:44 +0300
-Subject: [PATCH] meson: Allow disabling build of tests
-
-Fixes https://gitlab.gnome.org/GNOME/folks/-/issues/121
---
- meson.build       | 21 +++++++++++++--------
- meson_options.txt |  1 +
- 2 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 53d7dcc6..123edb5c 100644
--- a/meson.build
-+++ b/meson.build
-@@ -54,6 +54,7 @@ folks_backend_dir = get_option('libdir') / 'folks' / '@0@'.format(folks_module_v
- bluez_backend_enabled = get_option('bluez_backend')
- docs_enabled = get_option('docs')
- eds_backend_enabled = get_option('eds_backend')
-+tests_enabled = get_option('tests')
- installed_tests_enabled = get_option('installed_tests')
- ofono_backend_enabled = get_option('ofono_backend')
- telepathy_backend_enabled = get_option('telepathy_backend')
-@@ -130,13 +131,15 @@ endif
- 
- if bluez_backend_enabled
-   libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
-  # Needed for the BlueZ tests
-  pymod = import('python')
-  py_installation = pymod.find_installation('python3',
-    modules: [
-      'dbusmock',
-    ],
-  )
-+  if tests_enabled
-+    # Needed for the BlueZ tests
-+    pymod = import('python')
-+    py_installation = pymod.find_installation('python3',
-+      modules: [
-+        'dbusmock',
-+      ],
-+    )
-+  endif
- endif
- 
- if import_tool_enabled
-@@ -233,7 +236,9 @@ subdir('tools')
- subdir('po')
- 
- # Tests
-subdir('tests')
-+if tests_enabled
-+  subdir('tests')
-+endif
- 
- if docs_enabled
-   subdir('docs')
-diff --git a/meson_options.txt b/meson_options.txt
-index 43cd586a..62a9603c 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -11,6 +11,7 @@ option('inspect_tool', type: 'boolean', value: true, description: 'Enable buildi
- # Profiling
- option('profiling', type: 'boolean', value: false, description: 'Enable profiling code')
- # Test options
-+option('tests', type: 'boolean', value: true, description: 'Build tests programs')
- option('installed_tests', type: 'boolean', value: false, description: 'Install test programs')
- # Docs
- option('docs', type: 'boolean', value: false, description: 'Enable documentation generation')
-- 
-2.20.1
-
--- a/dev-libs/folks/folks-0.14.0.ebuild
+++ b/dev-libs/folks/folks-0.14.0.ebuild
@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.48"
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy test tracker utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	telepathy? (
-		>=net-libs/telepathy-glib-0.19.9
-		dev-libs/dbus-glib
-	)
-	tracker? ( app-misc/tracker:0/2.0 )
-	eds? ( >=gnome-extra/evolution-data-server-3.33.2:= )
-	dev-libs/libxml2:2
-	utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
-	bluetooth? ( >=net-wireless/bluez-5[obex] )
-	telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
-	>=dev-util/meson-0.49
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	eds? ( gnome-extra/evolution-data-server[vala] )
-	test? ( sys-apps/dbus
-		${PYTHON_DEPS}
-		bluetooth? ( $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-conditional-tests.patch
-)
-
-python_check_deps() {
-	if use test && use bluetooth; then
-		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	use test && use bluetooth && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-	# TODO: All tracker tests fail with SIGTRAP for some reason - investigate
-	sed -e '/subdir.*tracker/d' -i tests/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		$(meson_use tracker tracker_backend)
-		-Dzeitgeist=false # last rited package
-		-Dimport_tool=true
-		$(meson_use utils inspect_tool)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
--- a/dev-libs/folks/metadata.xml
+++ b/dev-libs/folks/metadata.xml
@ -6,7 +6,6 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="tracker">Load contacts from <pkg>app-misc/tracker</pkg> index</flag>
 	<flag name="telepathy">Load contacts from the Telepathy framework</flag>
 	<flag name="utils">Build the folks-inspect utility</flag>
 </use>
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@ -1,9 +1,5 @@
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
-DIST gjs-1.66.2.tar.xz 440184 BLAKE2B 8df23470c763d65733c6fb622a1de8b8fed3e16c1ba67883b6ae0e7150a5a30a334735be39f9c68217501b7674fee8bfce6ab704c0742ae639a1bc14cdce4cd8 SHA512 2e0ca24532b3203a55089eb25de19b4b4f33166f40d1231198947057e45f364d3c7f794ff2079c1d9aee3fde9f99cd844944229d89d5e344a97254aaa42bad40
-DIST gjs-1.68.0.tar.xz 553044 BLAKE2B 6103299bb9ec67589393b0a863219b1bb08ebf141229574f07bb4984a2fb226f4daf4324038e9143f98048d0a2997805b93f7f408bae5ef727435c787e3b98f0 SHA512 65278ca345f2c786995bed7755dd86403b469eb6cceaa6db57dbd4af212025a3b1f01b7387f45dc9abc23d47ba2f39c5ab8a90ec95b1934f1471a68a06f0d82d
 DIST gjs-1.68.1.tar.xz 558920 BLAKE2B f5364fe92ddf4cb1e9b5dac5921fa180ed31bfe54ba8ad737e31c5f8a7f19d7e47bad07d7ca088e6e5962b2782a774b985b607214a7381a8b6c54e799df97235 SHA512 bce2f84e748dd483e0c907e7f7f230257aa4b216b76e89c3457ebba5e9bf601dcb5c771ebe864df22255e221876c6e7ee3097328e6f52ef78360f49708ff457a
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
-EBUILD gjs-1.66.2.ebuild 1109 BLAKE2B ed052e7b9398fefedf71ee2cacff2e00702f1e6c7444ea37a218bf047c07f91d8c52002f12cbab4c2a322bf85eece5377686ec44273e6bb59eeae4de093172fa SHA512 b7418593774f5712eaef63a66beb01a15cab894b535b8ee91596dbf6b10351b5b23fb52175977ad641c11949320bff14d0fbd9439889de3b955e23c9160d33ff
-EBUILD gjs-1.68.0.ebuild 1118 BLAKE2B 78679339767d36002659ab6ace56b9764bd656941d3ef4634114a680d07f84a38f69f82b70b3cc70b97949cbb95000fadfcc7c73675c066f40e309e6a6a7ade6 SHA512 c02d12781c718e98512f535c6bd87676994cd6852ccb4e1ac8bb9311297f61f65e72acc2b08c5580e1464a53e509615b2e80448b44db91ea0aa0a76d1bed697a
 EBUILD gjs-1.68.1.ebuild 1120 BLAKE2B 4b3c4da6265bf6494e180607706025373a9400baeda83f8ebaf0ebcf2ae47380b367a5b4918a61e9ecf75b59ff1e817ab35fa7cfd8a24ab406aad44304e25660 SHA512 67df97c143570e5de2ee7939b85a26065fb313fc3eccf3171aa50ed44325f8a063d917ea9031b50f0e704ebbcda308c245ba5af967f5038afd5e6e466ea72154
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
--- a/dev-libs/gjs/gjs-1.66.2.ebuild
+++ b/dev-libs/gjs/gjs-1.66.2.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.58.0
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.61.2:=
-	dev-lang/spidermonkey:78
-	cairo? ( x11-libs/cairo[X] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
--- a/dev-libs/gjs/gjs-1.68.0.ebuild
+++ b/dev-libs/gjs/gjs-1.68.0.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.66.1:=
-	dev-lang/spidermonkey:78
-	cairo? ( x11-libs/cairo[X,svg] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@ -1,5 +1,3 @@
-DIST jsonrpc-glib-3.34.0.tar.xz 41792 BLAKE2B 2be0d690e3ead57a7ad71b93d13ad28e23c96d89d36373d93ba608c4ea2aeed3684862938cfb64675cfcba84d9804f6352b877e343ac2af5aed8b2d4b39854f8 SHA512 58908dd11f7848b09e63f7a7ff2185d0742c049ddffb033e768f783bcbcda7e75a658bec923372212694431b25b0fb894e3ea37ce2d7c52c99e49fd230319c10
 DIST jsonrpc-glib-3.38.0.tar.xz 42224 BLAKE2B d7caf3dc116c43d652009ce646c0b837bd8a2a1b4d2b60ba49e9d746ff5e36e4c91fe5f4b5542a4562e6c8f13130d00fd22b57777d0e5ffd6e5b46f817f4dcb4 SHA512 1862403c37b7140e91720264a1b00a408b969f0464fc022a5c24be0eea993526d118ece6611927e1309071c3db9d3d6bf9f13ae8ed23ff1d34f36fb68c2584cd
-EBUILD jsonrpc-glib-3.34.0.ebuild 971 BLAKE2B 4f0ba2deafc37cf4051ba58ee20c19c669c1f46b78c893b2c859a55bceef4e0fb2a28118d208c5bedbbc5260eb6d5ee9884c7163132fd0212642bacb1b4fab7c SHA512 93372b1f84231ef06344b177c5696b9da31863e46bfb24814d7d99eccce5f069ae23fdb9b2f3b1227bea3d3064a8957b5cf31c299ae30b4eeb4acb8c2eecea74
 EBUILD jsonrpc-glib-3.38.0.ebuild 971 BLAKE2B 21b1270fc6e79a3a6c8bdea517906530635343b2123e6bef6f82be5e42249f329101cb2b0e92cbafd5551cde33f3a372ff573602ee0a3b3c9106f93157a57e4f SHA512 e895f8237cfca36f5e6b2d1f5728fdb92e04564af24a0518d6a40e434af6294aeede6b2eac959280a1c888c64c72d3c5d31cc59db0409f98bc292b1199e66c1e
 MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg vala
-
-DESCRIPTION="JSON-RPC library for GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 x86"
-
-IUSE="gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_profiling=false # -pg passing
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-		$(meson_use test enable_tests)
-	)
-	meson_src_configure
-}
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@ -1,5 +1,3 @@
-DIST libdazzle-3.38.0.tar.xz 447304 BLAKE2B 77add33e1947dc33a086501928377cc9547563a9a8095f38283a5bc4b1916bafe1ac3073abe4111ba4907857de0726d2325458663acda4df122e6237f703281f SHA512 76dee75fab5a508c274f45cf5f51bac4edc80786942ccc64e49ffe1721607d88f9067b0a7751f44a48bfe38ee87b6986d449e8c5e6b704c6ec32de84d21f7e69
 DIST libdazzle-3.40.0.tar.xz 447648 BLAKE2B fb7916fd7812c03ec63bc804974574bbf6d029596e8364f5f13cde22be330a9356ee250c0d5bfc8742545d410c94b1ad7a1fa0bd5e2f473f67d6c45fe55e8e93 SHA512 23bf0a176fb847ee46a22a96594e9ed60921f104875fd102375445f364b552167778a56dd4929a18b2a7bee1144fd5e07d5cadac3355ac4877cd56838cb5deb2
-EBUILD libdazzle-3.38.0.ebuild 1695 BLAKE2B 2121aa223e97a6f2e33eee10520a1a2b6a902518e60f705ff2e75327cc54c23b7370a71863b42ec62762886769c956883b07b39628fec5d4f862184baaad83d8 SHA512 224adf1c785192b0c26a8f2918179c2f31a42e5c86a853fa67c430188ed831ac15599d1a23450cce4a6202b9a9eb4a9c562f0c2c615c5cc6f91ecc0b6b0dd10e
 EBUILD libdazzle-3.40.0.ebuild 1695 BLAKE2B 2121aa223e97a6f2e33eee10520a1a2b6a902518e60f705ff2e75327cc54c23b7370a71863b42ec62762886769c956883b07b39628fec5d4f862184baaad83d8 SHA512 224adf1c785192b0c26a8f2918179c2f31a42e5c86a853fa67c430188ed831ac15599d1a23450cce4a6202b9a9eb4a9c562f0c2c615c5cc6f91ecc0b6b0dd10e
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
--- a/dev-libs/libdazzle/libdazzle-3.38.0.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.38.0.ebuild
@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg vala virtualx
-
-DESCRIPTION="Experimental new features for GTK+ and GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# We keep newer glib/gtk+ deps to avoid GtkEventControllerMotion backports gettings used
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.24.0:3[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
-BDEPEND="
-	>=dev-util/meson-0.49.0
-	vala? ( $(vala_depend) )
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_tracing=false # extra trace debugging that would make things slower
-		-Denable_profiling=false # -pg passing
-		# On linux it'll always use a vdso based implementation that is even faster
-		# than rdtscp insn, thus never build with rdtscp until we don't support non-linux
-		# as the rdtscp using function will never get called anyways.
-		-Denable_rdtscp=false
-		-Denable_tools=true # /usr/bin/dazzle-list-counters
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-		$(meson_use test enable_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
--- a/Show More
+++ b/Show More