gentoo auto-resync : 24:12:2022 - 14:02:21

5 files changed, 14 insertions, 10 deletions

diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index dc87bf85fff1..d3b3ae7a47fe 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -2,8 +2,8 @@ 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
 DIST libbpf-1.0.1.tar.gz 917269 BLAKE2B 24e43f9a2b20e6f708b74ff50c8ce243546681201b1d72d6b35a95dd85b59032069814792739d3b2a6adaa007958a142a687e901e36a193fd02cdca69926d08f SHA512 2ee6d85c0a33f723e5b93ddddf97118e67754c9e44ca0449ceb49126820f89fea9ddc282a5add764dc4da090af6164cc6641b497489253d192ed01bc397df9be
-EBUILD libbpf-0.8.1.ebuild 1084 BLAKE2B dc1a4b3f72e0b0ee6e2a02eaea9cced199292d3123ea561d4500ecb046aed913a3b36953ab0834835e21ba479ce5e6e5dfa2886f0dee3a11b3931f5923c346d9 SHA512 a28fa90a912fe5a83c0698f59461d24de22b7176940e248eb217910c58ad4a39f80a942d608bdfee98b256ae15d16f025eec497aeb2c0439cecb014c94fffda1
-EBUILD libbpf-1.0.0-r1.ebuild 1138 BLAKE2B f6921b078310adf0838c8c2261ec326100253390915bdcc51715acb4bbe70f72cb461ef4308c82ca0118b1592b067ca2322d0c0d78c785fbc8cc3521d8969269 SHA512 1f852b104a6701dda73bb85bb2e65c8af1bc6d1df0072220e44c0ada2c92365e4c4962c760a8116bea5de1c1b7b15647a54974ba4c14e0efa1bcce5a0e507694
-EBUILD libbpf-1.0.1.ebuild 1138 BLAKE2B f6921b078310adf0838c8c2261ec326100253390915bdcc51715acb4bbe70f72cb461ef4308c82ca0118b1592b067ca2322d0c0d78c785fbc8cc3521d8969269 SHA512 1f852b104a6701dda73bb85bb2e65c8af1bc6d1df0072220e44c0ada2c92365e4c4962c760a8116bea5de1c1b7b15647a54974ba4c14e0efa1bcce5a0e507694
-EBUILD libbpf-9999.ebuild 1138 BLAKE2B f6921b078310adf0838c8c2261ec326100253390915bdcc51715acb4bbe70f72cb461ef4308c82ca0118b1592b067ca2322d0c0d78c785fbc8cc3521d8969269 SHA512 1f852b104a6701dda73bb85bb2e65c8af1bc6d1df0072220e44c0ada2c92365e4c4962c760a8116bea5de1c1b7b15647a54974ba4c14e0efa1bcce5a0e507694
+EBUILD libbpf-0.8.1.ebuild 1124 BLAKE2B 94f54cfb32015f3a1960a292f340064abc8506a8e5e5fa12478a274c35ea5898e71fd1187f94175dff563ddde8e279f50e52189009914f35ca8471510c564d82 SHA512 a31cf192a389db973a4a689bc0d55ed3868ad647d4c3e3f0c0063b55ecd238fad7e9d57202cd774a0ae66759908a9c5a41f8f3b8890b3d496c687085de4f1af6
+EBUILD libbpf-1.0.0-r1.ebuild 1124 BLAKE2B ebd567c47bcd2889782d9d5b9753ec591652c97dd8a451c2bb0bde3fca52e3178d81b30c2f6487f7b5821297c47b1b3db066854d84f4ff639c4827b22bbaa8ee SHA512 b782b8210d7fa5e13d3abc9f6e904f583ee1a783105aab75b188f2dca8ea50a6d137ab3582668a4ba362f1ef7c1a033cc4fda5cb2ae2aeedde6d87c9a23f886b
+EBUILD libbpf-1.0.1.ebuild 1163 BLAKE2B b50f3c5d6bf8349899ebd870ca75cfc61f6b37968a7fbaed710dde90daa0e1c8bae2f030dde39d713698c8e6f4aebd4ac698cefa338b32397fe757d27a21b5d7 SHA512 1e4d2315382283f0d1ed6d907dc1095e5191e4c05dbadc4de7cb6278018d11703a4bad36619e09df165c4957340cd1fcaf0644d31db3ef9ec3772aabbf9cb7fd
+EBUILD libbpf-9999.ebuild 1163 BLAKE2B b50f3c5d6bf8349899ebd870ca75cfc61f6b37968a7fbaed710dde90daa0e1c8bae2f030dde39d713698c8e6f4aebd4ac698cefa338b32397fe757d27a21b5d7 SHA512 1e4d2315382283f0d1ed6d907dc1095e5191e4c05dbadc4de7cb6278018d11703a4bad36619e09df165c4957340cd1fcaf0644d31db3ef9ec3772aabbf9cb7fd
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-0.8.1.ebuild b/dev-libs/libbpf/libbpf-0.8.1.ebuild
index 47b9e6026fa9..9050c1e4a1be 100644
--- a/dev-libs/libbpf/libbpf-0.8.1.ebuild
+++ b/dev-libs/libbpf/libbpf-0.8.1.ebuild
@@ -34,7 +34,9 @@ PATCHES=(
 src_configure() {
 	append-cflags -fPIC
 	tc-export CC AR
-	export LIBSUBDIR="$(get_libdir)" V=1
+	export LIBSUBDIR="$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
+	export V=1
 }
 
 src_install() {
diff --git a/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild b/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild
index d106d0c7a863..d930f5e22209 100644
--- a/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild
+++ b/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild
@@ -34,7 +34,7 @@ src_configure() {
 	append-cflags -fPIC
 	tc-export CC AR
 	export LIBSUBDIR="$(get_libdir)"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
 	export V=1
 }
 
diff --git a/dev-libs/libbpf/libbpf-1.0.1.ebuild b/dev-libs/libbpf/libbpf-1.0.1.ebuild
index d106d0c7a863..1092fcc0f3c4 100644
--- a/dev-libs/libbpf/libbpf-1.0.1.ebuild
+++ b/dev-libs/libbpf/libbpf-1.0.1.ebuild
@@ -25,6 +25,7 @@ DEPEND="
 	sys-kernel/linux-headers
 	virtual/libelf"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/libbpf-9999-paths.patch
@@ -32,9 +33,9 @@ PATCHES=(
 
 src_configure() {
 	append-cflags -fPIC
-	tc-export CC AR
+	tc-export CC AR PKG_CONFIG
 	export LIBSUBDIR="$(get_libdir)"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
 	export V=1
 }
 
diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild
index d106d0c7a863..1092fcc0f3c4 100644
--- a/dev-libs/libbpf/libbpf-9999.ebuild
+++ b/dev-libs/libbpf/libbpf-9999.ebuild
@@ -25,6 +25,7 @@ DEPEND="
 	sys-kernel/linux-headers
 	virtual/libelf"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/libbpf-9999-paths.patch
@@ -32,9 +33,9 @@ PATCHES=(
 
 src_configure() {
 	append-cflags -fPIC
-	tc-export CC AR
+	tc-export CC AR PKG_CONFIG
 	export LIBSUBDIR="$(get_libdir)"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
 	export V=1
 }