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 34921158020 for ; Wed, 30 Nov 2022 04:14:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE6E1E08CA; Wed, 30 Nov 2022 04:14:39 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1DF6E08CA for ; Wed, 30 Nov 2022 04:14:39 +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 686CE34135B for ; Wed, 30 Nov 2022 04:14:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C745C764 for ; Wed, 30 Nov 2022 04:14:36 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1669781616.d49ceea95de3d72f937c995a04811e03b57e2c9e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/iputils/Manifest net-misc/iputils/iputils-20221126.ebuild net-misc/iputils/iputils-99999999.ebuild X-VCS-Directories: net-misc/iputils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d49ceea95de3d72f937c995a04811e03b57e2c9e X-VCS-Branch: master Date: Wed, 30 Nov 2022 04:14:36 +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: 39bc53e0-3cde-4518-84e3-6bed5b53877e X-Archives-Hash: 7e13a845d49bfbf0a4f7adbd82f9e300 commit: d49ceea95de3d72f937c995a04811e03b57e2c9e Author: Sam James gentoo org> AuthorDate: Wed Nov 30 03:53:57 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 30 04:13:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d49ceea9 net-misc/iputils: add 20221126 Signed-off-by: Sam James gentoo.org> net-misc/iputils/Manifest | 2 ++ ...ils-99999999.ebuild => iputils-20221126.ebuild} | 36 +++++++++++++--------- net-misc/iputils/iputils-99999999.ebuild | 36 +++++++++++++--------- 3 files changed, 44 insertions(+), 30 deletions(-) diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 289a9105a6d7..3b7e1d5bcdd1 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,2 +1,4 @@ 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-99999999.ebuild b/net-misc/iputils/iputils-20221126.ebuild similarity index 83% copy from net-misc/iputils/iputils-99999999.ebuild copy to net-misc/iputils/iputils-20221126.ebuild index 7f3760b7d4f5..9cb95e6d73a7 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-20221126.ebuild @@ -8,26 +8,34 @@ # EGIT_COMMIT set to release tag, all USE flags enabled and # tar ${S}/doc folder. -EAPI="7" +EAPI=8 PLOCALES="de fr ja pt_BR tr uk zh_CN" inherit fcaps meson plocale systemd toolchain-funcs -if [[ ${PV} == 99999999 ]] ; then +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}/${PN}-manpages-${PV}.tar.xz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" + 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 + " KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" -LICENSE="BSD GPL-2+ rdisc" +# We install ping unconditionally so BSD is listed by itself +# See LICENSE on each release, it summaries per-component +LICENSE=" + BSD + arping? ( GPL-2+ ) + clockdiff? ( BSD ) + tracepath? ( GPL-2+ ) +" SLOT="0" IUSE="+arping caps clockdiff doc idn nls test tracepath" RESTRICT="!test? ( test )" @@ -47,7 +55,7 @@ BDEPEND=" nls? ( sys-devel/gettext ) " -if [[ ${PV} == 99999999 ]] ; then +if [[ ${PV} == *9999 ]] ; then BDEPEND+=" app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 @@ -77,7 +85,7 @@ src_configure() { $(meson_use !test SKIP_TESTS) ) - if [[ ${PV} == 99999999 ]] ; then + if [[ ${PV} == *9999 ]] ; then emesonargs+=( -DBUILD_HTML_MANS=$(usex doc true false) -DBUILD_MANS=true @@ -123,28 +131,26 @@ src_install() { dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi - if [[ ${PV} != 99999999 ]] ; then + if [[ ${PV} != *9999 ]] ; then local -a man_pages local -a html_man_pages - while IFS= read -r -u 3 -d $'\0' my_bin - do + while IFS= read -r -u 3 -d $'\0' my_bin; do my_bin=$(basename "${my_bin}") [[ -z "${my_bin}" ]] && continue - if [[ -f "${S}/doc/${my_bin}.8" ]] ; then + if [[ -f "${WORKDIR}/${PN}-99999999-docs/doc/${my_bin}.8" ]] ; then man_pages+=( ${my_bin}.8 ) fi - if [[ -f "${S}/doc/${my_bin}.html" ]] ; then + 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 doc &>/dev/null || die + pushd "${WORKDIR}"/${PN}-99999999-docs/doc &>/dev/null || die doman "${man_pages[@]}" if use doc ; then - docinto html dodoc "${html_man_pages[@]}" fi popd &>/dev/null || die diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index 7f3760b7d4f5..9cb95e6d73a7 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -8,26 +8,34 @@ # EGIT_COMMIT set to release tag, all USE flags enabled and # tar ${S}/doc folder. -EAPI="7" +EAPI=8 PLOCALES="de fr ja pt_BR tr uk zh_CN" inherit fcaps meson plocale systemd toolchain-funcs -if [[ ${PV} == 99999999 ]] ; then +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}/${PN}-manpages-${PV}.tar.xz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" + 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 + " KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" -LICENSE="BSD GPL-2+ rdisc" +# We install ping unconditionally so BSD is listed by itself +# See LICENSE on each release, it summaries per-component +LICENSE=" + BSD + arping? ( GPL-2+ ) + clockdiff? ( BSD ) + tracepath? ( GPL-2+ ) +" SLOT="0" IUSE="+arping caps clockdiff doc idn nls test tracepath" RESTRICT="!test? ( test )" @@ -47,7 +55,7 @@ BDEPEND=" nls? ( sys-devel/gettext ) " -if [[ ${PV} == 99999999 ]] ; then +if [[ ${PV} == *9999 ]] ; then BDEPEND+=" app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 @@ -77,7 +85,7 @@ src_configure() { $(meson_use !test SKIP_TESTS) ) - if [[ ${PV} == 99999999 ]] ; then + if [[ ${PV} == *9999 ]] ; then emesonargs+=( -DBUILD_HTML_MANS=$(usex doc true false) -DBUILD_MANS=true @@ -123,28 +131,26 @@ src_install() { dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi - if [[ ${PV} != 99999999 ]] ; then + if [[ ${PV} != *9999 ]] ; then local -a man_pages local -a html_man_pages - while IFS= read -r -u 3 -d $'\0' my_bin - do + while IFS= read -r -u 3 -d $'\0' my_bin; do my_bin=$(basename "${my_bin}") [[ -z "${my_bin}" ]] && continue - if [[ -f "${S}/doc/${my_bin}.8" ]] ; then + if [[ -f "${WORKDIR}/${PN}-99999999-docs/doc/${my_bin}.8" ]] ; then man_pages+=( ${my_bin}.8 ) fi - if [[ -f "${S}/doc/${my_bin}.html" ]] ; then + 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 doc &>/dev/null || die + pushd "${WORKDIR}"/${PN}-99999999-docs/doc &>/dev/null || die doman "${man_pages[@]}" if use doc ; then - docinto html dodoc "${html_man_pages[@]}" fi popd &>/dev/null || die