From 0413d2b898a1af51702744e6df3c7293b7971177 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <zx2c4@gentoo.org>
Date: Fri, 29 Oct 2021 14:09:44 +0200
Subject: net-libs/xdp-tools: bump to 1.2.0

Github shows both "releases" (unmaintained) and "tags" (maintained).
Choose the latter and bump this package.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>
---
 net-libs/xdp-tools/Manifest               |  2 +-
 net-libs/xdp-tools/xdp-tools-0.0.3.ebuild | 52 -------------------------------
 net-libs/xdp-tools/xdp-tools-1.2.0.ebuild | 48 ++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 53 deletions(-)
 delete mode 100644 net-libs/xdp-tools/xdp-tools-0.0.3.ebuild
 create mode 100644 net-libs/xdp-tools/xdp-tools-1.2.0.ebuild

(limited to 'net-libs')

diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index 1ce4a87a70a7..5ecf7cd4b235 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1 +1 @@
-DIST xdp-tools-0.0.3.tar.gz 381386 BLAKE2B 1160d9a7cc2b6cf7b49e7223acdbeba72046c00ec710c21140da0607cac1e8a1231992a8967b2f8f2a964da593dfe0af08b28abbc3b13818ddafebbc2c3961a7 SHA512 c2a4278db41af020cf42b1139c93786a49ad2a071b2002177ac39e8d6b74203d251bd7823399d9e156c969d2ae741b0ecd4178edf446fe5c7270e53295458fce
+DIST xdp-tools-1.2.0.tar.gz 233676 BLAKE2B 488bd24c5b0c25cb90cc434c0d7cecaf0cf2818d949008fabf4a1245f773e1a1e7a6520c4155df5a6364b0cc8ce2ae49b7b428209b762ecd11f9d6adc10cc57b SHA512 484e5aed6d695665e9e7edec8033b6034281fb215c758a8a8600b5b2215c7decb538efbafa4204306497197a329c3ad7c51beb33717fbe0296a345a1aca8c0a9
diff --git a/net-libs/xdp-tools/xdp-tools-0.0.3.ebuild b/net-libs/xdp-tools/xdp-tools-0.0.3.ebuild
deleted file mode 100644
index 0966087d398a..000000000000
--- a/net-libs/xdp-tools/xdp-tools-0.0.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The libxdp library and various tools for use with XDP"
-HOMEPAGE="https://github.com/xdp-project/xdp-tools"
-SRC_URI="https://github.com/xdp-project/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+doc +tools static-libs"
-
-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 )"
-
-# Not prebuilt -- we build them -- but they're not ordinary ELF objects either.
-QA_PREBUILT="usr/lib/bpf/*.o"
-
-MAKEOPTS+=" V=1"
-
-src_prepare() {
-	# A form of this kludge is upstream but hasn't yet been released:
-	sed -i 's/install -m 0755 \$(SHARED_LIBS)/cp -fpR \$(SHARED_LIBS)/' lib/libxdp/Makefile || die
-	default
-}
-
-src_configure() {
-	export PRODUCTION=1
-	export DYNAMIC_LIBXDP=1
-	export FORCE_EMACS=$(usex doc 1 0)
-	default
-	{
-		echo "PREFIX := ${EPREFIX}/usr"
-		echo "LIBDIR := \$(PREFIX)/$(get_libdir)"
-		echo "BPF_OBJECT_DIR := \$(PREFIX)/lib/bpf"
-	} >> config.mk
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${D}/${EPREFIX}/usr/$(get_libdir)/libxdp.a"
-	use tools || rm -f "${D}/${EPREFIX}/usr/"{sbin,bin}/*
-	dostrip -x /usr/lib/bpf
-}
diff --git a/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild b/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild
new file mode 100644
index 000000000000..c3baff158c9e
--- /dev/null
+++ b/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The libxdp library and various tools for use with XDP"
+HOMEPAGE="https://github.com/xdp-project/xdp-tools"
+SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+doc +tools static-libs"
+
+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 )"
+
+# Not prebuilt -- we build them -- but they're not ordinary ELF objects either.
+QA_PREBUILT="usr/lib/bpf/*.o"
+
+MAKEOPTS+=" V=1"
+
+src_configure() {
+	export PRODUCTION=1
+	export DYNAMIC_LIBXDP=1
+	export FORCE_EMACS=$(usex doc 1 0)
+	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() {
+	default
+	rm -rf "${D}/${EPREFIX}/usr/share/xdp-tools"
+	use static-libs || rm -f "${D}/${EPREFIX}/usr/$(get_libdir)/libxdp.a"
+	use tools || rm -f "${D}/${EPREFIX}/usr/"{sbin,bin}/*
+	dostrip -x /usr/lib/bpf
+}
-- 
cgit v1.2.3-65-gdbad