[gentoo-commits] repo/gentoo:master commit in: net-libs/xdp-tools/

[Jason A. Donenfeld]

commit:     2ebba702392e863393740e6cf00b77dd3ebdfb1d
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 23:47:25 2022 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 23:49:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebba702

net-libs/xdp-tools: bump to 1.2.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 net-libs/xdp-tools/Manifest                        |  2 +-
 ...p-tools-1.2.0.ebuild => xdp-tools-1.2.2.ebuild} | 23 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index 5ecf7cd4b235..ea4cbad8d43e 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1 +1 @@
-DIST xdp-tools-1.2.0.tar.gz 233676 BLAKE2B 
488bd24c5b0c25cb90cc434c0d7cecaf0cf2818d949008fabf4a1245f773e1a1e7a6520c4155df5a6364b0cc8ce2ae49b7b428209b762ecd11f9d6adc10cc57b
 SHA512 
484e5aed6d695665e9e7edec8033b6034281fb215c758a8a8600b5b2215c7decb538efbafa4204306497197a329c3ad7c51beb33717fbe0296a345a1aca8c0a9
+DIST xdp-tools-1.2.2.tar.gz 250875 BLAKE2B 
dc390587caa1702148a47203a53703d3d9f7e65d7503e8f8307cbec60d5b52f6c150fdc51f257463e22eaa2e897eb68f20ba7a8d7f7bc0fac47cbaf8072fd5cf
 SHA512 
ec2fe34f820e324af044968c62440ba40cae46012c6e39d23cffc392ff190675d8a43240049b2c0467db391073469045aaa3d559cfb8a48d86fb2305fb9f45ad

diff --git a/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild 
b/net-libs/xdp-tools/xdp-tools-1.2.2.ebuild
similarity index 71%
rename from net-libs/xdp-tools/xdp-tools-1.2.0.ebuild
rename to net-libs/xdp-tools/xdp-tools-1.2.2.ebuild
index f15f1f30f4f4..91e600e4adc3 100644
--- a/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild
+++ b/net-libs/xdp-tools/xdp-tools-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,15 +11,14 @@ LICENSE="GPL-2 LGPL-2.1 BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-IUSE="+doc +tools"
+IUSE="+tools"
 
 DEPEND="dev-libs/libbpf:=
        sys-libs/zlib
        net-libs/libpcap
        virtual/libelf"
 RDEPEND="${DEPEND}"
-BDEPEND=">=sys-devel/clang-10.0.0
-       doc? ( app-editors/emacs )"
+BDEPEND=">=sys-devel/clang-10.0.0"
 
 # Not prebuilt -- we build them -- but they're not ordinary ELF objects either.
 QA_PREBUILT="usr/lib/bpf/*.o"
@@ -29,21 +28,23 @@ MAKEOPTS+=" V=1"
 src_configure() {
        export PRODUCTION=1
        export DYNAMIC_LIBXDP=1
-       export FORCE_EMACS=$(usex doc 1 0)
-       use doc || export EMACS=false
        export FORCE_SYSTEM_LIBBPF=1
        default
-       {
-               echo "PREFIX := ${EPREFIX}/usr"
-               echo "LIBDIR := \$(PREFIX)/$(get_libdir)"
-               echo "BPF_OBJECT_DIR := \$(PREFIX)/lib/bpf"
-       } >> config.mk
 }
 
 src_install() {
+       export PREFIX="${EPREFIX}/usr"
+       export LIBDIR="${PREFIX}/$(get_libdir)"
+       export BPF_OBJECT_DIR="${PREFIX}/lib/bpf"
        default
+
+       # To remove the scripts/testing files that are installed.
        rm -r "${ED}/usr/share/xdp-tools" || die
+       # We can't control static archive generation yet.
        rm "${ED}/usr/$(get_libdir)/libxdp.a" || die
+
        use tools || { rm "${ED}/usr/sbin"/* || die; }
+
+       # These are ELF objects but BPF ones.
        dostrip -x /usr/lib/bpf
 }