From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BC47C59CB5 for ; Tue, 19 Apr 2016 13:42:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C674521C035; Tue, 19 Apr 2016 13:42:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4AF2E21C035 for ; Tue, 19 Apr 2016 13:42:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35EC0340997 for ; Tue, 19 Apr 2016 13:42:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78C7A17B4 for ; Tue, 19 Apr 2016 13:42:25 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1461073338.e23a9a2280b1dd45b063797d5ce0ccd8bf68768d.polynomial-c@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-20121221.ebuild net-misc/iputils/iputils-20150815-r1.ebuild X-VCS-Directories: net-misc/iputils/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e23a9a2280b1dd45b063797d5ce0ccd8bf68768d X-VCS-Branch: master Date: Tue, 19 Apr 2016 13:42:25 +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-Archives-Salt: 768e237c-2b1a-45f5-9cb8-66a2c2ab4fa2 X-Archives-Hash: 44cf8f9a541c17eca4e7c02382c4c5d3 commit: e23a9a2280b1dd45b063797d5ce0ccd8bf68768d Author: Lars Wendler gentoo org> AuthorDate: Tue Apr 19 13:40:16 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Apr 19 13:42:18 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23a9a22 net-misc/iputils: Removed old. Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> net-misc/iputils/Manifest | 2 - net-misc/iputils/iputils-20121221.ebuild | 98 ---------------- net-misc/iputils/iputils-20150815-r1.ebuild | 166 ---------------------------- 3 files changed, 266 deletions(-) diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index fa0ca8a..e9a741e 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,8 +1,6 @@ -DIST iputils-20150815.tar.gz 194508 SHA256 1f9c11783e9db90b3ebc43145e412160d989fb133a573638745379957c73c082 SHA512 ce899b1fa4b4a423c0430831d77eed660f7fdb98a0bf0532fd8dfa11f4b5f90c7b7d8199dd265fc0ac0e318f3ef2ef353f61bbd290cce77746df646a29edf85a WHIRLPOOL 763bc8b886d1678428be2dedb3060358ef06beeb7297c4197a4e7772d5919183a90ac35a8f933222d880edb60e169817128b605286379636acf63bc2d78e32f4 DIST iputils-20160308.tar.gz 195348 SHA256 803d11b14af1bd3852c83111cc29e904bc3ca936c093dbb419d0671d3c9d964b SHA512 6b4d6e58ab8f1218f3ab52da695f252bd3e0004ffce755f2378b44fc3b4fbf9beb9beef51ff12f14348a07f6fe8525e64dba7f5d7b70997423d2c98c5ff7dde2 WHIRLPOOL 8a5691fdb70c6a9741adfc09206a4fac041616c6e81e9ef918435fed09c6085a35592eb72055dfbe2a237ab8ed1a018aa824968ff15ad842b923e28743f5cdbf 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 -DIST iputils-s20150815-manpages.tar.xz 22508 SHA256 d82fac64808f9a3f8dee114a62bc0a652243522bf8e535605eaf46d886c2febe SHA512 cb57758203aa49874cc14b4a92db8566775a62da6e50caa55f98e362348fe026898de7aded09f62b4c26e245e89ffde4a37a6810bdaa6619480071917009b1bb WHIRLPOOL f4616abf8857a46420a115ef2f3b6918ab36a1e5160ee8422e985d669672505a7c259a38dc09742405a467b3caa5d552653cfb3e07c15eab97e1326181cbfd99 DIST iputils-s20151218-manpages.tar.xz 22336 SHA256 ae60dcf7a5a83d02008c03888935fd2dcff56c9f86734d4656b6284a7631a28d SHA512 964b9e22b18b67215ea48e046c45768cd86076b53db2131b00ac721be9e7de4edadefb74855d81861f12b4e10dcecd90d29f0098c2c4568d7601d97e756be0a3 WHIRLPOOL 82e3c9930861ed2df00c3b40488212dc36d5d65d62e1e7245d778ff77c6660a93bdd1dd8931cdddba4a631a9321741c0c2246d0cf48b22fc562ee7a066ac75fd DIST iputils-s20151218.tar.bz2 157187 SHA256 549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1 SHA512 4bf0eed0ae5603e872afb0e09be039df3822a7723e8cbb8cbe578d69d8c457ffac9bdbe2eb17b32c95968e5e4ad6204af955617482c5701671f0f476b560b65c WHIRLPOOL e5b1d89eeaf64c2be97217eff37ef9aea33f69925683067c5366eb8db30a0b8cd8e96c2c18eedb573c965a6508efcb9e67effa66da1ad8bd606a1c1ffff9adf7 DIST iputils-s20160308-manpages.tar.xz 22684 SHA256 e21ef842d2eb4fa21f64cb872101bc9f979d24127fb680247d4a95ffc94a3958 SHA512 fe55ee334f1a99c6d93f4d18d97666d307676ced77175b73139f888af8f4f0ddc0f1d0511ab71d234f57909def606bf5c3aede2db28a0f73eb5628b9c8e16cac WHIRLPOOL 2675551b615efdf54a77bcb1dbe22c89b1ae5cd783c7bf33c703b81f54239096c1a7e13e7c8d6abd8b4ed5b0cbbd6f3b59d4102279c8cfb6f0a0bf6e070aab93 diff --git a/net-misc/iputils/iputils-20121221.ebuild b/net-misc/iputils/iputils-20121221.ebuild deleted file mode 100644 index be378b2..0000000 --- a/net-misc/iputils/iputils-20121221.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and when the jade/sgml packages are broken (which -# seems to be more common than would be nice). - -EAPI="4" - -inherit flag-o-matic eutils toolchain-funcs -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils" - inherit git-2 -else - SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2 - mirror://gentoo/iputils-s${PV}-manpages.tar.bz2" - 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" -HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils" - -LICENSE="BSD-4" -SLOT="0" -IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static" - -LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn[static-libs(+)] ) - ipv6? ( - gnutls? ( net-libs/gnutls[static-libs(+)] ) - ssl? ( dev-libs/openssl:0[static-libs(+)] ) - )" -RDEPEND="!net-misc/rarpd - !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/os-headers" -if [[ ${PV} == "99999999" ]] ; then - DEPEND+=" - app-text/openjade - dev-perl/SGMLSpm - app-text/docbook-sgml-dtd - app-text/docbook-sgml-utils - " -fi - -S=${WORKDIR}/${PN}-s${PV} - -src_prepare() { - epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch - epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436 - epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch - epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347 - epatch "${FILESDIR}"/${PN}-20121221-makefile.patch - epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch - epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff - use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch - use static && append-ldflags -static -} - -src_compile() { - tc-export CC - emake \ - USE_CAP=$(usex caps) \ - USE_IDN=$(usex idn) \ - USE_GNUTLS=$(usex gnutls) \ - USE_CRYPTO=$(usex ssl) \ - $(use ipv6 || echo IPV6_TARGETS=) - - if [[ ${PV} == "99999999" ]] ; then - emake -j1 html man - fi -} - -src_install() { - into / - dobin ping - use ipv6 && dobin ping6 - dosbin arping - into /usr - dosbin tracepath - use ipv6 && dosbin trace{path,route}6 - dosbin clockdiff rarpd rdisc ipg tftpd - - fperms 4711 /bin/ping - use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6 - - dodoc INSTALL RELNOTES - use ipv6 \ - && dosym ping.8 /usr/share/man/man8/ping6.8 \ - || rm -f doc/*6.8 - rm -f doc/setkey.8 - doman doc/*.8 - - use doc && dohtml doc/*.html -} diff --git a/net-misc/iputils/iputils-20150815-r1.ebuild b/net-misc/iputils/iputils-20150815-r1.ebuild deleted file mode 100644 index ef26f0e..0000000 --- a/net-misc/iputils/iputils-20150815-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and when the jade/sgml packages are broken (which -# seems to be more common than would be nice). - -EAPI=5 - -inherit flag-o-matic eutils toolchain-funcs fcaps -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/iputils/iputils.git" - inherit git-r3 -else - SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz" - 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" -HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils" - -LICENSE="BSD-4" -SLOT="0" -IUSE="arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute" - -LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn[static-libs(+)] ) - ipv6? ( ssl? ( - gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) - nettle? ( dev-libs/nettle[static-libs(+)] ) - openssl? ( - !libressl? ( dev-libs/openssl:0[static-libs(+)] ) - libressl? ( dev-libs/libressl[static-libs(+)] ) - ) - ) )" -RDEPEND="arping? ( !net-misc/arping ) - rarpd? ( !net-misc/rarpd ) - traceroute? ( !net-misc/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/os-headers" -if [[ ${PV} == "99999999" ]] ; then - DEPEND+=" - app-text/openjade - dev-perl/SGMLSpm - app-text/docbook-sgml-dtd - app-text/docbook-sgml-utils - " -fi - -REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )" - -S=${WORKDIR}/${PN}-s${PV} - -PATCHES=( - "${FILESDIR}/021109-uclibc-no-ether_ntohost.patch" - "${FILESDIR}/${PN}-20150815-defines_and_libs.patch" - "${FILESDIR}/${PN}-20150815-handle_single_protocol_system.patch" -) - -src_prepare() { - epatch ${PATCHES[@]} - use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch -} - -src_configure() { - use static && append-ldflags -static - - TARGETS=( - ping - $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) - ) - if use ipv6 ; then - TARGETS+=( - $(usex tracepath 'tracepath6' '') - $(usex traceroute 'traceroute6' '') - ) - fi - - myconf=( - USE_CRYPTO=no - USE_GCRYPT=no - USE_NETTLE=no - ) - - if use ipv6 && use ssl ; then - myconf=( - USE_CRYPTO=$(usex openssl) - USE_GCRYPT=$(usex gcrypt) - USE_NETTLE=$(usex nettle) - ) - fi -} - -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 html man - fi -} - -src_install() { - into / - dobin ping - dosym ping "${EPREFIX}"/bin/ping4 - if use ipv6 ; then - dosym ping "${EPREFIX}"/bin/ping6 - dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 - fi - doman doc/ping.8 - - if use arping ; then - dobin arping - doman doc/arping.8 - fi - - into /usr - - local u - for u in clockdiff rarpd rdisc tftpd tracepath ; 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 - dosbin tracepath6 - dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 - fi - - if use traceroute && use ipv6 ; then - dosbin traceroute6 - doman doc/traceroute6.8 - fi - - if use rarpd ; then - newinitd "${FILESDIR}"/rarpd.init.d rarpd - newconfd "${FILESDIR}"/rarpd.conf.d rarpd - fi - - dodoc INSTALL RELNOTES - - use doc && dohtml doc/*.html -} - -pkg_postinst() { - fcaps cap_net_raw \ - bin/ping \ - $(usex arping 'bin/arping' '') \ - $(usex clockdiff 'usr/bin/clockdiff' '') -}