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 683FD15808B for ; Sun, 3 Apr 2022 02:48:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBA4DE0823; Sun, 3 Apr 2022 02:48:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 749D6E081B for ; Sun, 3 Apr 2022 02:48:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 64F8F341458 for ; Sun, 3 Apr 2022 02:48:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9BCDA36B for ; Sun, 3 Apr 2022 02:48:47 +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: <1648953962.7b86d886a186879903872c1e0dd3c57512ad5d04.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/iputils/iputils-20211215.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: 7b86d886a186879903872c1e0dd3c57512ad5d04 X-VCS-Branch: master Date: Sun, 3 Apr 2022 02:48:47 +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: 50c817c0-a3b1-4a0c-8136-f1eaf93267d5 X-Archives-Hash: 9d194178b7503f8704403da9526f29d7 commit: 7b86d886a186879903872c1e0dd3c57512ad5d04 Author: Sam James gentoo org> AuthorDate: Sun Apr 3 02:46:02 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 3 02:46:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b86d886 net-misc/iputils: use consistent style Signed-off-by: Sam James gentoo.org> net-misc/iputils/iputils-20211215.ebuild | 60 +++++++++++++++----------------- net-misc/iputils/iputils-99999999.ebuild | 52 +++++++++++++-------------- 2 files changed, 54 insertions(+), 58 deletions(-) diff --git a/net-misc/iputils/iputils-20211215.ebuild b/net-misc/iputils/iputils-20211215.ebuild index e468421730e4..010a74464c06 100644 --- a/net-misc/iputils/iputils-20211215.ebuild +++ b/net-misc/iputils/iputils-20211215.ebuild @@ -32,33 +32,30 @@ SLOT="0" IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tracepath" RESTRICT="!test? ( test )" -BDEPEND=" - virtual/pkgconfig - test? ( sys-apps/iproute2 ) - nls? ( sys-devel/gettext ) -" - LIB_DEPEND=" caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn2:=[static-libs(+)] ) nls? ( virtual/libintl[static-libs(+)] ) " - RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" - DEPEND=" ${RDEPEND} virtual/os-headers static? ( ${LIB_DEPEND} ) " +BDEPEND=" + virtual/pkgconfig + test? ( sys-apps/iproute2 ) + nls? ( sys-devel/gettext ) +" -if [[ ${PV} == "99999999" ]] ; then +if [[ ${PV} == 99999999 ]] ; 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:0 + dev-libs/libxslt " fi @@ -72,32 +69,32 @@ src_configure() { use static && append-ldflags -static local emesonargs=( - -DUSE_CAP="$(usex caps true false)" - -DUSE_IDN="$(usex idn true false)" - -DBUILD_ARPING="$(usex arping true false)" - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" - -DBUILD_PING="true" - -DBUILD_RARPD="$(usex rarpd true false)" - -DBUILD_RDISC="$(usex rdisc true false)" - -DENABLE_RDISC_SERVER="$(usex rdisc true false)" - -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DBUILD_NINFOD="false" - -DNINFOD_MESSAGES="false" - -DNO_SETCAP_OR_SUID="true" - -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -DUSE_GETTEXT="$(usex nls true false)" + -DUSE_CAP=$(usex caps true false) + -DUSE_IDN=$(usex idn true false) + -DBUILD_ARPING=$(usex arping true false) + -DBUILD_CLOCKDIFF=$(usex clockdiff true false) + -DBUILD_PING=true + -DBUILD_RARPD=$(usex rarpd true false) + -DBUILD_RDISC=$(usex rdisc true false) + -DENABLE_RDISC_SERVER=$(usex rdisc true false) + -DBUILD_TRACEPATH=$(usex tracepath true false) + -DBUILD_NINFOD=false + -DNINFOD_MESSAGES=false + -DNO_SETCAP_OR_SUID=true + -Dsystemdunitdir=$(systemd_get_systemunitdir) + -DUSE_GETTEXT=$(usex nls true false) $(meson_use !test SKIP_TESTS) ) if [[ ${PV} == 99999999 ]] ; then emesonargs+=( - -DBUILD_HTML_MANS="$(usex doc true false)" - -DBUILD_MANS="true" + -DBUILD_HTML_MANS=$(usex doc true false) + -DBUILD_MANS=true ) else emesonargs+=( - -DBUILD_HTML_MANS="false" - -DBUILD_MANS="false" + -DBUILD_HTML_MANS=false + -DBUILD_MANS=false ) fi @@ -106,12 +103,13 @@ src_configure() { src_compile() { tc-export CC + meson_src_compile } src_test() { - if [[ ${EUID} != 0 ]]; then - einfo "Tests require root privileges; Skipping ..." + if [[ ${EUID} != 0 ]] ; then + einfo "Tests require root privileges. Skipping ..." return fi @@ -135,7 +133,7 @@ src_install() { dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi - if [[ "${PV}" != 99999999 ]] ; then + if [[ ${PV} != 99999999 ]] ; then local -a man_pages local -a html_man_pages diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index 320cee546b5e..cef1837240e2 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -14,7 +14,7 @@ PLOCALES="de fr ja pt_BR tr uk zh_CN" inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs -if [[ ${PV} == "99999999" ]] ; then +if [[ ${PV} == 99999999 ]] ; then EGIT_REPO_URI="https://github.com/iputils/iputils.git" inherit git-r3 else @@ -32,33 +32,30 @@ SLOT="0" IUSE="+arping caps clockdiff doc gcrypt idn nettle nls ssl static test tracepath" RESTRICT="!test? ( test )" -BDEPEND=" - virtual/pkgconfig - test? ( sys-apps/iproute2 ) - nls? ( sys-devel/gettext ) -" - LIB_DEPEND=" caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn2:=[static-libs(+)] ) nls? ( virtual/libintl[static-libs(+)] ) " - RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" - DEPEND=" ${RDEPEND} virtual/os-headers static? ( ${LIB_DEPEND} ) " +BDEPEND=" + virtual/pkgconfig + test? ( sys-apps/iproute2 ) + nls? ( sys-devel/gettext ) +" -if [[ ${PV} == "99999999" ]] ; then +if [[ ${PV} == 99999999 ]] ; 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:0 + dev-libs/libxslt " fi @@ -72,27 +69,27 @@ src_configure() { use static && append-ldflags -static local emesonargs=( - -DUSE_CAP="$(usex caps true false)" - -DUSE_IDN="$(usex idn true false)" - -DBUILD_ARPING="$(usex arping true false)" - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" - -DBUILD_PING="true" - -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DNO_SETCAP_OR_SUID="true" - -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -DUSE_GETTEXT="$(usex nls true false)" + -DUSE_CAP=$(usex caps true false) + -DUSE_IDN=$(usex idn true false) + -DBUILD_ARPING=$(usex arping true false) + -DBUILD_CLOCKDIFF=$(usex clockdiff true false) + -DBUILD_PING=true + -DBUILD_TRACEPATH=$(usex tracepath true false) + -DNO_SETCAP_OR_SUID=true + -Dsystemdunitdir=$(systemd_get_systemunitdir) + -DUSE_GETTEXT=$(usex nls true false) $(meson_use !test SKIP_TESTS) ) if [[ ${PV} == 99999999 ]] ; then emesonargs+=( - -DBUILD_HTML_MANS="$(usex doc true false)" - -DBUILD_MANS="true" + -DBUILD_HTML_MANS=$(usex doc true false) + -DBUILD_MANS=true ) else emesonargs+=( - -DBUILD_HTML_MANS="false" - -DBUILD_MANS="false" + -DBUILD_HTML_MANS=false + -DBUILD_MANS=false ) fi @@ -101,12 +98,13 @@ src_configure() { src_compile() { tc-export CC + meson_src_compile } src_test() { - if [[ ${EUID} != 0 ]]; then - einfo "Tests require root privileges; Skipping ..." + if [[ ${EUID} != 0 ]] ; then + einfo "Tests require root privileges. Skipping ..." return fi @@ -130,7 +128,7 @@ src_install() { dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi - if [[ "${PV}" != 99999999 ]] ; then + if [[ ${PV} != 99999999 ]] ; then local -a man_pages local -a html_man_pages