From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1583121-garchives=archives.gentoo.org@lists.gentoo.org> 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 E4AF2158015 for <garchives@archives.gentoo.org>; Sat, 23 Dec 2023 19:01:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C0572BC078; Sat, 23 Dec 2023 19:01:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 617CB2BC078 for <gentoo-commits@lists.gentoo.org>; Sat, 23 Dec 2023 19:01:24 +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 72D8434068A for <gentoo-commits@lists.gentoo.org>; Sat, 23 Dec 2023 19:01:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0FCA1474 for <gentoo-commits@lists.gentoo.org>; Sat, 23 Dec 2023 19:01:21 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1703358028.347e0109b475a12b97e91ed8948cf6aaf9db671f.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-20231222.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: 347e0109b475a12b97e91ed8948cf6aaf9db671f X-VCS-Branch: master Date: Sat, 23 Dec 2023 19:01:21 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f2412f9d-b57a-406c-ad71-7a2ceded3c44 X-Archives-Hash: d15448ce0974b0b76b25b8358e87b564 commit: 347e0109b475a12b97e91ed8948cf6aaf9db671f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Dec 23 19:00:28 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 23 19:00:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347e0109 net-misc/iputils: add 20231222 Closes: https://bugs.gentoo.org/908817 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/iputils/Manifest | 1 + ...ils-99999999.ebuild => iputils-20231222.ebuild} | 26 +++++++++++++++------- net-misc/iputils/iputils-99999999.ebuild | 26 +++++++++++++++------- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index eeedf8998123..c3237e9108d6 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,3 +1,4 @@ DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9 DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f +DIST iputils-20231222.tar.xz 445548 BLAKE2B a76d4e9741c4ce8d2a2b6337873400543c5bb51d61a794fdfed8c8f4228c41020f5203c8af7ca44a36877d246d4f67019d31f1a58e48c6fca7964d6ebc9d764b SHA512 33e1eb6d90d43909b23bc8f3ef2f349e6655deefe1d9d51880705e8e84674a82ed6721c805cec18f188667d83577e701d39ff515f9406d16eaadc64c4bc28221 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-20231222.ebuild similarity index 87% copy from net-misc/iputils/iputils-99999999.ebuild copy to net-misc/iputils/iputils-20231222.ebuild index f1fd401dbdc4..2ca11e44d741 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-20231222.ebuild @@ -11,7 +11,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" + SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi @@ -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 [[ ${PV} == 9999 ]] ; then + emesonargs+=( + -DBUILD_HTML_MANS=$(usex doc true false) + -DBUILD_MANS=true + ) + fi + meson_src_configure } diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index f1fd401dbdc4..2ca11e44d741 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -11,7 +11,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" + SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi @@ -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 [[ ${PV} == 9999 ]] ; then + emesonargs+=( + -DBUILD_HTML_MANS=$(usex doc true false) + -DBUILD_MANS=true + ) + fi + meson_src_configure }