[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     31dcb27958c21cfb89f1dc3d84fa67861d230d9f
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 18:23:47 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 18:27:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31dcb279

net-misc/iputils: simplify manpage handling

Always build manpages from source instead of hacking in prebuilt copies
from an auxiliary tarball.

Closes: https://bugs.gentoo.org/895160
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/iputils/Manifest                |  1 -
 net-misc/iputils/iputils-20221126.ebuild | 63 +++++--------------------------
 net-misc/iputils/iputils-99999999.ebuild | 65 ++++++--------------------------
 3 files changed, 21 insertions(+), 108 deletions(-)

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 3b7e1d5bcdd1..eeedf8998123 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,4 +1,3 @@
 DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
-DIST iputils-20221126-docs.tar.xz 13000 BLAKE2B 8a9dae136f6555ed933f97d26be82a7d9ab228efd40cc03d065b39374f13000604e3bbbc856124076ec6934c92845d7b974eff64bbf65fc3a63a2266ba920e2f SHA512 efa60b618238b6e7614828a3c3a30e58ac311a82a686a28a186110cc28dae96f509199f057b1855b08954b1b5a3f6be63e0de6c0c028f4eb5f88c6dcd973a93b
 DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f
 DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee

diff --git a/net-misc/iputils/iputils-20221126.ebuild b/net-misc/iputils/iputils-20221126.ebuild
index 67616acd2ae3..4894fc00c904 100644
--- a/net-misc/iputils/iputils-20221126.ebuild
+++ b/net-misc/iputils/iputils-20221126.ebuild
@@ -18,10 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
 	inherit git-r3
 else
-	SRC_URI="
-		https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-docs.tar.xz
-	"
+	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -50,21 +47,16 @@ DEPEND="
 	virtual/os-headers
 "
 BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-ns-stylesheets
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
 	virtual/pkgconfig
 	test? ( sys-apps/iproute2 )
 	nls? ( sys-devel/gettext )
 "
 
-if [[ ${PV} == *9999 ]] ; then
-	BDEPEND+="
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-ns-stylesheets
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	"
-fi
-
 src_prepare() {
 	default
 
@@ -83,20 +75,10 @@ src_configure() {
 		-Dsystemdunitdir=$(systemd_get_systemunitdir)
 		-DUSE_GETTEXT=$(usex nls true false)
 		$(meson_use !test SKIP_TESTS)
+		-DBUILD_HTML_MANS=$(usex doc true false)
+		-DBUILD_MANS=true
 	)
 
-	if [[ ${PV} == *9999 ]] ; then
-		emesonargs+=(
-			-DBUILD_HTML_MANS=$(usex doc true false)
-			-DBUILD_MANS=true
-		)
-	else
-		emesonargs+=(
-			-DBUILD_HTML_MANS=false
-			-DBUILD_MANS=false
-		)
-	fi
-
 	meson_src_configure
 }
 
@@ -131,33 +113,8 @@ src_install() {
 		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
 	fi
 
-	if [[ ${PV} != *9999 ]] ; then
-		local -a man_pages
-		local -a html_man_pages
-
-		while IFS= read -r -u 3 -d $'\0' my_bin; do
-			my_bin=$(basename "${my_bin}")
-			[[ -z "${my_bin}" ]] && continue
-
-			if [[ -f "${WORKDIR}/${PN}-99999999-docs/doc/${my_bin}.8" ]] ; then
-				man_pages+=( ${my_bin}.8 )
-			fi
-
-			if [[ -f "${WORKDIR}/${PN}-99999999-docs/doc/${my_bin}.html" ]] ; then
-				html_man_pages+=( ${my_bin}.html )
-			fi
-		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
-
-		pushd "${WORKDIR}"/${PN}-99999999-docs/doc &>/dev/null || die
-		doman "${man_pages[@]}"
-		if use doc ; then
-			dodoc "${html_man_pages[@]}"
-		fi
-		popd &>/dev/null || die
-	else
-		if use doc ; then
-			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
-		fi
+	if use doc ; then
+		mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
 	fi
 }
 

diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index a23c56b4174c..2f756af81d38 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # For released versions, we precompile the man/html pages and store
@@ -18,10 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
 	inherit git-r3
 else
-	SRC_URI="
-		https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-docs.tar.xz
-	"
+	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -50,21 +47,16 @@ DEPEND="
 	virtual/os-headers
 "
 BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-ns-stylesheets
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
 	virtual/pkgconfig
 	test? ( sys-apps/iproute2 )
 	nls? ( sys-devel/gettext )
 "
 
-if [[ ${PV} == *9999 ]] ; then
-	BDEPEND+="
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-ns-stylesheets
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	"
-fi
-
 src_prepare() {
 	default
 
@@ -83,20 +75,10 @@ src_configure() {
 		-Dsystemdunitdir=$(systemd_get_systemunitdir)
 		-DUSE_GETTEXT=$(usex nls true false)
 		$(meson_use !test SKIP_TESTS)
+		-DBUILD_HTML_MANS=$(usex doc true false)
+		-DBUILD_MANS=true
 	)
 
-	if [[ ${PV} == *9999 ]] ; then
-		emesonargs+=(
-			-DBUILD_HTML_MANS=$(usex doc true false)
-			-DBUILD_MANS=true
-		)
-	else
-		emesonargs+=(
-			-DBUILD_HTML_MANS=false
-			-DBUILD_MANS=false
-		)
-	fi
-
 	meson_src_configure
 }
 
@@ -131,33 +113,8 @@ src_install() {
 		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
 	fi
 
-	if [[ ${PV} != *9999 ]] ; then
-		local -a man_pages
-		local -a html_man_pages
-
-		while IFS= read -r -u 3 -d $'\0' my_bin; do
-			my_bin=$(basename "${my_bin}")
-			[[ -z "${my_bin}" ]] && continue
-
-			if [[ -f "${WORKDIR}/${PN}-99999999-docs/doc/${my_bin}.8" ]] ; then
-				man_pages+=( ${my_bin}.8 )
-			fi
-
-			if [[ -f "${WORKDIR}/${PN}-99999999-docs/doc/${my_bin}.html" ]] ; then
-				html_man_pages+=( ${my_bin}.html )
-			fi
-		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
-
-		pushd "${WORKDIR}"/${PN}-99999999-docs/doc &>/dev/null || die
-		doman "${man_pages[@]}"
-		if use doc ; then
-			dodoc "${html_man_pages[@]}"
-		fi
-		popd &>/dev/null || die
-	else
-		if use doc ; then
-			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
-		fi
+	if use doc ; then
+		mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
 	fi
 }