5 files changed, 21 insertions, 67 deletions
diff --git a/app-doc/devmanual/Manifest b/app-doc/devmanual/Manifest
index 57a22b2e3638..ab50a79b02ba 100644
--- a/app-doc/devmanual/Manifest
+++ b/app-doc/devmanual/Manifest
@@ -1,2 +1 @@
-DIST devmanual-0_pre20200207.tar.xz 163940 BLAKE2B c6cf856a8f6c80b500466e27cc4106c070cff2dcf8c89d58c9ca90d03cb34a1e6a2048cb99364993f224f3497309fc24207dc44f9c14ece37c49aa602480dac0 SHA512 f6a88312e2030bf4d9fcf64bf1f38397087cb151aa41cd0c254cfc6251e4d5b291e3b361094a7c1d5fdb16e40c1702c0f0b7460ba230bfb217ad733f400c9089
-DIST devmanual-0_pre20210118.tar.xz 165552 BLAKE2B 17b11ab8b5ec31b93fca95c472e7d137157c3d7629b80be26648d5b77f6a6a0709d1a622a079207695fe48cd9d24d48f5ece0a24259106547d84e7c47cb2199b SHA512 2cf40936ab6ee0acda6f71d44d4cbff03ed195688f172d749b32dab9edde005ab9c4ad28d84f7ad01fc82e0fb8a9441cba20c4c7435f21067abf49fe8da739ff
+DIST devmanual-0_pre20231106.tar.xz 187040 BLAKE2B 20992be79db2b581234a813740bd59c697af624d6edc86e29375078b63cdc13bed3eae116e21d2b82d568703983860cae7be00649f24eb90f2a6f6b7837525d7 SHA512 0434e0155876dff01105ac014528d8abaa19631c5b260d2c8c995c417053403ae652d4e082d0a08549994e3238024ed2592b145c6b0435ed84f87397fb7aeacc
diff --git a/app-doc/devmanual/devmanual-0_pre20200207.ebuild b/app-doc/devmanual/devmanual-0_pre20200207.ebuild
deleted file mode 100644
index fdaf6ddcf5de..000000000000
--- a/app-doc/devmanual/devmanual-0_pre20200207.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="The Gentoo Development Guide"
-HOMEPAGE="https://devmanual.gentoo.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-	S="${WORKDIR}/${PN}"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-fi
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-IUSE="+offline"
-
-BDEPEND="dev-libs/libxml2
-	dev-libs/libxslt
-	gnome-base/librsvg
-	media-fonts/open-sans"
-
-PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
-
-src_compile() {
-	emake OFFLINE=$(usex offline 1 0)
-}
-
-src_install() {
-	emake OFFLINE=$(usex offline 1 0) \
-		DESTDIR="${D}" \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
-		offline mode, point your browser to the following url:
-		file://${EPREFIX}/usr/share/doc/${PF}/html/index.html"
-	if ! has_version app-doc/eclass-manpages; then
-		DOC_CONTENTS+="\\n\\nThe offline version of the devmanual does not
-			include the documentation for the eclasses. If you need it,
-			then emerge app-doc/eclass-manpages."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-doc/devmanual/devmanual-0_pre20210118.ebuild b/app-doc/devmanual/devmanual-0_pre20231106.ebuild
index c0d0cc2866b8..047ecb33eb2d 100644
--- a/app-doc/devmanual/devmanual-0_pre20210118.ebuild
+++ b/app-doc/devmanual/devmanual-0_pre20231106.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="The Gentoo Development Guide"
@@ -16,18 +17,20 @@ else
 	# "make dist" in devmanual repo
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 	S="${WORKDIR}/${PN}"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 fi
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
-IUSE="+offline"
+IUSE="+offline test"
+RESTRICT="!test? ( test )"
 
-BDEPEND="dev-libs/libxml2
+BDEPEND=">=dev-libs/libxml2-2.9.12
 	dev-libs/libxslt
 	gnome-base/librsvg
 	media-fonts/open-sans
-	${PYTHON_DEPS}"
+	${PYTHON_DEPS}
+	test? ( >=app-text/htmltidy-5.8.0 )"
 
 PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
 
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index 9f8b6b8defcd..13af86d6e06c 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="The Gentoo Development Guide"
@@ -16,7 +17,7 @@ else
 	# "make dist" in devmanual repo
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 	S="${WORKDIR}/${PN}"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="CC-BY-SA-4.0"
@@ -24,7 +25,7 @@ SLOT="0"
 IUSE="+offline test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="dev-libs/libxml2
+BDEPEND=">=dev-libs/libxml2-2.9.12
 	dev-libs/libxslt
 	gnome-base/librsvg
 	media-fonts/open-sans
diff --git a/app-doc/devmanual/metadata.xml b/app-doc/devmanual/metadata.xml
index c626bfe0ceba..6a60b0581871 100644
--- a/app-doc/devmanual/metadata.xml
+++ b/app-doc/devmanual/metadata.xml
@@ -8,9 +8,14 @@
     product "Documentation", component "Devmanual"
   </description>
 </maintainer>
+<stabilize-allarches/>
 <use>
   <flag name="offline">
     Use alternative minimal stylesheet instead of Tyrian theme
   </flag>
 </use>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="gentoo">proj/devmanual</remote-id>
+</upstream>
 </pkgmetadata>