Gentoo Archives: gentoo-commits

From: "Jason A. Donenfeld" <zx2c4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/xdp-tools/
Date: Sat, 05 Feb 2022 23:59:47
Message-Id: 1644104984.2ebba702392e863393740e6cf00b77dd3ebdfb1d.zx2c4@gentoo
1 commit: 2ebba702392e863393740e6cf00b77dd3ebdfb1d
2 Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 5 23:47:25 2022 +0000
4 Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 5 23:49:44 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebba702
7
8 net-libs/xdp-tools: bump to 1.2.2
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
12
13 net-libs/xdp-tools/Manifest | 2 +-
14 ...p-tools-1.2.0.ebuild => xdp-tools-1.2.2.ebuild} | 23 +++++++++++-----------
15 2 files changed, 13 insertions(+), 12 deletions(-)
16
17 diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
18 index 5ecf7cd4b235..ea4cbad8d43e 100644
19 --- a/net-libs/xdp-tools/Manifest
20 +++ b/net-libs/xdp-tools/Manifest
21 @@ -1 +1 @@
22 -DIST xdp-tools-1.2.0.tar.gz 233676 BLAKE2B 488bd24c5b0c25cb90cc434c0d7cecaf0cf2818d949008fabf4a1245f773e1a1e7a6520c4155df5a6364b0cc8ce2ae49b7b428209b762ecd11f9d6adc10cc57b SHA512 484e5aed6d695665e9e7edec8033b6034281fb215c758a8a8600b5b2215c7decb538efbafa4204306497197a329c3ad7c51beb33717fbe0296a345a1aca8c0a9
23 +DIST xdp-tools-1.2.2.tar.gz 250875 BLAKE2B dc390587caa1702148a47203a53703d3d9f7e65d7503e8f8307cbec60d5b52f6c150fdc51f257463e22eaa2e897eb68f20ba7a8d7f7bc0fac47cbaf8072fd5cf SHA512 ec2fe34f820e324af044968c62440ba40cae46012c6e39d23cffc392ff190675d8a43240049b2c0467db391073469045aaa3d559cfb8a48d86fb2305fb9f45ad
24
25 diff --git a/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild b/net-libs/xdp-tools/xdp-tools-1.2.2.ebuild
26 similarity index 71%
27 rename from net-libs/xdp-tools/xdp-tools-1.2.0.ebuild
28 rename to net-libs/xdp-tools/xdp-tools-1.2.2.ebuild
29 index f15f1f30f4f4..91e600e4adc3 100644
30 --- a/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild
31 +++ b/net-libs/xdp-tools/xdp-tools-1.2.2.ebuild
32 @@ -1,4 +1,4 @@
33 -# Copyright 2021 Gentoo Authors
34 +# Copyright 2021-2022 Gentoo Authors
35 # Distributed under the terms of the GNU General Public License v2
36
37 EAPI=8
38 @@ -11,15 +11,14 @@ LICENSE="GPL-2 LGPL-2.1 BSD-2"
39 SLOT="0"
40 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
41
42 -IUSE="+doc +tools"
43 +IUSE="+tools"
44
45 DEPEND="dev-libs/libbpf:=
46 sys-libs/zlib
47 net-libs/libpcap
48 virtual/libelf"
49 RDEPEND="${DEPEND}"
50 -BDEPEND=">=sys-devel/clang-10.0.0
51 - doc? ( app-editors/emacs )"
52 +BDEPEND=">=sys-devel/clang-10.0.0"
53
54 # Not prebuilt -- we build them -- but they're not ordinary ELF objects either.
55 QA_PREBUILT="usr/lib/bpf/*.o"
56 @@ -29,21 +28,23 @@ MAKEOPTS+=" V=1"
57 src_configure() {
58 export PRODUCTION=1
59 export DYNAMIC_LIBXDP=1
60 - export FORCE_EMACS=$(usex doc 1 0)
61 - use doc || export EMACS=false
62 export FORCE_SYSTEM_LIBBPF=1
63 default
64 - {
65 - echo "PREFIX := ${EPREFIX}/usr"
66 - echo "LIBDIR := \$(PREFIX)/$(get_libdir)"
67 - echo "BPF_OBJECT_DIR := \$(PREFIX)/lib/bpf"
68 - } >> config.mk
69 }
70
71 src_install() {
72 + export PREFIX="${EPREFIX}/usr"
73 + export LIBDIR="${PREFIX}/$(get_libdir)"
74 + export BPF_OBJECT_DIR="${PREFIX}/lib/bpf"
75 default
76 +
77 + # To remove the scripts/testing files that are installed.
78 rm -r "${ED}/usr/share/xdp-tools" || die
79 + # We can't control static archive generation yet.
80 rm "${ED}/usr/$(get_libdir)/libxdp.a" || die
81 +
82 use tools || { rm "${ED}/usr/sbin"/* || die; }
83 +
84 + # These are ELF objects but BPF ones.
85 dostrip -x /usr/lib/bpf
86 }