[gentoo-commits] repo/gentoo:master commit in: app-text/gnome-doc-utils/

["Matt Turner" <mattst88@gentoo.org>]

commit:     4b84491db726a8b5a55d772dcf3a2766b6154f46
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 20:48:48 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 21:13:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b84491d

app-text/gnome-doc-utils: Bump to EAPI=8

* add Python 3.11 compatibility.
* don't install stray pyc files (bug #863968)

Closes: https://bugs.gentoo.org/863968
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ....20.10-r2.ebuild => gnome-doc-utils-0.20.10-r3.ebuild} | 15 ++++++++++-----
 app-text/gnome-doc-utils/metadata.xml                     |  3 +++
 2 files changed, 13 insertions(+), 5 deletions(-)

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
similarity index 86%
rename from app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
rename to 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>