From b3d6fe70779ee6b49176f8643d966a7009b808f2 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Thu, 20 Feb 2020 11:02:51 -0800 Subject: [PATCH] dev-libs/libbpf: Remove old versions Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Patrick McLean --- dev-libs/libbpf/Manifest | 3 -- .../libbpf/files/libbpf-0.0.3-paths.patch | 50 ------------------- dev-libs/libbpf/libbpf-0.0.3.ebuild | 47 ----------------- dev-libs/libbpf/libbpf-0.0.4.ebuild | 47 ----------------- dev-libs/libbpf/libbpf-0.0.5.ebuild | 47 ----------------- 5 files changed, 194 deletions(-) delete mode 100644 dev-libs/libbpf/files/libbpf-0.0.3-paths.patch delete mode 100644 dev-libs/libbpf/libbpf-0.0.3.ebuild delete mode 100644 dev-libs/libbpf/libbpf-0.0.4.ebuild delete mode 100644 dev-libs/libbpf/libbpf-0.0.5.ebuild diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest index e5d105fc3a0c..17d66ead9425 100644 --- a/dev-libs/libbpf/Manifest +++ b/dev-libs/libbpf/Manifest @@ -1,5 +1,2 @@ -DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3bd7c7466a5484ead1cca5a9fe775e331838cd5645d7399cb5b1a5b2fcb3814fb45643660fd3f7d84b9986bae6 SHA512 ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad -DIST libbpf-0.0.4.tar.gz 148625 BLAKE2B d8c2343441258a01ca54b0046b0f1d54cb2e0e7a09c99e489409b25d3f2486bc7d8a175b4a3e793b56ba72462d34b9a55c53e86eaf446c64f2c30d673e7f23bd SHA512 1e4a16ed0f3e378aa9d7080e4b54cb3a9542975105b09977d1ddecf3ae4dabb3b5edf80b92b61644b1f0cbda7ee7e135ee0f736e71c1d201a97b1b3dd573b543 -DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d diff --git a/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch deleted file mode 100644 index 8f905819f656..000000000000 --- a/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/Makefile b/src/Makefile -index 82a650c..549779d 100644 ---- a/Makefile -+++ b/src/Makefile -@@ -36,7 +36,10 @@ OBJDIR ?= . - OBJS := $(addprefix $(OBJDIR)/,bpf.o btf.o libbpf.o libbpf_errno.o netlink.o \ - nlattr.o str_error.o libbpf_probes.o bpf_prog_linfo.o xsk.o) - --LIBS := $(OBJDIR)/libbpf.a -+ifdef BUILD_STATIC -+ LIBS := $(OBJDIR)/libbpf.a -+endif -+ - ifndef BUILD_STATIC_ONLY - LIBS += $(OBJDIR)/libbpf.so \ - $(OBJDIR)/libbpf.so.$(VERSION) \ -@@ -63,7 +66,7 @@ endif - PREFIX ?= /usr - LIBDIR ?= $(PREFIX)/$(LIBSUBDIR) - INCLUDEDIR ?= $(PREFIX)/include --UAPIDIR ?= $(PREFIX)/include -+UAPIDIR ?= $(PREFIX)/include/bpf/uapi - - all: $(LIBS) $(PC_FILE) - -@@ -84,6 +87,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(OBJS) - $(OBJDIR)/libbpf.pc: - sed -e "s|@PREFIX@|$(PREFIX)|" \ - -e "s|@LIBDIR@|$(LIBDIR)|" \ -+ -e "s|@UAPIDIR@|$(UAPIDIR)|" \ - -e "s|@VERSION@|$(LIBBPF_VERSION)|" \ - < libbpf.pc.template > $@ - -diff --git a/libbpf.pc.template b/src/libbpf.pc.template -index ac17fce..6d385d9 100644 ---- a/libbpf.pc.template -+++ b/src/libbpf.pc.template -@@ -3,10 +3,11 @@ - prefix=@PREFIX@ - libdir=@LIBDIR@ - includedir=${prefix}/include -+uapidir=@UAPIDIR@ - - Name: libbpf - Description: BPF library - Version: @VERSION@ - Libs: -L${libdir} -lbpf - Requires.private: libelf --Cflags: -I${includedir} -+Cflags: -I${includedir} -I${uapidir} diff --git a/dev-libs/libbpf/libbpf-0.0.3.ebuild b/dev-libs/libbpf/libbpf-0.0.3.ebuild deleted file mode 100644 index b455107a4012..000000000000 --- a/dev-libs/libbpf/libbpf-0.0.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -HOMEPAGE="https://github.com/libbpf/libbpf" -DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+static-libs" - -COMMON_DEPEND="virtual/libelf - !<=dev-util/bcc-0.7.0" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${P}/src" - -PATCHES=( - "${FILESDIR}/libbpf-0.0.3-paths.patch" -) - -src_compile() { - emake \ - BUILD_SHARED=y \ - LIBSUBDIR="$(get_libdir)" \ - $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ - CC="$(tc-getCC)" -} - -src_install() { - emake \ - BUILD_SHARED=y \ - LIBSUBDIR="$(get_libdir)" \ - DESTDIR="${D}" \ - $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ - install install_uapi_headers - - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc -} diff --git a/dev-libs/libbpf/libbpf-0.0.4.ebuild b/dev-libs/libbpf/libbpf-0.0.4.ebuild deleted file mode 100644 index b455107a4012..000000000000 --- a/dev-libs/libbpf/libbpf-0.0.4.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -HOMEPAGE="https://github.com/libbpf/libbpf" -DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+static-libs" - -COMMON_DEPEND="virtual/libelf - !<=dev-util/bcc-0.7.0" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${P}/src" - -PATCHES=( - "${FILESDIR}/libbpf-0.0.3-paths.patch" -) - -src_compile() { - emake \ - BUILD_SHARED=y \ - LIBSUBDIR="$(get_libdir)" \ - $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ - CC="$(tc-getCC)" -} - -src_install() { - emake \ - BUILD_SHARED=y \ - LIBSUBDIR="$(get_libdir)" \ - DESTDIR="${D}" \ - $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ - install install_uapi_headers - - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc -} diff --git a/dev-libs/libbpf/libbpf-0.0.5.ebuild b/dev-libs/libbpf/libbpf-0.0.5.ebuild deleted file mode 100644 index 7e265723db96..000000000000 --- a/dev-libs/libbpf/libbpf-0.0.5.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -HOMEPAGE="https://github.com/libbpf/libbpf" -DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+static-libs" - -COMMON_DEPEND="virtual/libelf - !<=dev-util/bcc-0.7.0" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${P}/src" - -PATCHES=( - "${FILESDIR}/libbpf-0.0.5-paths.patch" -) - -src_compile() { - emake \ - BUILD_SHARED=y \ - LIBSUBDIR="$(get_libdir)" \ - $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ - CC="$(tc-getCC)" -} - -src_install() { - emake \ - BUILD_SHARED=y \ - LIBSUBDIR="$(get_libdir)" \ - DESTDIR="${D}" \ - $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ - install install_uapi_headers - - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc -} -- 2.26.2