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

["Sam James" <sam@gentoo.org>]

commit:     91046f11889af3d05a54ba858e5b85506e121d96
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  3 06:59:46 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct  3 07:04:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91046f11

net-misc/iputils: add 20240905

This also essentially reverts commit 8fd3bbe19eb695fb5ca88375e4d814070ab33639
(brings back the doc/man page logic as it's now in an upstream release).

Includes a patch from Eli (https://github.com/iputils/iputils/pull/556).

Bug: https://bugs.gentoo.org/908817
Closes: https://bugs.gentoo.org/920901
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/iputils/Manifest                          |  1 +
 .../iputils/files/iputils-20240905-man-pages.patch | 30 ++++++++++++++++++++++
 ...ils-99999999.ebuild => iputils-20240905.ebuild} | 30 ++++++++++++++++------
 net-misc/iputils/iputils-99999999.ebuild           | 26 +++++++++++++------
 4 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 2863ec7dbc8d..4667f6eb2e69 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,4 +1,5 @@
 DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
 DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f
 DIST iputils-20240117.tar.xz 445684 BLAKE2B 635943e12010aef8c1291b407bfbe284e0179391fca76197b77037ae1ffc219fa1d8e36abcea5fb7fff10d55ab40eed7c081e5d92b29f0916a4b4dd806945491 SHA512 c45822c5641f194dc07cba919c13a4b7a79d050bb53957a894ebb6ccc1f71bac1f26489e13d18ef1ce235982f5fa1824e677f95037a0f5cce6bcb94be4c2e2de
+DIST iputils-20240905.tar.xz 459008 BLAKE2B 62ee614292fbf487d93d711ecbc11719d10f4dcb995bfd0d613459b49792ae4c8f0032a401fbf583206665ac4c592e90c30da5c75811340cc881c06a20a05318 SHA512 6731e4fb8b8f89469de746c911fca6f1c7e924a21ca14ec25c40707707be3fe5a696272ba2d293207bc8c20f72a070d8e0a640fab9e5ea240a29a1f027807c1b
 DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee

diff --git a/net-misc/iputils/files/iputils-20240905-man-pages.patch b/net-misc/iputils/files/iputils-20240905-man-pages.patch
new file mode 100644
index 000000000000..0c2d174ec242
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20240905-man-pages.patch
@@ -0,0 +1,30 @@
+https://github.com/iputils/iputils/pull/556
+
+From 1e2a59a879859eb01ca8b34523f54b6acbb886cb Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@gentoo.org>
+Date: Wed, 18 Sep 2024 00:32:53 -0400
+Subject: [PATCH] meson: fix installation of prebuilt manpages in dist tarball
+
+page contains the name of the program we are building/installing a
+manual for. In the custom targets for building the manpages, we append
+.xml and .8 in turn -- we don't replace a ".xml" in the page name.
+
+As there is nothing to replace, we end up checking if e.g. "./arping"
+exists, and trying to install it as a manual if so -- rather than
+arping.8 as intended. Sync the logic so that this works.
+
+Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -28,8 +28,8 @@ if meson.version().version_compare('>=0.58.0')
+ 	out_html_pages = []
+ 	generated_docs_exist = true
+ 	foreach page : manpages
+-		man_page_name = page.replace('.xml', '.8')
+-		html_page_name = page.replace('.xml', '.html')
++		man_page_name = page + '.8'
++		html_page_name = page + '.html'
+ 		out_man_pages += man_page_name
+ 		out_html_pages += html_page_name
+ 		if not fs.exists(man_page_name) or not fs.exists(html_page_name)
+

diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-20240905.ebuild
similarity index 87%
copy from net-misc/iputils/iputils-99999999.ebuild
copy to net-misc/iputils/iputils-20240905.ebuild
index 5f7265fcd16d..9f4e50654ca8 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-20240905.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,16 +40,25 @@ 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
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20240905-man-pages.patch
+)
+
 src_prepare() {
 	default
 
@@ -68,10 +77,15 @@ 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 use doc || [[ ${PV} == 9999 ]] ; then
+		emesonargs+=(
+			-DBUILD_HTML_MANS=true
+			-DBUILD_MANS=true
+		)
+	fi
+
 	meson_src_configure
 }
 

diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 5f7265fcd16d..1b08f7678320 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,16 +40,21 @@ 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
 
@@ -68,10 +73,15 @@ 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 use doc || [[ ${PV} == 9999 ]] ; then
+		emesonargs+=(
+			-DBUILD_HTML_MANS=true
+			-DBUILD_MANS=true
+		)
+	fi
+
 	meson_src_configure
 }