gentoo resync : 14.12.2020

25 files changed, 83 insertions, 525 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index fc608297bfb6..6c624a2bef9a 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index fd52070d66b2..266cc4f7e090 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -4,5 +4,5 @@ AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a
 DIST dconf-0.34.0.tar.xz 112876 BLAKE2B 6890cd82a3ba81eac8c72dda93ebf1b82f3002b735bf2e059ba07a2f0f3817978a9e4f5dd37a9efab728fc2a4e20c34c519f9eeb3915d705ff8a3c4a65f9ab41 SHA512 8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743
 DIST dconf-0.36.0.tar.xz 114828 BLAKE2B 033cb2e095d9dac72bd07c5fa8280a3e1012aac6c1b0657d5455c2a519617be9112acca702ec4078554a814f36d12ee8e25201cc5b8aed2d33a32ef14e2f6fa5 SHA512 fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d
 EBUILD dconf-0.34.0.ebuild 2192 BLAKE2B 74e61c5af928ef2effa2d23593105fa50e0487b3d842b39a66c210a1b06b194d34b95d03cfa536764971b29e5cc139776641f77accb85f8f3be5ccad478c59a1 SHA512 d474a1b2ec9f6d30579c853bdf9a7e53ee19913553a4c0d62adf586de5633552966e9567439f2769f7c671b87286c5eef613241d64d0d4caff624344b19d9902
-EBUILD dconf-0.36.0.ebuild 2097 BLAKE2B 7e71fa2b313e71cbe2b370610ab7d6639d2929a01b774150a5bacb97ac18e4235524f1c4454ebf6610ab901fb089ac0f0ea785893c2ceafe1cf004fe58bb362a SHA512 0c1073bd85224b86db54e9ebdeddc82347ad668d9594a849ff74f34d2d3457fd942fbc060ffd632e9764df107d3141721cb33588ad32aa3d1090913305234d23
+EBUILD dconf-0.36.0.ebuild 2104 BLAKE2B 6989287b32971b02a72e5c14da091555707dc3b3e35d87eef39a7be6981e4d90b221b8f73d029f4624815a40532a12c11ea381d69ca4f79c56303e05d2c02f2d SHA512 3d192e4cbf500f42e51d0c938581a3cded0aa883eac39b98c058c6573552a1aac0e8b0c4b7a1f92842b69e77407447352c8a204168e7b7d2bbc8765a3c7d006f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.36.0.ebuild b/gnome-base/dconf/dconf-0.36.0.ebuild
index 837fd6a3656e..c861d09ab81b 100644
--- a/gnome-base/dconf/dconf-0.36.0.ebuild
+++ b/gnome-base/dconf/dconf-0.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
 
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 8ca745c9b6fa..8cb5db92ef8e 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -2,7 +2,9 @@ AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c026
 DIST gnome-desktop-3.36.5.tar.xz 738956 BLAKE2B 6c419df487e908f57a1dc8798a8dfe8b574d8c5c9aa5d83e45aed233ba856ba398367a990aa83fb1b8966aad02c868cd0e41805908863ea8fef24cc3ade3687c SHA512 0b5ad42c0832d58552270e9e24dabf56668c4fbb84d07812e4a2a34cff0a67344a7c8ee963a53a703b2e4bb28c67035bf2ce854ea271194511dc66e051481b1b
 DIST gnome-desktop-3.36.7.tar.xz 739284 BLAKE2B fb64db72883ca6b5001b519f6ce3b5b26605e081530ff27728bc565e5d3ce832281adf3d10107e74028d14d9d1e5fa64f8e5d447c13690ff67aa3d2c2816c2e8 SHA512 20e3566ce1c36399a7fa359dd218f0357e1deef54ad613ce825d19f9266d98ed03c5ae59843100b36dcc6b3cdee8479ea9403514eb39e1f32d9b1fd4e53a7679
 DIST gnome-desktop-3.38.1.tar.xz 745400 BLAKE2B 872b0cdd993ed8f8865ec02e8f4e818657f526caebb3cd1b772c1182a6655d1502f454b94acb0a1dc9e3a1b8f8b8308c5dcee7933a63600d7f8d93fa3876a1d2 SHA512 b3927f0b8571d2ecb528dbe3e096e816e4e90333ce4f1ab8682c8682bbaaf5fc3484dc0944a9437aca40036d29b0feace8ed3954fb17c0bfd7ce503c99af830b
+DIST gnome-desktop-3.38.2.tar.xz 745252 BLAKE2B cdbc3ae5bf78dfed0dcedfd83c01ab13f551c312d4eb5e680a9e22932d55ee9cf9334bec84cd99186d43afcf3fe707a12b469409d5c2094a8bbd8a1d36a75ed2 SHA512 93e98c10cac0f1c035af33fc61f945dfdbe12e88e4c42d44b5ba0570f8d81bb3f40f5e0d9fd6c4e4d9faf674f38ded0fc99dfffd57b824d62b92368df6239da8
 EBUILD gnome-desktop-3.36.5.ebuild 2022 BLAKE2B f3dd6dca7559c79967f73859b72c5ec3f9edcd8ab4d527e8d9503fd93ff2e117637223261a59e3937d5d074ebb064c36d7294adb62b5686435cce88fcbb0c7f5 SHA512 7280f4ae4748c982826f10248a3b6edf8e963a982facc182c98895ad1e6c695d076a62d4f56830c6fbf96dc0a9cdb3c9d533f1ceb16757f4f3475c8942579fcf
 EBUILD gnome-desktop-3.36.7.ebuild 2025 BLAKE2B 5ea77d5672464d313a241a3d74f047935d40857c95a90eea21c1f4005f28a90e58000d0448ccef3c5718551f339138ba456bcb4e25804e21cdc7acba66da2ec5 SHA512 a37c5dde9f212becf1661b65364a97b9ed4bfe194cc651e208bd152addf7eee42b6ddc5d83bf7c4cfefdd205e5fb7723b03047e14e13a44a1f50e22b77ba1a52
 EBUILD gnome-desktop-3.38.1.ebuild 1927 BLAKE2B befbd291e5a488f81c53ad4da33ed3ddf05ccd51525018bbab13b020be432c0c47cbdf7823b6330bd4e58a6930994558ab977afdb9cb04520bad203ce7a47466 SHA512 8639565b2cfaa893a1b692f7a39b4a269c1a9b4ae8b1586487b8e0779f79e9a07c30bd3680b8675e060c6a8d60826f2f0f00b8f7ab1f84dfe2167c245b9c51f1
+EBUILD gnome-desktop-3.38.2.ebuild 1927 BLAKE2B befbd291e5a488f81c53ad4da33ed3ddf05ccd51525018bbab13b020be432c0c47cbdf7823b6330bd4e58a6930994558ab977afdb9cb04520bad203ce7a47466 SHA512 8639565b2cfaa893a1b692f7a39b4a269c1a9b4ae8b1586487b8e0779f79e9a07c30bd3680b8675e060c6a8d60826f2f0f00b8f7ab1f84dfe2167c245b9c51f1
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.38.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.38.2.ebuild
new file mode 100644
index 000000000000..f2127cb11f3b
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.38.2.ebuild
@@ -0,0 +1,71 @@
+# 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="Library with common API for various GNOME modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
+SLOT="3/19" # subslot = libgnome-desktop-3 soname version
+IUSE="debug gtk-doc +introspection seccomp systemd udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	>=dev-libs/glib-2.53.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
+	x11-misc/xkeyboard-config
+	app-text/iso-codes
+	systemd? ( sys-apps/systemd:= )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+	seccomp? ( sys-libs/libseccomp )
+
+	x11-libs/cairo:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+	media-libs/fontconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	seccomp? ( sys-apps/bubblewrap )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
+
+PATCHES=(
+	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
+)
+
+src_prepare() {
+	# Don't build manual test programs that will never get run
+	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgnome_distributor=Gentoo
+		-Ddate_in_gnome_version=true
+		-Ddesktop_docs=true
+		$(meson_use debug debug_tools)
+		$(meson_use introspection)
+		$(meson_feature udev)
+		$(meson_feature systemd)
+		$(meson_use gtk-doc gtk_doc)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 607fdd6cdda0..1359708c5ebd 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -5,6 +5,6 @@ AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb1
 DIST gnome-settings-daemon-3.36.1-patchset.tar.xz 79352 BLAKE2B 6daf9528f5aa4c6597a017f25da41039dd2c09b4a1c29dca2d72f20195bb93c9003de39df89a669996e13050538553fbf6ed4f738b1c6fae29e8825ba252d26a SHA512 fea4ecaadac102b0024c365ae2ba9e632ffeebab138bfc09b3f5bb0a7794c6efc779180023a73c6c884c7b64f7e8ac1ec40f1478231a5528c03829cd9273a58e
 DIST gnome-settings-daemon-3.36.1.tar.xz 1415080 BLAKE2B 4026f3443b8dcab872ef54563b5fe8e89d6932373da0513d7d8c614616d396315f1e6a8d0be022aec82351b5cfe5868cbac5caeaa782d609885029fbbd1d91e3 SHA512 f2f43d9b772589b6b4212ee2b0afe8be79d50a2e0473a960c7a7b9d379222bbe84ca548114d0a247810a094b4b3bf41e40ca91173c6cf552517dc63eb3750c88
 DIST gnome-settings-daemon-3.38.1.tar.xz 1437096 BLAKE2B dddc4672585c23f1d0f1824303b503ec30d6fc4a2a88b9633e0256d34ca2badd067fa54a404de032f8b2e8dd5b7bfa3915464bc826d8bbea5d57431b7a2ac7fe SHA512 b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd
-EBUILD gnome-settings-daemon-3.36.1.ebuild 3907 BLAKE2B 1ad1f505534b636f4157f3bfe70afc2dfc97b3007f2aa35d76a76e4f043318009784a824444baa61b3ab6fe60324a383db663fa85a680ffc9ee5f74ab0316f2c SHA512 fb60dfcca7171cd8a040d5e0a98b6861dffdac19e40efcd707fa648fe4e91baca83c5090c23adaea6eebab4de2c74cae720285aacf8f78642ee3a72a719e6ec7
-EBUILD gnome-settings-daemon-3.38.1.ebuild 3853 BLAKE2B e28fe376c288cd80b5224d2395d21896ac9de45510e566549715d88b80e29fea2dfb20b271a58c6a8343ead9b65df380c5a2dc6e3bf91f3c0c05223794e1fd74 SHA512 687482050a72f82f17b92ed7a0ee63aa8b620718b90b09e5b0de1b8781b75f34c964a3f92b3943209c9f5b4014acad043aa519bafeee673bdf71bc76e2c918f7
+EBUILD gnome-settings-daemon-3.36.1.ebuild 3936 BLAKE2B bc43ce2fd69ebe44810a7c8a89267622b043a110efcc5bdac6dbf5386134bed0a4bcf1f5b882e38974b55acce3013c305dbb8e5f4ec5741678d46c35fb14f4e2 SHA512 9b85c3f9cbfa5bf2ef9c53355389f149295c586cdbf600a5bd6e85e0c897f236ff1b530c471aa4fdc16454c01ea1f3cfcce3bef1caec1c0351d8d027911bb450
+EBUILD gnome-settings-daemon-3.38.1.ebuild 3880 BLAKE2B a75e19a704ba1d402b6645e0134f3ab4a997d403de89af689b936ff56d0da9034f23a9204f47d11c2bc1a5a70f4f2813446450ce95d34a1c09269d5551e41f76 SHA512 fea21b725e04dcd0cd9764f29bc962f5352b21223835ac5d522fff727bde9683aa3ec251ac278f9c8a275bb9cac5538a0bf2b29570693ef1f9e96974cdc738d3
 MISC metadata.xml 546 BLAKE2B 8b82608d88d30a327a48d46992c0c19cefd594682191bfe4649a0e090ff13c0a9b88adf4c4aa4b42f9393c21153130afbf2d5090d774b348cff3003b41e3cef3 SHA512 c1a8e1a648564c52fb00d68a67bcfea6b2f6369186ede54a7278f258ef9f6b0cc6f399fa5f9c8ee7846d97a6163729c8da970a0f2e93e23bfa2f84ebf2466cba
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild
index 7043f1323e07..c79b95c35630 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
 
@@ -13,6 +13,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	^^ ( elogind systemd )
 	input_devices_wacom? ( udev )
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
index ce585ea54bab..cf87e4731d3f 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
@@ -12,6 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	^^ ( elogind systemd )
 	input_devices_wacom? ( udev )
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 0237d6106b10..d24de19eb16d 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -2,7 +2,7 @@ AUX 3.34-optional-bluetooth.patch 1971 BLAKE2B bac967362e46cbd8b76368377c607573e
 AUX 3.36-defaults.patch 1463 BLAKE2B c529ac85d19699d0837f4060011b8b7dd03773af4425ea27f4b87841ee6a77f222ee242e34550ca3807dc7330e0c411576f3e4e8dbbaacf684b7ca706133cc81 SHA512 f6656b0baaf53d919ee8ad54550909aed9b86280de3f6ac3667d6a3506834476024cf42087860a4ee431d74dbcfa1c066e37d6d012450d76dbfd498fe0f1fb46
 DIST gnome-shell-3.36.7-patchset.tar.xz 6364 BLAKE2B 80a2e2a03e4cc3b15db6af872a2330c0921a63bcd03db78a970190fee93c982296b381d08ac4bd1cb5dbe5b14d9732e447445f5dcc06d607826a9026395f10bb SHA512 6f9145fd00117e6b4170e7457c83a8c3bbbbfc6086ce3bcd07813b5a4f05e58f42e889cc90799d6988af05fce9791a792e4d8d60ffe58818563c852f9923930d
 DIST gnome-shell-3.36.7.tar.xz 1777236 BLAKE2B 4dd3b98e8a2ffa711bffe0b3b78708c85c1979122ee71e7e0d7c55626a608ba4598071bf8659338c960ba4b0349e5b621b97f294a4961cf021b9047753136af5 SHA512 7275d1e2d2629abd2fbfae910a77c25485464e39f8317ba1b0e8e1ae3368e69af4eb85c2611e82ea04270bfd8185e24f13002df9b13335adbdff144847790656
-DIST gnome-shell-3.38.1.tar.xz 1812860 BLAKE2B d58dd9f5962d953f4bfa8aede62e24007185e0b4b82781c54cce87d8505657e01b0f76a9119b60634e6c723b7dd9320f5c56b984b59cc8fce61ad4a897291b44 SHA512 7ab580f892c4b4dac2fc8625343dfab1bf7a11e148dc01e6e805a5b1ac1d4cb17943b9a3058ec69fc086c270d76ef8073dca494991a5da1dcfa52b42dcc03f01
+DIST gnome-shell-3.38.2.tar.xz 1814152 BLAKE2B 765f584ad8f71ac185e9dc6683f1866308c126d8ce8ba9330068e324ea9586b57315cf7feade62eb4142bb3a4effd80c7e6e0d7b36b6c5fb7d547e3bff9c2ab2 SHA512 ac37549039a11f4f1b2cdd8b0f8cab72093efca74a5909ad187121565cce737c6a6f296c7241ac5f2174fdfcf11070f7584e713e244fafc911fe039d8fd05f04
 EBUILD gnome-shell-3.36.7.ebuild 6667 BLAKE2B 5fbfd1bf5a20ad8a7262a4bdc8c8b797ac3e5d34652fa2e50ad875778eb84f1a0f5be7c23ce7ed57d3d1e293c439a0dfad7bd7840d23e58ae1c83be31e1c6736 SHA512 bf5b0add1c462998859e3f32e8bae687ec53f9cd1911110a1246bd39361d1f219c326ccb2cf12e12b56e8673311fd7e5895cfdceb8a800f3d114b8cfee5f79ac
-EBUILD gnome-shell-3.38.1.ebuild 6303 BLAKE2B e248640eb2dbf2ed68dd569be20546334bd89353d87f364aa07d6b162fe02f939b7b51b23ed7a348b91dcab14e1050d2c9870d34e45a5b17a1a795d38233362a SHA512 1a03aa8066fd5acdc81d2dc649b6474bc4f731593d0dabae075530cee7ee12055d37570aa8450acfcb2f6cbfc8ed44fb266f6ee4f243468b45aa71ed0d03ab53
+EBUILD gnome-shell-3.38.2.ebuild 6304 BLAKE2B 3afdd773e134f62a466f6b9800477babd04446ede7bb7b8768f82b90bf540be0c6944b3c30805a51a17524a1afadc332d95bd34513ee8fc5f54dc63d0b632897 SHA512 abf9a4c80031a686b6332c506f452d8ebf0fe04cdccdd2d9798b8cdd933f8bac88c3302f6f591c4195c3b358246064349fdc6a04e9a88f6c0bc38d35cf9c863d
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.2.ebuild
index e512f2ed4767..e8428c44af46 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.38.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.38.2.ebuild
@@ -42,7 +42,7 @@ DEPEND="
 		net-libs/libnma[introspection]
 		>=app-crypt/libsecret-0.18
 		dev-libs/dbus-glib )
-	systemd? ( >=sys-apps/systemd-31
+	systemd? ( >=sys-apps/systemd-242
 		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
 	elogind? ( >=sys-auth/elogind-237 )
 	app-arch/gnome-autoar
diff --git a/gnome-base/libbonobo/Manifest b/gnome-base/libbonobo/Manifest
deleted file mode 100644
index 729addaa2c2c..000000000000
--- a/gnome-base/libbonobo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libbonobo-2.24.3.tar.bz2 1354929 BLAKE2B 44f8d7bf4530363dd680fb277dbacabb85a3871fd3645ef7aa4a2a4dbd112a31329c8295637f73e37853035ac0e2cd7b918b2966f58fbcccd5abc943c02a2cc5 SHA512 c97224ba2d4afc07e520399aa04849487a4ec4dd1b80b56e0472b4c3ebbddd0ce0105ba63ca2f823590788754791127dbe86b49cb39239db0019f8104db25716
-EBUILD libbonobo-2.24.3-r1.ebuild 1530 BLAKE2B 58997090a07fcefa0459a6220c71ed784e669ce92844c6d61b06f729876edd88ac885ee1b2b2a378d99de69d5492d1e21dc35b43114aef334e8717853da6249a SHA512 dc32354c1a34f40174137ca72bc852b29d65cb4dd23a8c387b38768268d38df9eeb2839f9de04182072ba1cd85aa063e5ffbf66362595aa7f2f7a8bbe94ac3e1
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
deleted file mode 100644
index 58672cf1a28d..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="GNOME CORBA framework"
-HOMEPAGE="https://developer.gnome.org/libbonobo/stable/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="debug examples test"
-
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	>=gnome-base/orbit-2.14.0
-	>=dev-libs/libxml2-2.4.20:2
-	>=sys-apps/dbus-1.0.0
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/popt-1.5
-	!gnome-base/bonobo-activation
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	virtual/yacc
-	sys-devel/flex
-	x11-apps/xrdb
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-"
-
-# Tests are broken in several ways as reported in bug #288689 and upstream
-# doesn't take care since libbonobo is deprecated.
-RESTRICT="test"
-
-src_prepare() {
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die
-
-	if ! use test; then
-		# don't waste time building tests, bug #226223
-		sed 's/tests//' -i Makefile.am Makefile.in || die
-	fi
-
-	if ! use examples; then
-		sed 's/samples//' -i Makefile.am Makefile.in || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable debug bonobo-activation-debug)
-}
-
-src_test() {
-	# Pass tests with FEATURES userpriv, see bug #288689
-	unset ORBIT_SOCKETDIR
-	emake check
-}
diff --git a/gnome-base/libbonobo/metadata.xml b/gnome-base/libbonobo/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libbonobo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
deleted file mode 100644
index 7f154c174b89..000000000000
--- a/gnome-base/libgnome-keyring/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 3.12.0-vala-0.42-compat.patch 811 BLAKE2B 1f50e441d0483d3748db1ed7d18e581df2887160a16afe7bb8a47890e162349cd5611070ea11ceef1273c8d4865b7f5ead6bfad14a171ca5d21d32d7a8811468 SHA512 12e16ca43044ca96a4f5abdd3d982bfd705e17df2630505154ad1592dbb8ce1bad66c4624a992084a1533d58fd96c178a5d4c147c79a5074183ceaaf54dde998
-DIST libgnome-keyring-3.12.0.tar.xz 435092 BLAKE2B 16e02ce3509b98e325658fc64e5731a872a050a9bf1b39dc81347a53aaee2fd4726ab9b0a41c7451249954a01144488e720f8356e77dda5bc9da5f78416d30e1 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd
-EBUILD libgnome-keyring-3.12.0-r1.ebuild 1600 BLAKE2B 1c01c314f1988c048787930d03ec216a4e22334ffc713d99315ebc5950155e1aa2de93362f53c6cab8cfad2fde53888d100105e407dbb8166daf663c7ad451e1 SHA512 4145bcbc2982433bc2507989f4709ea4bee2467674cf20d14bd3420527436190e9028d0b229d272daf08a313518b765f42dd99f9659f5c2cf8037c68b7ea2cec
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch b/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch
deleted file mode 100644
index dd420c86732e..000000000000
--- a/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3766bcc482f9e02fb5f9c183e814833ad1fbf08a Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 8 Jan 2019 12:19:36 +0100
-Subject: [PATCH] Fix vapi build with vala 0.42
-
----
- library/GnomeKeyring-1.0.metadata | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/library/GnomeKeyring-1.0.metadata b/library/GnomeKeyring-1.0.metadata
-index 04662fb..d8451b9 100644
---- a/library/GnomeKeyring-1.0.metadata
-+++ b/library/GnomeKeyring-1.0.metadata
-@@ -54,7 +54,7 @@ set_info skip=false
- set_network_password skip=false
- store_password skip=false
- store_password_sync skip=false
--unlock skip=false
-+@unlock skip=false
- 
- find_items*.callback type_arguments="GnomeKeyring.Found"
- find_network_password*.callback type_arguments="GnomeKeyring.NetworkPasswordData"
--- 
-2.18.1
-
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
deleted file mode 100644
index 7a5b74562aac..000000000000
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala multilib-minimal
-
-DESCRIPTION="Compatibility library for accessing secrets"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
-
-LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
-SLOT="0"
-IUSE="debug +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-
-# tests need python2
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
-	>=gnome-base/gnome-keyring-3.1.92
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PV}-vala-0.42-compat.patch
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# FIXME: Remove silly CFLAGS, report upstream
-	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
-		-i configure.ac configure || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(multilib_native_use_enable vala)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/gnome-keyring/html docs/reference/gnome-keyring/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/gnome-base/libgnome-keyring/metadata.xml b/gnome-base/libgnome-keyring/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgnome-keyring/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
deleted file mode 100644
index 20d2b2ab6cf7..000000000000
--- a/gnome-base/orbit/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX orbit-2.14.19-aix-func_data.patch 3631 BLAKE2B 10f94d0ee3203beb142f265a5f239fef31215163e8afc71561b08a4703f1938729d5041212641e204bc3eaedd162763c3e536afcf9d2ceabec496d934f0f075c SHA512 2b4414e1443a8d03c163677334f974664c2f64ccd100442f0d4a7dda61677fac397085deba9c36f0c1e70d3ab36f033d6f23d2d2c5ebaa4412bfed631783382b
-AUX orbit-2.14.19-automake-1.13.patch 674 BLAKE2B 8e6b8b79001c041334d1ed7164ee1944c06131596bdc2303b376f2a6e501e1f8ffdc09eba4d79e059699f1ebb2ce30653ea627cfbe5a0f520f11e3d54ced40d5 SHA512 a49043dd50d09893828ca5f71e4af4054ec68b322b244c1f5ce7eb0a471ddb9b099c9939c0a4d6b036d4e28a163e23ec29896baa2fffc137269fd61d34bce447
-AUX orbit-2.14.19-fPIC.patch 1650 BLAKE2B a6a28a41ef14e633d472142183722d881061ec1d6a70f3777247c3b75fb7b6c0aef88bbdb456bddda5eb03df32f9b7b7aae9dc1a641ea611fd4fd91b087c2f82 SHA512 31915edd0998b4738a5c97a74b4e4f84ac80a7db5a04e1f205ff2a2ea181df9bf471a839f75bef8bc96644c0e3c731e3cf6c47bedbccd07ab7b10f27e8e19da8
-AUX orbit-2.14.19-link_protocol_is_local.patch 1006 BLAKE2B 927492b912c5f8e557a3d4bb922b8250206c7359907cd330d0f55ac30d9955dc93c110018b55f0d093191396b694c46553c8b5a0d227a3bb805c03c8e09d38f3 SHA512 f765686448db2d190bebb85c165b5e32bb3e29a30f5407b5f3236dfcc0b0c94f77715d136678ec9021a9e450b22fbd7c0dfed3e30d070f795d708244594de2a8
-AUX orbit-2.14.19-parallel-build.patch 963 BLAKE2B 578f51e904cbaaa40d27b9c1a512958b34edb63ae0936edf1abaf25e29142c92250bb9b56d22583a28a6aad8266947f788b430bb869a57a82e4a1349a0fa312f SHA512 f38605716bc0c72ba87be108ad7dd3f86779fd548183abe847b74a74ad009778b42ebfc8bee0d97033f698ad28b6e383708c6033725568f37226a6de1221c187
-DIST ORBit2-2.14.19.tar.bz2 764820 BLAKE2B 8b1180da6c5ae90e83edd330387da2974fd57d60fe79fa99b9f6f87fe7c4b9a816504c76fa055fef0c63cc72d3cccce3be410eb6945549ff30703ca26c8df631 SHA512 313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e
-EBUILD orbit-2.14.19-r5.ebuild 3068 BLAKE2B f432f7fe66432b9ee8a6e1289663bf3d3ade314acb0a14012e42cdbf33c4822e9388f8bb39ad9b42a33ec152d01c0af7f8a7a88e3517e2b9a7a23be44f8c9908 SHA512 0c3a84f276706058e00a04b81029568c13f0c6b560c94985b91e1f13a664c4bf572a74c7da684241953c9a0df61dd9bb28617c53586239a4e99a679dd11e70ed
-MISC metadata.xml 359 BLAKE2B e60465ce144792058da10587759ba4c1ca3d754b29aa0be28b12efe72eb0616f5b25969f1102612ff37cbe296e0093e0fab0417800ee1efaef6fdf6941800f1f SHA512 07fe8b368b9f16c31d09701b1b1f6714ea3a305f9578705681b212d442e2e216a2d5649e9c76195f004f782a6e32e1eb94a8d9742e6593ce1bd76a7a8af6f385
diff --git a/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch b/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch
deleted file mode 100644
index b58fd00a10b8..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From c50f193f69f9b14dd26fafb7cb4c9514eaa6f15e Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
-Date: Thu, 26 Jun 2014 12:45:18 +0200
-Subject: [PATCH 1/2] bug#732275: rename func_data to gfunc_data for AIX
-
----
- include/orbit/orb-core/allocators.h |  2 +-
- src/idl-compiler/orbit-idl-utils.c  | 14 +++++++-------
- src/idl-compiler/orbit-idl2.h       |  4 ++--
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/include/orbit/orb-core/allocators.h b/include/orbit/orb-core/allocators.h
-index 0401a15..1861ca1 100644
---- a/include/orbit/orb-core/allocators.h
-+++ b/include/orbit/orb-core/allocators.h
-@@ -41,7 +41,7 @@ gpointer ORBit_realloc_tcval (gpointer       old,
-     Below, some magic values of the fnc ptr are defined.
- **/
- typedef gpointer (*ORBit_Mem_free_fn) (gpointer mem,
--				       gpointer func_data);
-+				       gpointer gfunc_data);
- 
- #define ORBIT_MEMHOW_HOW(how)      ((how) & 0x3)
- #define ORBIT_MEMHOW_ELEMENTS(how) ((how) >> 2)
-diff --git a/src/idl-compiler/orbit-idl-utils.c b/src/idl-compiler/orbit-idl-utils.c
-index 3bb0467..04fe4a2 100644
---- a/src/idl-compiler/orbit-idl-utils.c
-+++ b/src/idl-compiler/orbit-idl-utils.c
-@@ -362,7 +362,7 @@ orbit_idl_print_node(IDL_tree node, int indent_level)
- 
- static void
- IDL_tree_traverse_helper(IDL_tree p, GFunc f,
--			 gconstpointer func_data,
-+			 gconstpointer gfunc_data,
- 			 GHashTable *visited_nodes,
- 			 gboolean    include_self)
- {
-@@ -376,17 +376,17 @@ IDL_tree_traverse_helper(IDL_tree p, GFunc f,
- 	for (curitem = IDL_INTERFACE (p).inheritance_spec; curitem;
- 	     curitem = IDL_LIST (curitem).next) {
- 		IDL_tree_traverse_helper (IDL_get_parent_node 
--			(IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, func_data, visited_nodes, TRUE);
-+			(IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, gfunc_data, visited_nodes, TRUE);
- 	}
- 
- 	if (include_self)
--		f(p, (gpointer)func_data);
-+		f(p, (gpointer)gfunc_data);
- }
- 
- void
- IDL_tree_traverse_parents_full (IDL_tree      p,
- 				GFunc         f,
--				gconstpointer func_data,
-+				gconstpointer gfunc_data,
- 				gboolean      include_self)
- {
- 	GHashTable *visited_nodes = g_hash_table_new (NULL, g_direct_equal);
-@@ -400,7 +400,7 @@ IDL_tree_traverse_parents_full (IDL_tree      p,
- 	if (!p)
- 		return;
- 
--	IDL_tree_traverse_helper (p, f, func_data, visited_nodes, include_self);
-+	IDL_tree_traverse_helper (p, f, gfunc_data, visited_nodes, include_self);
- 
- 	g_hash_table_destroy (visited_nodes);
- }
-@@ -408,9 +408,9 @@ IDL_tree_traverse_parents_full (IDL_tree      p,
- void
- IDL_tree_traverse_parents (IDL_tree p,
- 			   GFunc f,
--			   gconstpointer func_data)
-+			   gconstpointer gfunc_data)
- {
--	IDL_tree_traverse_parents_full (p, f, func_data, TRUE);
-+	IDL_tree_traverse_parents_full (p, f, gfunc_data, TRUE);
- }
- 
- /* For use by below function */
-diff --git a/src/idl-compiler/orbit-idl2.h b/src/idl-compiler/orbit-idl2.h
-index b58f57f..670e072 100644
---- a/src/idl-compiler/orbit-idl2.h
-+++ b/src/idl-compiler/orbit-idl2.h
-@@ -16,10 +16,10 @@ void     orbit_idl_print_node            (IDL_tree      node,
- 					  int           indent_level);
- void     IDL_tree_traverse_parents       (IDL_tree      p,
- 					  GFunc         f,
--					  gconstpointer func_data);
-+					  gconstpointer gfunc_data);
- void     IDL_tree_traverse_parents_full  (IDL_tree      p,
- 					  GFunc         f,
--					  gconstpointer func_data, 
-+					  gconstpointer gfunc_data,
- 					  gboolean      include_self);
- gboolean orbit_cbe_type_contains_complex (IDL_tree      ts);
- void     orbit_idl_check_oneway_op       (IDL_tree      op);
--- 
-1.8.3.2
-
diff --git a/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch b/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch
deleted file mode 100644
index fcfeefba08cb..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- test/everything/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am
-index 32beb36..1eef7ac 100644
---- a/test/everything/Makefile.am
-+++ b/test/everything/Makefile.am
-@@ -73,12 +73,12 @@ server_DEPENDENCIES=${EVERYTHING_BUILT} $(included_src)
- 
- IDL_FLAGS= --showcpperrors --add-imodule
- IDL_FILES= everything.idl
--include $(top_srcdir)/Makefile.shared
-+include ../../Makefile.shared
- 
- BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c
- CLEANFILES = ${BUILT_SOURCES} iorfile
- 
--TESTS = $(srcdir)/test.sh
-+TESTS = test.sh
- 
- EXTRA_DIST = $(IDL_FILES) test.sh $(included_src)
- 
diff --git a/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch b/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch
deleted file mode 100644
index 394919f98568..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 31236105deaa4b50a70aa256819bfc4790f705d8 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 3 Mar 2013 13:29:24 -0500
-Subject: [PATCH] Add an option to build libname-server-2.a's objects as PIC
-
-Needed for Gentoo hardened, see https://bugs.gentoo.org/show_bug.cgi?id=312161
----
- configure.in                  | 9 +++++++++
- src/services/name/Makefile.am | 1 +
- 2 files changed, 10 insertions(+)
-
-diff --git a/configure.in b/configure.in
-index 0879051..38b7b8b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -118,6 +118,15 @@ if test z$enable_purify = zyes; then
- 	AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled])
- fi
- 
-+AC_ARG_ENABLE([libname-server-pic],
-+	[AS_HELP_STRING([--enable-libname-server-pic], [force libname-server-2.a to be built as PIC])])
-+if test x$enable_libname_server_pic = xyes; then
-+	LIBNAME_SERVER_PIC=$lt_prog_compiler_pic
-+else
-+	LIBNAME_SERVER_PIC=
-+fi
-+AC_SUBST(LIBNAME_SERVER_PIC)
-+
- AC_MSG_CHECKING(which idl compiler to use)
- IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"
- AC_ARG_WITH(idl-compiler,
-diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am
-index 7212557..21b7365 100644
---- a/src/services/name/Makefile.am
-+++ b/src/services/name/Makefile.am
-@@ -65,6 +65,7 @@ name_client_2_LDADD = $(LDADDS)
- libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \
- 			   name-support.c name-support.h
- libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
-+libname_server_2_a_CFLAGS = $(INCLUDES) $(LIBNAME_SERVER_PIC)
- 
- orbit_name_server_2_SOURCES = boot.c
- orbit_name_server_2_LDFLAGS = $(FLAGS)
--- 
-1.8.1.5
-
diff --git a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch b/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch
deleted file mode 100644
index 2344935f46d2..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8b9acc9bd4ac9be12317f24c7ecafc4200e19609 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 12 Feb 2013 00:27:41 -0500
-Subject: [PATCH] Fix link_protocol_is_local_ipv46 for ipv4 on some
- ipv6-enabled machines
-
-Ensure that saddr is compared to an ipv4 local_addr, not to an ipv6 one,
-by setting hints.ai_family before calling getaddrinfo().
-
-https://bugzilla.gnome.org/show_bug.cgi?id=693636
----
- linc2/src/linc-protocols.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/linc2/src/linc-protocols.c b/linc2/src/linc-protocols.c
-index e6895f4..22a77aa 100644
---- a/linc2/src/linc-protocols.c
-+++ b/linc2/src/linc-protocols.c
-@@ -383,6 +383,7 @@ link_protocol_is_local_ipv46 (const LinkProtocolInfo *proto,
- 		memset(&hints, 0, sizeof(hints));
- 		hints.ai_socktype = SOCK_STREAM;
- 		hints.ai_flags = AI_CANONNAME;
-+		hints.ai_family = proto->family;
- 
- 		if (getaddrinfo(link_get_local_hostname(), NULL, &hints, &local_addr) != 0) {
- 			if (!warned++)
--- 
-1.8.1.2
-
diff --git a/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch b/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch
deleted file mode 100644
index 113b90465bae..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c67303ecfdf80072a2852433c7f7818113e61c06 Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
-Date: Thu, 26 Jun 2014 12:37:59 +0200
-Subject: [PATCH 2/2] bug#732274: fix parallel build failure
-
----
- src/services/name/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am
-index deda1ed..8cf868e 100644
---- a/src/services/name/Makefile.am
-+++ b/src/services/name/Makefile.am
-@@ -68,7 +68,7 @@ libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
- 
- orbit_name_server_2_SOURCES = boot.c
- orbit_name_server_2_LDFLAGS = $(FLAGS)
--orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h
-+orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h libname-server-2.a
- orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS)
- 
- $(libname_server_2_a_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h
--- 
-1.8.3.2
-
diff --git a/gnome-base/orbit/metadata.xml b/gnome-base/orbit/metadata.xml
deleted file mode 100644
index 0d28a3e32644..000000000000
--- a/gnome-base/orbit/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="pic">Force libname-server-2 to be built as PIC; needed on
-		hardened systems</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/orbit/orbit-2.14.19-r5.ebuild b/gnome-base/orbit/orbit-2.14.19-r5.ebuild
deleted file mode 100644
index 989d5d6b26e2..000000000000
--- a/gnome-base/orbit/orbit-2.14.19-r5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="ORBit2"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="ORBit2 is a high-performance CORBA ORB"
-HOMEPAGE="https://projects.gnome.org/ORBit2/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="pic static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( debug )"
-
-RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libIDL-0.8.14-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/orbit-2.0/orbit/orbit-config.h )
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/orbit2-config )
-
-src_prepare() {
-	# Fix wrong process kill, bug #268142
-	sed "s:killall lt-timeout-server:killall timeout-server:" \
-		-i test/timeout.sh || die "sed 1 failed"
-
-	# Do not mess with CFLAGS
-	sed 's/-ggdb -O0//' -i configure.in configure || die "sed 2 failed"
-
-	if ! use test; then
-		sed -i -e 's/test //' Makefile.am || die
-	fi
-
-	# Drop failing test, bug #331709
-	sed -i -e 's/test-mem //' test/Makefile.am || die
-
-	# Fix link_protocol_is_local() for ipv4 on machines with ipv6
-	# https://bugzilla.gnome.org/show_bug.cgi?id=693636
-	epatch "${FILESDIR}/${PN}-2.14.19-link_protocol_is_local.patch"
-
-	# Build libname-server-2.a with -fPIC on hardened, bug #312161
-	epatch "${FILESDIR}/${PN}-2.14.19-fPIC.patch"
-
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch
-	epatch "${FILESDIR}"/${P}-parallel-build.patch #273031
-	epatch "${FILESDIR}"/${P}-aix-func_data.patch #515094
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# we have to copy sources, there is something that causes tests
-	# to segfault when libs are out-of-source built.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
-	# files to be not found by autotools when compiling ORBit.  See bug #58540
-	# for more information.  Please don't remove -- 8/18/06
-	unset IDL_DIR
-
-	# We need to use the hosts IDL compiler if cross-compiling, bug #262741
-	if tc-is-cross-compiler; then
-		# check that host version is present and executable
-		[[ -x ${EPREFIX}/usr/bin/orbit-idl-2 ]] || die "Please emerge ~${CATEGORY}/${P} on the host system first"
-		myconf=("${myconf[@]}" "--with-idl-compiler=${EPREFIX}/usr/bin/orbit-idl-2")
-	fi
-	gnome2_src_configure \
-		$(use_enable pic libname-server-pic) \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	# Parallel compilation fails, bug #635094
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_test() {
-	# can fail in parallel, see bug #235994
-	emake -j1 check
-}