From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F23991581E7 for ; Sun, 21 Apr 2024 11:38:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9D5DE29E8; Sun, 21 Apr 2024 11:38:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C8496E29E8 for ; Sun, 21 Apr 2024 11:38:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB56F34340C for ; Sun, 21 Apr 2024 11:38:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 213B31732 for ; Sun, 21 Apr 2024 11:38:32 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1713699470.c88e07bca04459db8a41263dad07164bca3c741f.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tex/rubber/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-tex/rubber/rubber-1.6.5-r1.ebuild dev-tex/rubber/rubber-1.6.5.ebuild X-VCS-Directories: dev-tex/rubber/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: c88e07bca04459db8a41263dad07164bca3c741f X-VCS-Branch: master Date: Sun, 21 Apr 2024 11:38:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5af4e351-fe02-4e0c-a938-54344606dfdf X-Archives-Hash: eef9bb83c25e6ab33d415a22ad4b40b9 commit: c88e07bca04459db8a41263dad07164bca3c741f Author: Ulrich Müller gentoo org> AuthorDate: Sun Apr 21 11:32:35 2024 +0000 Commit: Ulrich Müller gentoo 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 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 }