From 646b343162d1ad8a3ca56185b1d4a7844ece778d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 25 Apr 2015 01:54:51 +0000 Subject: [PATCH] Fix install of arping and add blocker against net-misc/arping. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- net-misc/iputils/ChangeLog | 6 +++- net-misc/iputils/Manifest | 32 ++++++++++----------- net-misc/iputils/iputils-20121221-r2.ebuild | 14 ++++++--- net-misc/iputils/iputils-99999999.ebuild | 14 ++++++--- 4 files changed, 41 insertions(+), 25 deletions(-) diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog index 51863233a9a4..bd0dd657e8f2 100644 --- a/net-misc/iputils/ChangeLog +++ b/net-misc/iputils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/iputils # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.143 2015/04/25 01:47:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.144 2015/04/25 01:54:49 vapier Exp $ + + 25 Apr 2015; Mike Frysinger iputils-20121221-r2.ebuild, + iputils-99999999.ebuild: + Fix install of arping and add blocker against net-misc/arping. *iputils-20121221-r2 (25 Apr 2015) diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 766c1096403c..45c5c06c5122 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -20,25 +20,25 @@ AUX rarpd.init.d 692 SHA256 e84222a787d42784406fb71e32816901bdd7b694fb7fb566e73e DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 6fc7ed7d281b7a2ee00e4f75e5465c90498c685bcc988afdff74db4eaa736d1c SHA512 006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c WHIRLPOOL da0ccb577c4b2189553419df2c093404752fb2865eb3e0bfececfc242d930ceb44f96b32d945cfdd0c9ca060359651b2ec8479db5cc9220cda412dfeee5e910d DIST iputils-s20121221.tar.bz2 155344 SHA256 450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f SHA512 693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4 WHIRLPOOL 64529180eb4b8e2f7a60c18df7cac49e10a4b7702514252d418b16dcdc10a85ccb0a7f8beb51274cc9d708be2026c4c136e720986795fd39d314e4f9d5590ec9 EBUILD iputils-20121221-r1.ebuild 2935 SHA256 b3a25f83df129f390654fd1db166fb00864871d018f421caa6a8ce6300d4a5dc SHA512 e11e33a1e4516005a4be9680546fb24967458ff3871ed968bbbdb8be73314cafe099f08d3a84dfe8e2ba9c2c26e4f69af276c1c798585a7cc4783de44f63c1b2 WHIRLPOOL 6ab24c3960aa2ec5d93734c3ec4fcf3f7712c74f676c57aaaacd1239e9f497a25945837bec21736665ce2ad5f2d48093c1efc9ba21e888f4d706ef3205230ae5 -EBUILD iputils-20121221-r2.ebuild 3956 SHA256 29360efbee0e02076f69c034ec3b8846f16a051442b1880233d747dd048e8940 SHA512 e81b3b289ff189b7c5ff5b3d3f5a2b923dd3ce05c9f2bbacf1f6411c0964a6eca55bcd591f35fea394fa1be4dca36df3cd52dcbfb7c0ee0d073b474b665dce58 WHIRLPOOL 8f6654d517ff5094551e107e8d243fb3b70f358d2d93244d7b14efeb675afc44ab97dc95b07cd33777b86a4965d9714b7ce65beec1089b81882f7d655fe30554 +EBUILD iputils-20121221-r2.ebuild 4038 SHA256 ed4a2f5aa85e4ab69389d0a129a075c3b79ec0e7c91e49c0b5c0af8b4f1b2a08 SHA512 959e273de5c624085c2c67122fa7561b92de1e4df4104892f15ef095ab6d82abd9e8d5a03afca188c96582d1a2e790abc4e2d1f189aa33cfd43ca53f4af392f7 WHIRLPOOL 13b53728a7f7b0a5f55dc8b9b57e85f236267bdfa7db87a5dc2c70b5daba16a85e97e68f245a221691a9da126fe27af6d6aa32521d954f6605fe673749f48292 EBUILD iputils-20121221.ebuild 2852 SHA256 6df665954e76448c80184e43f7ed3f1aea111ff3b2ac7a30114248db7211ecba SHA512 fd6c699a954802606e886739eb5b0e7d1df0d78256add26cb071d191fbb37ef5c122adfe34dd4e44c27852b05833caed734d23b9cd97c3c71980457e5bc0c6fc WHIRLPOOL 7f172afc263bdc1a16de208343a736ca2bf6a4d3b34500d66cbd93154c471b165d91f56252413a2b3b3f3279d2ddf299e0b5ad6c9da4cd224eab3d6b50c95a0b -EBUILD iputils-99999999.ebuild 3674 SHA256 85fb0c335b703a5f0669b16aab3b21cb161180c792e53fa27456f1755af98373 SHA512 ef4b11de14c68fa21f6c0eb018564d4acf42ebf54da1746fd3876efe3c3e57755dba038787be42237f8d6dfaedca776ff5acc82a7156f34b94265565fcfa2fa2 WHIRLPOOL 3eae58ad13adc8b87df418fda6ed3d77580897a2387ddb34059c7663251fea7c4398f44a39b08c7550d7c32f600aff07cf079d5160200d104983db1631b097b4 -MISC ChangeLog 22079 SHA256 b3f5f0611a778ec7ae62e6c09157d273b78b1f18fa259b259fff1627d01ab0bd SHA512 73686391acfe5b6047bb9ee66ab23c75dab4ec1673ab3ed3bf931d9fb4eb6a0a115a738e69e559b3612db139ed5516d7f370c1b818c52a767689d534002ffbb1 WHIRLPOOL 3c657c58fa04b94383ee28e5c969a03f4b2c88e260a3f64ab7071a21f188aa1a66bc3d7e4fd014b8307938505a9263e2ec1506eed784ffc9862e6addd86e68f9 +EBUILD iputils-99999999.ebuild 3756 SHA256 e15e1960210cf03c2f71b90a7bc815f8fb3310650dfbbc3614a48ba122822fd1 SHA512 5b7aee9c0ee570248c2961a33e0bd58e34e9a632c9156fbcfbd2188b5f15cd8dae51c4cafce1f00c1b6e5ff76870fd712b047e4270e62921e76dc11d1ebeacf4 WHIRLPOOL 31b5588e5d8d15aa76f0201829d5c44050417d5d49862fa9e7b3adf0db01e9daba17ac244348f1c3dfab651444da8e4c4386e8750d172c05650e6860d4c32728 +MISC ChangeLog 22250 SHA256 744860b3f6915d4d283ef88b0b15b36f07b295dc7abeb3472a89adfc2656efea SHA512 fb352573944f8bc5fd315cd48c290ed0d08341825e555a2d6f2978af46dd15a8207c73d9434cda0f802af12aae4647d2464a003a43595791c6605078ae94837f WHIRLPOOL 23e4ca6b114dcc132917e9aef70a88b6d4f91e3365b01640f20043e67bd01af355d5549b03d3e3692fbc150028c39631fd48a1c7918d0811fa9b9e12f42c7f7c MISC metadata.xml 1305 SHA256 45637955ae3f2ef93c3302358b5918b3f116fa6b3176ee1888a26b88f3c1138b SHA512 c3a770322c8e9ff2ed1eae167400b0f5f1a7d51916e813e360fa70399ba620506f50af335f02a36696b95e8ecd5481b40350c700fd7a7e289f9fafb738bda52a WHIRLPOOL 5d8de5bf1e1eb45da472aed975f91f9f971d5838dce5dbf5730ed56c73f0068eb8ae127617e00a6ad3423c494c94ed2e3589f805e0c574711d062df5d91e3a7b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVOvJMAAoJEPGu1DbS6WIAuAEP/RhEIhQhVgdflDicmrzo6nft -MSS2DlDE/r+4h5lxluZ9jP8kxvozQi2QG9nFXc2Km3zXySwHruuniJpmdB/mgPas -+6zWJBlr9K1LlE9AokRtbcHRNodWzPy+qLYx95C+tnnfGjXfxCmjyX66wRvAY09f -0FiKE/88Z5y4c8mV4XF1R2dKPE70mgZpXBVLzAAUeTRRUxNew1pP0vyVxYbkkuw8 -JkQe8qXP/27+gl78MTmOpQe5z494YtDW7DwbEi4bXPZwd1N+YsPQvRIBbQ/zW9is -kO410Rnv2drZ35OlB1R6DXz1ewDNuYCQHzTmsOl/2tb+lRKxIvYMwzTxU3v26zc5 -aH8nIOjHmyyexnfR6hE3VIBIspev/gYEgzorsiKHYp4gVdeEgduiEjojopV0TbNi -txQ/ESkv8A46yaNwI3xqnJlq+nfBoPZDSrhOINfbotzPglpXMp1bBin1TTgwRfxF -xdTqx48pEdg7b8zjDqm2awOE3A5V6PfaPJEQCcMx2jqwAmmlzuzyX0oeJXpPx4eJ -uNhX39rzoPb1u1Py0GZxD9gJRlg7ilmhijS2w+6Iz+Lz6yzR9MJuRNONRolcRWBM -HsI3NNQuovvxy2hVQzYmN/J39Qm7gA2srllsmhix6uEobMTHs20RRt5Sc0I7Fw4Y -+Qt3RYXvavC+ueqlJpgU -=AAe9 +iQIcBAEBCAAGBQJVOvPqAAoJEPGu1DbS6WIAvDIP/2ovUCSTI/TfuXyfdOj9A145 +Zeqs77DidoOwL9xcdMQ1bplnEEgA1CvTo6cwFyKTaS1zFS747ZKXfb3V8I+rIgdf +Oe41Pemtf1rrngH+338hyXz9JuFRWE7sVMkYAxjKQjfMRByf9gQFy7utW4wQGe2g +9uMiiiZy9zmGOz6U86KMMTPuPca0wPu3knU4tJ9xm2GrBA4VkuLCeAU99vNUhNdk +ltnXkSingnT5tyzUz7eH0ZU3VWOIfeVRHM3VMmAKSTGoxYLkfGHJHR41+nDww0SF +Im0xdc6ZoSC5QCLxiVaXCHP7IzxqoaHJN6LOdqs48lA4/gRRe0H3Yox5kf36O0eJ +1kay1ng7fvJIdQaPUvEN7n+rLCTrZHIXdoIuHfKvFR579r47PNkwztgVX40n7fLd +fcUdDHdUaVCCx6meKWfY93Bf3Mp2oe6gosQbRrnWx2keeVuRxXb2XttpRCdAVkFk +E0dB6SutjcFf1wXke7IegOKiqPOO3nBrIuRtHfDrGp2iD3WYOL2F1kk60dC1dly9 +G3c06KeCJOyT2KkKEEqDFLPOlUeLJj2W/2CFDKY+DvHw8CTsEm47YBrdtwtRuSL2 +gkLdx9zmge/FVSXNYHsCq1xA4WEwATxhTujO2HuxhFWemCM+dkpRuaCYhi/rBn26 +kcq5YgrrnXBCisaCc1HC +=NVMT -----END PGP SIGNATURE----- diff --git a/net-misc/iputils/iputils-20121221-r2.ebuild b/net-misc/iputils/iputils-20121221-r2.ebuild index 1b31489acddd..26b2bd25c476 100644 --- a/net-misc/iputils/iputils-20121221-r2.ebuild +++ b/net-misc/iputils/iputils-20121221-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r2.ebuild,v 1.1 2015/04/25 01:47:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r2.ebuild,v 1.2 2015/04/25 01:54:49 vapier Exp $ # For released versions, we precompile the man/html pages and store # them in a tarball on our mirrors. This avoids ugly issues while @@ -35,7 +35,8 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) )" -RDEPEND="rarpd? ( !net-misc/rarpd ) +RDEPEND="arping? ( !net-misc/arping ) + rarpd? ( !net-misc/rarpd ) traceroute? ( !net-misc/traceroute ) !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} @@ -103,10 +104,15 @@ src_install() { use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 doman doc/ping.8 + if use arping ; then + dobin arping + doman doc/arping.8 + fi + into /usr local u - for u in arping clockdiff rarpd rdisc tftpd tracepath ; do + for u in clockdiff rarpd rdisc tftpd tracepath ; do if use ${u} ; then dosbin ${u} doman doc/${u}.8 @@ -137,6 +143,6 @@ pkg_postinst() { fcaps cap_net_raw \ bin/ping \ $(usex ipv6 'bin/ping6' '') \ - $(usex arping 'usr/bin/arping' '') \ + $(usex arping 'bin/arping' '') \ $(usex clockdiff 'usr/bin/clockdiff' '') } diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index 2405ad7abcb7..e1aaa7e5384c 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.18 2015/04/25 01:47:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.19 2015/04/25 01:54:49 vapier Exp $ # For released versions, we precompile the man/html pages and store # them in a tarball on our mirrors. This avoids ugly issues while @@ -35,7 +35,8 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) )" -RDEPEND="rarpd? ( !net-misc/rarpd ) +RDEPEND="arping? ( !net-misc/arping ) + rarpd? ( !net-misc/rarpd ) traceroute? ( !net-misc/traceroute ) !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} @@ -98,10 +99,15 @@ src_install() { use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 doman doc/ping.8 + if use arping ; then + dobin arping + doman doc/arping.8 + fi + into /usr local u - for u in arping clockdiff rarpd rdisc tftpd tracepath ; do + for u in clockdiff rarpd rdisc tftpd tracepath ; do if use ${u} ; then dosbin ${u} doman doc/${u}.8 @@ -132,6 +138,6 @@ pkg_postinst() { fcaps cap_net_raw \ bin/ping \ $(usex ipv6 'bin/ping6' '') \ - $(usex arping 'usr/bin/arping' '') \ + $(usex arping 'bin/arping' '') \ $(usex clockdiff 'usr/bin/clockdiff' '') } -- 2.26.2