From 1a256280f70812d1ae23f0ce2a2569291b6609da Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 25 Sep 2022 05:33:01 +0100
Subject: gentoo auto-resync : 25:09:2022 - 05:33:00

---
 dev-libs/Manifest.gz                   | Bin 95932 -> 95936 bytes
 dev-libs/libbpf/Manifest               |   4 +--
 dev-libs/libbpf/libbpf-1.0.0-r1.ebuild |  52 +++++++++++++++++++++++++++++++++
 dev-libs/libbpf/libbpf-1.0.0.ebuild    |  51 --------------------------------
 dev-libs/libbpf/libbpf-9999.ebuild     |   1 +
 5 files changed, 55 insertions(+), 53 deletions(-)
 create mode 100644 dev-libs/libbpf/libbpf-1.0.0-r1.ebuild
 delete mode 100644 dev-libs/libbpf/libbpf-1.0.0.ebuild

(limited to 'dev-libs')

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f02604110d6a..b52edb50d096 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 32f73cdbf135..0f96ef9562e5 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -2,6 +2,6 @@ AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f
 DIST libbpf-0.8.1.tar.gz 942702 BLAKE2B 084be7d4258500fa894560ed2e52821addcc5d150dcd77fd646271b614d788b7931271be9c3e46fdbc4ed93d053ea3e09023158a8e4a31f9452d10dcb0677b58 SHA512 e3bb602f55215a4f030e564af7321ba6338937c426fcaee478b607f88b0c773c40a0c3f59a2b345bda951a19e79061733f8a3fdc10a6292e92782e65754b584a
 DIST libbpf-1.0.0.tar.gz 917108 BLAKE2B 5bde5a9147330f11dcf1e37aace971624293aae3914459a6b8be327530fa2c2774edaf1b798225ade2771edd88bddc2a74d7f523791f83558417b759eb417f7a SHA512 e99aea1ff477114549b41c272a975169a79ffc1daf4bcaba586cd13d0fc0b23c336cb406fd8e64b73350fe16e2d423fa68a29601d15e2477955c7a92358fb7f8
 EBUILD libbpf-0.8.1.ebuild 1084 BLAKE2B dc1a4b3f72e0b0ee6e2a02eaea9cced199292d3123ea561d4500ecb046aed913a3b36953ab0834835e21ba479ce5e6e5dfa2886f0dee3a11b3931f5923c346d9 SHA512 a28fa90a912fe5a83c0698f59461d24de22b7176940e248eb217910c58ad4a39f80a942d608bdfee98b256ae15d16f025eec497aeb2c0439cecb014c94fffda1
-EBUILD libbpf-1.0.0.ebuild 1092 BLAKE2B 6f015d85733216c4b80e9255ddfe983c331c7d24defcfdfd2b7cb7ed192b376ca08e5405f0d601ea4db704b5ecc68157659edb84d0f9565d8b4d3bc14ec3b43a SHA512 4393b81437c52b277eed6990b69c071b9317e9f8bb112f9abdcd60c93f2af5b66e165ea0436c12ca4dce475e1052fd98a0bb6dd9787bc9c44e0a03e547c2ad61
-EBUILD libbpf-9999.ebuild 1092 BLAKE2B 6f015d85733216c4b80e9255ddfe983c331c7d24defcfdfd2b7cb7ed192b376ca08e5405f0d601ea4db704b5ecc68157659edb84d0f9565d8b4d3bc14ec3b43a SHA512 4393b81437c52b277eed6990b69c071b9317e9f8bb112f9abdcd60c93f2af5b66e165ea0436c12ca4dce475e1052fd98a0bb6dd9787bc9c44e0a03e547c2ad61
+EBUILD libbpf-1.0.0-r1.ebuild 1138 BLAKE2B f6921b078310adf0838c8c2261ec326100253390915bdcc51715acb4bbe70f72cb461ef4308c82ca0118b1592b067ca2322d0c0d78c785fbc8cc3521d8969269 SHA512 1f852b104a6701dda73bb85bb2e65c8af1bc6d1df0072220e44c0ada2c92365e4c4962c760a8116bea5de1c1b7b15647a54974ba4c14e0efa1bcce5a0e507694
+EBUILD libbpf-9999.ebuild 1138 BLAKE2B f6921b078310adf0838c8c2261ec326100253390915bdcc51715acb4bbe70f72cb461ef4308c82ca0118b1592b067ca2322d0c0d78c785fbc8cc3521d8969269 SHA512 1f852b104a6701dda73bb85bb2e65c8af1bc6d1df0072220e44c0ada2c92365e4c4962c760a8116bea5de1c1b7b15647a54974ba4c14e0efa1bcce5a0e507694
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild b/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..d106d0c7a863
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+S="${WORKDIR}/${P}/src"
+
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+HOMEPAGE="https://github.com/libbpf/libbpf"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="static-libs"
+
+DEPEND="
+	sys-kernel/linux-headers
+	virtual/libelf"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/libbpf-9999-paths.patch
+)
+
+src_configure() {
+	append-cflags -fPIC
+	tc-export CC AR
+	export LIBSUBDIR="$(get_libdir)"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		install install_uapi_headers
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
diff --git a/dev-libs/libbpf/libbpf-1.0.0.ebuild b/dev-libs/libbpf/libbpf-1.0.0.ebuild
deleted file mode 100644
index b2c18cdba4be..000000000000
--- a/dev-libs/libbpf/libbpf-1.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-S="${WORKDIR}/${P}/src"
-
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-HOMEPAGE="https://github.com/libbpf/libbpf"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="static-libs"
-
-DEPEND="
-	sys-kernel/linux-headers
-	virtual/libelf"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/libbpf-9999-paths.patch
-)
-
-src_configure() {
-	append-cflags -fPIC
-	tc-export CC AR
-	export LIBSUBDIR="$(get_libdir)"
-	export V=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		install install_uapi_headers
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}
diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild
index b2c18cdba4be..d106d0c7a863 100644
--- a/dev-libs/libbpf/libbpf-9999.ebuild
+++ b/dev-libs/libbpf/libbpf-9999.ebuild
@@ -34,6 +34,7 @@ src_configure() {
 	append-cflags -fPIC
 	tc-export CC AR
 	export LIBSUBDIR="$(get_libdir)"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 	export V=1
 }
 
-- 
cgit v1.2.3