diff options
Diffstat (limited to 'net-misc/iputils')
| -rw-r--r-- | net-misc/iputils/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/iputils/iputils-20180629.ebuild | 2 | ||||
| -rw-r--r-- | net-misc/iputils/iputils-99999999.ebuild | 144 |
3 files changed, 66 insertions, 84 deletions
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 76fc9c5d08e3..57a5c7c7fcaf 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -11,6 +11,6 @@ DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a EBUILD iputils-20171016_pre-r1.ebuild 4045 BLAKE2B 8762cc82fd5c71865106bf2e9763fa5150a8228b292e617654279e517e5a3f4bebc50f312133740d4c54d0ef0a75abac2e42775cd9d865d41b5444e75f56769a SHA512 397bd386cfff8a3551af24ac67677de021e56bf75908e6495e9e4b7eeb6bb2435b7c72101b78523da7e502d1a7fac92d5640d45a1da463986f01ec5230273c95 EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 8c9aedbe404bd31ddcb466b93eb6272eebba0e3fa18f7a0de285dd7aa007894614a47a9cab018f6c5546a172ca3ae240b7fdcf6196eb3cdd7a6fcfc6d34cd652 SHA512 08f92d29d3baeb0eadac360b5a7f81e550d264fda70945b416d38ae39239e75ef201587d7466d6a9431df1a4be28c62e59d11b685fc811f40f1c755bbae2637d -EBUILD iputils-20180629.ebuild 3970 BLAKE2B 3653a9223833bd1c8923647ed798679961ed02a9852fe83bcbef97c6210f997fb87de97533aaa198779ef0fc9d258dda2d21fb3d0a248a99a5a0bd8cd5567479 SHA512 8376d7ffef01f1047fb816d5f08a09f029027c1cdaf64626fba8351b8b5cbbd7ce5526f6039452694f60bc1c2c0cd419563228b93782854a1b1f9a588e7b0725 -EBUILD iputils-99999999.ebuild 3861 BLAKE2B 49cda306c5a9d1bc7200b1f1256f3ef867b0b573aa9b0620f98ec77f679e0599883fdff56de559fb06f0510d5d13960bb0bb998bfe0d42b737f08484066cf1e6 SHA512 26607fbcf1fc36f8c44ab10922866d6cc076dba5cb08dc3c0ffb7921dec0e188b7e680f61148616d172a73e27029413834aae431a87c9163e06837fc904a0b83 +EBUILD iputils-20180629.ebuild 3964 BLAKE2B 57879be448e20307246bc4567c842986aaf10c6aa18a871a2fe3fc44a7e69f72cdaa45984e49b87f3d8a4885f37ce801f79e2cb85a04a434353ef97cad2fefe7 SHA512 ec11a1e4864e941f7413536493bd18beddab63172705a0d15d99c76e47bbfcedb2329413b9a7be95fc4a8ed2298e228a93aafd1347a3646937f4b4793610c069 +EBUILD iputils-99999999.ebuild 3939 BLAKE2B 9b6d7d78854369cba6255685f634ed526bf97d4a195a0bec0271f8f40a63aa671f26168dd33e99bf9c1db8398acee79205a025b04edf7865d67a76fd1190b756 SHA512 22ba0bcb65f8b13800f2a14f901fc0140c02f4d22c2e96624a381b59d3ba9fe5f385cf6e4bb6d3a32659d6b3aa9dc2bfb8f26b67e3c9f50ffe41094cf4712734 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild index 98e13d04e31d..78a20048e2c3 100644 --- a/net-misc/iputils/iputils-20180629.ebuild +++ b/net-misc/iputils/iputils-20180629.ebuild @@ -24,7 +24,7 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="https://github.com/iputils/iputils/archive/s${MY_PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${MY_PV}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" + KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index d728fe52c47a..ccc540e0855c 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # For released versions, we precompile the man/html pages and store @@ -9,9 +9,7 @@ EAPI="6" -inherit flag-o-matic toolchain-funcs fcaps - -PATCHES=() +inherit fcaps flag-o-matic meson systemd toolchain-funcs if [[ ${PV} == "99999999" ]] ; then EGIT_REPO_URI="https://github.com/iputils/iputils.git" @@ -29,7 +27,8 @@ LICENSE="BSD GPL-2+ rdisc" SLOT="0" IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute" -LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) +LIB_DEPEND=" + caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn2:=[static-libs(+)] ) ipv6? ( ssl? ( @@ -44,23 +43,30 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) ) ) " -RDEPEND="arping? ( !net-misc/arping ) +RDEPEND=" + arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) +" +DEPEND=" + ${RDEPEND} static? ( ${LIB_DEPEND} ) virtual/os-headers + virtual/pkgconfig " if [[ ${PV} == "99999999" ]] ; then - DEPEND+="app-text/docbook-xml-dtd:4.2 + DEPEND+=" + app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 " fi -[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" +[ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" + +PATCHES=() src_prepare() { use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch ) @@ -71,99 +77,75 @@ src_prepare() { src_configure() { use static && append-ldflags -static - TARGETS=( - ping - $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) + 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_TFTPD="$(usex tftpd true false)" + -DBUILD_TRACEPATH="$(usex tracepath true false)" + -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute true false) false)" + -DBUILD_NINFOD="false" + -DNINFOD_MESSAGES="false" + -DBUILD_HTML_MANS="$(usex doc true false)" + -DUSE_SYSFS="$(usex arping true false)" + -Dsystemdunitdir="$(systemd_get_systemunitdir)" ) - if use ipv6 ; then - TARGETS+=( - $(usex traceroute 'traceroute6' '') + + if use ipv6 && use ssl ; then + emesonargs+=( + -DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))" + ) + else + emesonargs+=( + -DUSE_CRYPTO="none" ) fi - myconf=( - USE_CRYPTO=no - USE_GCRYPT=no - USE_NETTLE=no - ) - - if use ipv6 && use ssl ; then - myconf=( - USE_CRYPTO=yes - USE_GCRYPT=$(usex gcrypt) - USE_NETTLE=$(usex nettle) + if [[ "${PV}" != 99999999 ]] ; then + emesonargs+=( + -DBUILD_MANS="false" ) fi + + meson_src_configure } src_compile() { tc-export CC - emake \ - USE_CAP=$(usex caps) \ - USE_IDN=$(usex idn) \ - IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \ - TARGETS="${TARGETS[*]}" \ - ${myconf[@]} - - if [[ ${PV} == "99999999" ]] ; then - emake man - - use doc && emake html - fi + meson_src_compile } src_install() { - into / - dobin ping - dosym ping /bin/ping4 - if use ipv6 ; then - dosym ping /bin/ping6 - dosym ping.8 /usr/share/man/man8/ping6.8 - fi - doman doc/ping.8 - - if use arping ; then - dobin arping - doman doc/arping.8 - fi + meson_src_install - into /usr + dodir /bin + local my_bin + for my_bin in $(usex arping arping '') ping ; do + mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die + done + dosym ping /bin/ping4 if use tracepath ; then - dosbin tracepath - doman doc/tracepath.8 - dosym tracepath /usr/sbin/tracepath4 + dosym tracepath /usr/bin/tracepath4 fi - local u - for u in clockdiff rarpd rdisc tftpd ; do - if use ${u} ; then - case ${u} in - clockdiff) dobin ${u};; - *) dosbin ${u};; - esac - doman doc/${u}.8 - fi - done - - if use tracepath && use ipv6 ; then - dosym tracepath /usr/sbin/tracepath6 - dosym tracepath.8 /usr/share/man/man8/tracepath6.8 - fi + if use ipv6 ; then + dosym ping /bin/ping6 - if use traceroute && use ipv6 ; then - dosbin traceroute6 - doman doc/traceroute6.8 + if use tracepath ; then + dosym tracepath /usr/bin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 + fi fi - if use rarpd ; then - newinitd "${FILESDIR}"/rarpd.init.d rarpd - newconfd "${FILESDIR}"/rarpd.conf.d rarpd + if use doc ; then + mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die fi - - dodoc INSTALL.md - - use doc && dodoc doc/*.html } pkg_postinst() { |