Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/
Date: Fri, 16 Apr 2021 05:33:44
Message-Id: 1618551194.aa2a0078975b69bf146413abc329432cd32d68e1.sam@gentoo
1 commit: aa2a0078975b69bf146413abc329432cd32d68e1
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 16 05:06:18 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 16 05:33:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa2a0078
7
8 net-libs/libpcap: use live template
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 net-libs/libpcap/libpcap-1.10.0.ebuild | 18 +++++++++++-------
13 net-libs/libpcap/libpcap-9999.ebuild | 32 ++++++++++++++++++++------------
14 2 files changed, 31 insertions(+), 19 deletions(-)
15
16 diff --git a/net-libs/libpcap/libpcap-1.10.0.ebuild b/net-libs/libpcap/libpcap-1.10.0.ebuild
17 index d14f51abdc5..eb782dc7c1a 100644
18 --- a/net-libs/libpcap/libpcap-1.10.0.ebuild
19 +++ b/net-libs/libpcap/libpcap-1.10.0.ebuild
20 @@ -6,16 +6,20 @@ EAPI=7
21 inherit autotools multilib-minimal
22
23 DESCRIPTION="A system-independent library for user-level network packet capture"
24 -HOMEPAGE="
25 - https://www.tcpdump.org/
26 - https://github.com/the-tcpdump-group/libpcap
27 -"
28 -SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz"
29 -S="${WORKDIR}/${PN}-${P/_pre/-bp}"
30 +HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
31 +
32 +if [[ ${PV} == *9999* ]] ; then
33 + EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
34 + inherit git-r3
35 +else
36 + SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz"
37 + S="${WORKDIR}/${PN}-${P/_pre/-bp}"
38 +
39 + 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"
40 +fi
41
42 LICENSE="BSD"
43 SLOT="0"
44 -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"
45 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
46
47 RDEPEND="
48
49 diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
50 index b716f850594..2f01831d36e 100644
51 --- a/net-libs/libpcap/libpcap-9999.ebuild
52 +++ b/net-libs/libpcap/libpcap-9999.ebuild
53 @@ -1,20 +1,26 @@
54 -# Copyright 1999-2020 Gentoo Authors
55 +# Copyright 1999-2021 Gentoo Authors
56 # Distributed under the terms of the GNU General Public License v2
57
58 EAPI=7
59 -inherit autotools git-r3 multilib-minimal
60 +
61 +inherit autotools multilib-minimal
62
63 DESCRIPTION="A system-independent library for user-level network packet capture"
64 -EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
65 -HOMEPAGE="
66 - https://www.tcpdump.org/
67 - https://github.com/the-tcpdump-group/libpcap
68 -"
69 +HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
70 +
71 +if [[ ${PV} == *9999* ]] ; then
72 + EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
73 + inherit git-r3
74 +else
75 + SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz"
76 + S="${WORKDIR}/${PN}-${P/_pre/-bp}"
77 +
78 + 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"
79 +fi
80
81 LICENSE="BSD"
82 SLOT="0"
83 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
84 -KEYWORDS=""
85
86 RDEPEND="
87 bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
88 @@ -23,9 +29,7 @@ RDEPEND="
89 rdma? ( sys-cluster/rdma-core )
90 usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
91 "
92 -DEPEND="
93 - ${RDEPEND}
94 -"
95 +DEPEND="${RDEPEND}"
96 BDEPEND="
97 sys-devel/flex
98 virtual/yacc
99 @@ -41,6 +45,10 @@ PATCHES=(
100 src_prepare() {
101 default
102
103 + if ! [[ -f VERSION ]]; then
104 + echo ${PV} > VERSION || die
105 + fi
106 +
107 eautoreconf
108 }
109
110 @@ -62,7 +70,7 @@ multilib_src_compile() {
111 }
112
113 multilib_src_install_all() {
114 - dodoc CREDITS CHANGES VERSION TODO README*
115 + dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
116
117 # remove static libraries (--disable-static does not work)
118 if ! use static-libs; then