[gentoo-commits] repo/gentoo:master commit in: dev-tex/rubber/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     c88e07bca04459db8a41263dad07164bca3c741f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 11:32:35 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 11:37:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c88e07bc

dev-tex/rubber: Install GNU Info file in correct location

Avoid doubled ${PF}/${PN} directory in /usr/share/doc/.

Drop python_install() because distutils-r1_python_install ignores its
arguments when in PEP517 mode.

Closes: https://bugs.gentoo.org/930342
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../{rubber-1.6.5.ebuild => rubber-1.6.5-r1.ebuild}      | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/dev-tex/rubber/rubber-1.6.5.ebuild b/dev-tex/rubber/rubber-1.6.5-r1.ebuild
similarity index 91%
rename from dev-tex/rubber/rubber-1.6.5.ebuild
rename to dev-tex/rubber/rubber-1.6.5-r1.ebuild
index cc981e17fe39..0d6cb11369e9 100644
--- a/dev-tex/rubber/rubber-1.6.5.ebuild
+++ b/dev-tex/rubber/rubber-1.6.5-r1.ebuild
@@ -93,18 +93,12 @@ python_test() {
 	./run.sh * || die "Tests failed with ${EPYTHON}"
 }
 
-python_install() {
-	local my_install_args=(
-		--mandir="${EPREFIX}/usr/share/man"
-		--infodir="${EPREFIX}/usr/share/info"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	distutils-r1_python_install "${my_install_args[@]}"
-}
-
 src_install() {
 	distutils-r1_src_install
 
-	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
+	# Move misplaced files to correct location
+	doinfo doc/${PN}/${PN}.info
+	rm "${ED}"/usr/share/doc/${PN}/${PN}.{texi,info} || die
+	mv "${ED}"/usr/share/doc/{${PN}/*,${PF}/} || die
+	rmdir "${ED}"/usr/share/doc/${PN} || die
 }