gentoo auto-resync : 29:10:2022 - 04:00:35

6 files changed, 17 insertions, 9 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 87b2fabe91e7..a7043a3544ea 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index be3cc7df8bcd..6fca73b0b48d 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2140 BLAKE2B 181f2405c7d762242314a96df3674360f9f98edf168dee983332b58be81db967d6fbee6e1e8c5a622d13dcfdd86f4bba7757c192ef2cd2a0575e16f31eaa12a5 SHA512 384e2d0571621402b9e3cfa0cc666d244e93e42e6520c1d88651c26d3fed1cd3d7b443e7d0e87d7eb4518798a779ee075ff51390d3835b043f4e82ce4e2ad9b8
 DIST gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
-EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1939 BLAKE2B c4a6ceecdb733ed619f03e4e2c66ac8641c90dde6e1e35434ee50de1fb8da2aacf7c336870d7835368b6f1423b9b7d0891d7a9bc287f953fdff07706ebbc6042 SHA512 995d3f9bbc1496a4af8d238a139e88d50fd6e339506c198ba65af711f808ebe5fe4bdabba86fe837b55f49a031944625441e5206ab3631cea41b4b134dce3dac
-MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
+EBUILD gnome-doc-utils-0.20.10-r3.ebuild 2039 BLAKE2B 1187c4476fceb492869dde37ba7fcd84ca0348f0366b8be20073a66099ab2e6c68e52f00a3c7f925b34c35735e346ccdf0bc7f3a0456461e0a7691de7ba8e19f SHA512 1dedea65fd173f3b7009a299d01c361eeaf57aebc4ebcf5ff4ae5f4730487bbfbd45f801f40003ee5bc085933b069d70f986e6f2e7fa7fdee9e8eec3e6136138
+MISC metadata.xml 358 BLAKE2B 2eea9f0df67157d1f3fb590f9b48dfd4ec8e5c04daadd2cb540787cbd3eaafe8fda16dfe1f5c871bb90d6d9346e6519f0f9c351664a762845f1500fd35ae57a6 SHA512 791f779816b0edcadecef7e96b767ff3867fe3e296b9fb2c84442bb27562906920f593971f2b733aebfc95e522a2ed275ecfcdc31e06737be835a1316e24deb8
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
index 748e7a382e70..3c536ca4e4ca 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{7..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
 
-inherit gnome2 multibuild python-r1
+inherit gnome2 python-r1
 
 DESCRIPTION="A collection of documentation utilities for the Gnome project"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
-SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10-python3.patch"
+SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/${P}-python3.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -24,6 +23,8 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.4
 	app-text/scrollkeeper-dtd
+"
+BDEPEND="
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/awk
@@ -39,6 +40,10 @@ src_prepare() {
 	eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
 	eapply "${DISTDIR}"/${P}-python3.patch
 
+	# Empty py-compile, so it doesn't write its own pyo/pyc files
+	echo > "${S}"/py-compile
+	chmod a+x "${S}"/py-compile || die
+
 	gnome2_src_prepare
 
 	# Leave shebang alone
diff --git a/app-text/gnome-doc-utils/metadata.xml b/app-text/gnome-doc-utils/metadata.xml
index c6e394b17a27..b176e403791e 100644
--- a/app-text/gnome-doc-utils/metadata.xml
+++ b/app-text/gnome-doc-utils/metadata.xml
@@ -5,4 +5,7 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">Archive/gnome-doc-utils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 65a40d0cc886..d90ff5e2afeb 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,5 +1,5 @@
 DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae
 DIST xapian-omega-1.4.21.tar.xz 568440 BLAKE2B 445152c23f58471402d8017906083123c0a0e55eb8feed8908dae46680148471a65c51ef146c693cbbb807ce7a70d6589c0a77c2508c39417b95f292d5e8b9f1 SHA512 a313725084c3c336655a3beaa2c1e6c9186027bf6c90f0c5261f748a08e1e8d1ef9d43b0c6bad5bbd5a5af9d1f3db49b915435e5e815f9e97d452590522e85ec
 EBUILD xapian-omega-1.4.19.ebuild 1183 BLAKE2B 860088e7f9d5818b0de08d8aa5d5e1b7c83b98ea892dbf579934c069bd275f6580651afe3ed7f280deaa66e76d8a105be8b001b7d5d968ed6e15a366063c209c SHA512 8abda4b0e180124d2f6c514d800dfaf005f1873555609479d72588ce3100bd711be9b8224fb61951ca3224c81d9a26b4476d771a0fd6b443a996570db6d68c12
-EBUILD xapian-omega-1.4.21.ebuild 1189 BLAKE2B 903109b97d7bdf608a4919f51e4ebe983dd91ee1f147a340dd522206f4e10ce0b232888a8b2b166f08ce38e94297e480015e19cc5e2e939d98f5cc8ae5146673 SHA512 eea182953545f5d24fdb6d09f2c8084c6ebc3eb9fa1f57e55ccfade81efd15a2df5850eac475531cc7f99673ab683e3cfba9b418f19055faeb38933ea76f7156
+EBUILD xapian-omega-1.4.21.ebuild 1188 BLAKE2B 37df080c39728f3cc87edafc1c08afd6e667bc1a4705ca00573c935865dc8eede821acb401dd60ee0591122bd94942c09f06ff8e1e2429a2721e70dd224b1093 SHA512 6365fe6b20cb93c1785f555fc866d5e24598ac9c70449b1a151a997fffda34bc4eed22d459b37039514c97f64f010ba52dfdc296b3df98568dc9f1dd9e52484f
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/app-text/xapian-omega/xapian-omega-1.4.21.ebuild b/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
index 91ff25791e25..23a122dd7cc4 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="~dev-libs/xapian-${PV}:0/30