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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 111A513835A for ; Fri, 16 Apr 2021 05:33:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E5C3E07F9; Fri, 16 Apr 2021 05:33:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0AFFEE07F9 for ; Fri, 16 Apr 2021 05:33:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5770340BC9 for ; Fri, 16 Apr 2021 05:33:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2980966A for ; Fri, 16 Apr 2021 05:33:40 +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: <1618551194.aa2a0078975b69bf146413abc329432cd32d68e1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libpcap/libpcap-1.10.0.ebuild net-libs/libpcap/libpcap-9999.ebuild X-VCS-Directories: net-libs/libpcap/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: aa2a0078975b69bf146413abc329432cd32d68e1 X-VCS-Branch: master Date: Fri, 16 Apr 2021 05:33:40 +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: ad497f40-3405-46bb-9421-35eb390bf961 X-Archives-Hash: ac97906aa793e2faf4f23ce0d37e8d85 commit: aa2a0078975b69bf146413abc329432cd32d68e1 Author: Sam James gentoo org> AuthorDate: Fri Apr 16 05:06:18 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Apr 16 05:33:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa2a0078 net-libs/libpcap: use live template Signed-off-by: Sam James gentoo.org> net-libs/libpcap/libpcap-1.10.0.ebuild | 18 +++++++++++------- net-libs/libpcap/libpcap-9999.ebuild | 32 ++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/net-libs/libpcap/libpcap-1.10.0.ebuild b/net-libs/libpcap/libpcap-1.10.0.ebuild index d14f51abdc5..eb782dc7c1a 100644 --- a/net-libs/libpcap/libpcap-1.10.0.ebuild +++ b/net-libs/libpcap/libpcap-1.10.0.ebuild @@ -6,16 +6,20 @@ EAPI=7 inherit autotools multilib-minimal DESCRIPTION="A system-independent library for user-level network packet capture" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/libpcap -" -SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz" -S="${WORKDIR}/${PN}-${P/_pre/-bp}" +HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap" + inherit git-r3 +else + SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz" + S="${WORKDIR}/${PN}-${P/_pre/-bp}" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +fi LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug" RDEPEND=" diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild index b716f850594..2f01831d36e 100644 --- a/net-libs/libpcap/libpcap-9999.ebuild +++ b/net-libs/libpcap/libpcap-9999.ebuild @@ -1,20 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools git-r3 multilib-minimal + +inherit autotools multilib-minimal DESCRIPTION="A system-independent library for user-level network packet capture" -EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/libpcap -" +HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap" + inherit git-r3 +else + SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz" + S="${WORKDIR}/${PN}-${P/_pre/-bp}" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +fi LICENSE="BSD" SLOT="0" IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug" -KEYWORDS="" RDEPEND=" bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) @@ -23,9 +29,7 @@ RDEPEND=" rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" BDEPEND=" sys-devel/flex virtual/yacc @@ -41,6 +45,10 @@ PATCHES=( src_prepare() { default + if ! [[ -f VERSION ]]; then + echo ${PV} > VERSION || die + fi + eautoreconf } @@ -62,7 +70,7 @@ multilib_src_compile() { } multilib_src_install_all() { - dodoc CREDITS CHANGES VERSION TODO README* + dodoc CREDITS CHANGES VERSION TODO README.* doc/README.* # remove static libraries (--disable-static does not work) if ! use static-libs; then