gentoo auto-resync : 19:07:2024 - 12:29:09

7 files changed, 30 insertions, 20 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 67a6fec1a52d..ce92379dbb44 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 1342e93fa8d1..33eedc0eb9d2 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -3,6 +3,6 @@ DIST libselinux-3.6.tar.gz 194210 BLAKE2B 615198d47ecfb4b6274810cbe32cce5953dd44
 DIST libselinux-3.7.tar.gz 194834 BLAKE2B 07d87c37608b480d17355334459ecb006573d61a7d3fbf622033838559397abcf343e6399f3a49b6cf24e106d03fd997397d061491d2129c15a378960dacc350 SHA512 e949c20b606c50ad521b9592ce55ad6658e8c4b24d9838028f5aba0a4fc762b6d0d0d0d207f5bef7a2e41485e12d91382fa6090df27152dbb40071b273419352
 EBUILD libselinux-3.5-r1.ebuild 4197 BLAKE2B a8ba8abab7830c69014b6bcf1e4b5782661c742ec56e980727daf43931b82d1949ae70f127aebc88785bfd6553c5717456573c6f7377a6726fbb0151e2d01d83 SHA512 d4c1c48be1387a6536ac64df9e38c68d1cfd30a17cbbcb1bda99a35793249aa5b073f284a2b75a7c388f4defec2ee19aa05689eb688001f62ecf58672a24dc89
 EBUILD libselinux-3.6-r1.ebuild 4196 BLAKE2B 7acb033e0e52dd6d6295e40ee3d00a5801d139dbc73927ece8bdc63c2cfd5c63fd7e76feef05269deb0c67b2b59a653d284f7e8a1561f84947578dc68027e6be SHA512 c35d46a05548c8b87ad20eb30b97f4d302e3caf0b958d1344b827b2e0dfd44b48ff3dc8fba830a4cae9ef5890390c557d83064df8ce005e199724422916c3fe5
-EBUILD libselinux-3.7.ebuild 4200 BLAKE2B 27b7baa335edec9a013d81ef9d5a7d5bbd5b169decb3cceb4bca2a3943f965d442dedbb029e49639be9cc10555ad7315de022da1ad0b842a47fb1b773b030ff9 SHA512 20614088b0d382728c0a6e276cd9fbe227f57d2772ed78020f698b1f6b9c07181b1f4f062f56b6a09e7f5e63b1aa7ee43661911562787cd5db255ef5628e19a4
-EBUILD libselinux-9999.ebuild 4200 BLAKE2B 27b7baa335edec9a013d81ef9d5a7d5bbd5b169decb3cceb4bca2a3943f965d442dedbb029e49639be9cc10555ad7315de022da1ad0b842a47fb1b773b030ff9 SHA512 20614088b0d382728c0a6e276cd9fbe227f57d2772ed78020f698b1f6b9c07181b1f4f062f56b6a09e7f5e63b1aa7ee43661911562787cd5db255ef5628e19a4
+EBUILD libselinux-3.7.ebuild 4210 BLAKE2B 79060c51fd696c4b29b22c774f313b376717445fa73512b08921d7d38fc3f2d835de93ee92078a7f9f6924ad2b229f9e7d455866a6aa4d8c8262597bfd150897 SHA512 c254381e41bbbbc9f6de1ba512f935c0ccb09c950b75fab9ba175469e370e28dd60a49c67cc22e90f8c29a1282fcccc7a68869a513276f29dc730826c18d6492
+EBUILD libselinux-9999.ebuild 4210 BLAKE2B 79060c51fd696c4b29b22c774f313b376717445fa73512b08921d7d38fc3f2d835de93ee92078a7f9f6924ad2b229f9e7d455866a6aa4d8c8262597bfd150897 SHA512 c254381e41bbbbc9f6de1ba512f935c0ccb09c950b75fab9ba175469e370e28dd60a49c67cc22e90f8c29a1282fcccc7a68869a513276f29dc730826c18d6492
 MISC metadata.xml 649 BLAKE2B 0d4704823be4492064b2d69a31581397cdedc9e5d564090d9770aa79124c53a66f98290fb4de22abb4f81e732267589ad1df3beda2bb71a3cf5a70f84b885dc4 SHA512 6b240fad142e4ba6457f70c83fb3171c6869ed4ac5729d51b8cc159b2471959c24a0a290ff91fa1d90e0f24f96be76a69487174de22c603539f3fc0e7109a561
diff --git a/sys-libs/libselinux/libselinux-3.7.ebuild b/sys-libs/libselinux/libselinux-3.7.ebuild
index 000aae0c00a1..17cfb428401a 100644
--- a/sys-libs/libselinux/libselinux-3.7.ebuild
+++ b/sys-libs/libselinux/libselinux-3.7.ebuild
@@ -141,7 +141,7 @@ multilib_src_install() {
 		done
 	fi
 
-	use static-libs || rm "${D}"/usr/lib*/*.a || die
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
 }
 
 pkg_postinst() {
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index 000aae0c00a1..17cfb428401a 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -141,7 +141,7 @@ multilib_src_install() {
 		done
 	fi
 
-	use static-libs || rm "${D}"/usr/lib*/*.a || die
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
 }
 
 pkg_postinst() {
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index e57f8b39cf89..e53ed1e9a6c8 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -3,6 +3,6 @@ DIST libsepol-3.6.tar.gz 509100 BLAKE2B c073c9437004df0c723125971ed26354dc6b8a78
 DIST libsepol-3.7.tar.gz 511487 BLAKE2B 8e4a0b2b3731f49d8bc8ea03bd5269672428119578046bc7f38230e3c77459e6b9d4ab39285ea33c89d8e807499ef89faa606e4b4e1ecfac2c3d445454b16420 SHA512 85d12d0ba5a7a3225f08d041a18fd59641608db5e0a78a1e9649754e45be54a807cd422d4889b88da6e806b4af546336c7a0913448f08ac33dc6ffb983890ef8
 EBUILD libsepol-3.5.ebuild 1114 BLAKE2B e2dd440d5fcdd3e3dce67bb25a5180cdda5dd534c4f5fa42b30acf1f33fa5d794583fb7808b4b39b3a7003850bb08b12bf8fbdaede1b7c3c6986c365e8d7090b SHA512 1cbd7242dfa76531be30bb7d897ca8fa05be2357351b6b276fbf14958785c5620edf1cce8d3af16a0b8d8fbcb9e1d883ffa6a9313ace5bf73278644234a10043
 EBUILD libsepol-3.6.ebuild 1114 BLAKE2B 94ab8f288daf3208748785f0440c24bbd4af0477f383c5d570db7a7d8eb98fe1f910d419a5fd41cb063bb06e7898a34b66dff7655e08f894e357324b99516a2d SHA512 be5926d4a51c07270d7cadacbaf8208b68803133c4a372127ad6f5e45261b0ca7a6cc5521a1f006805aacab721a0329a72fa40e4c87865723f054e23d55afb2c
-EBUILD libsepol-3.7.ebuild 1118 BLAKE2B 8432bf958aa71d1733696b37e627f0002a3be249654fc862093805ea573e867aeecf0fab397fe899552b8b5def83f5ed913e4a1fa1a7e0a7c6680067bfc7423d SHA512 5f0adf73faa1bd6b9c6ad2514ad5102d863574e193f9c26fb86f8e905649f416526c2266c806f2c38bc3451bf8b6f9e35f15a253fcb442abc3eebea48e9e6496
-EBUILD libsepol-9999.ebuild 1118 BLAKE2B 8432bf958aa71d1733696b37e627f0002a3be249654fc862093805ea573e867aeecf0fab397fe899552b8b5def83f5ed913e4a1fa1a7e0a7c6680067bfc7423d SHA512 5f0adf73faa1bd6b9c6ad2514ad5102d863574e193f9c26fb86f8e905649f416526c2266c806f2c38bc3451bf8b6f9e35f15a253fcb442abc3eebea48e9e6496
+EBUILD libsepol-3.7.ebuild 1200 BLAKE2B 6c792896126c48008181e1c3c0c4b25a85e95b6013954bd2bc075c193e45fca7b820ce6dceb592f594324875509de254852389f9cbbe8b558e933e7a5279acdf SHA512 4dd09c30ace31746cdb00a25a8231d1d6140df0188e4a206dfc2beed529045493753785ebd1ce9cb57c1d35c613d085d925b08db123acbe35f654ee1b051754b
+EBUILD libsepol-9999.ebuild 1200 BLAKE2B 6c792896126c48008181e1c3c0c4b25a85e95b6013954bd2bc075c193e45fca7b820ce6dceb592f594324875509de254852389f9cbbe8b558e933e7a5279acdf SHA512 4dd09c30ace31746cdb00a25a8231d1d6140df0188e4a206dfc2beed529045493753785ebd1ce9cb57c1d35c613d085d925b08db123acbe35f654ee1b051754b
 MISC metadata.xml 402 BLAKE2B 0450441687952fc82e64536652076085d66870e8cd81d9aaa99d023d17d46bc8ef6627c9ebdd6084b4c60e7d26edb61b4aaf5693794105b04b500c74a37c25be SHA512 a107ad99e8050f4cbe1c32f76699524afdced1f4b9a0c0fb3a4b5954d4f9cd5993d4d047d7a3fb45fb68c2be361c658be48287e1099ea7a6b6fca7d676969c2d
diff --git a/sys-libs/libsepol/libsepol-3.7.ebuild b/sys-libs/libsepol/libsepol-3.7.ebuild
index 4cb9db630532..cf71e47eb015 100644
--- a/sys-libs/libsepol/libsepol-3.7.ebuild
+++ b/sys-libs/libsepol/libsepol-3.7.ebuild
@@ -23,6 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0/2"
+IUSE="static-libs"
 
 # tests are not meant to be run outside of the full SELinux userland repo
 RESTRICT="test"
@@ -32,19 +33,23 @@ src_prepare() {
 	multilib_copy_sources
 }
 
+my_make() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="${EPREFIX}/$(get_libdir)" \
+		"${@}"
+}
+
 multilib_src_compile() {
 	tc-export CC AR RANLIB
 
 	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
 
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)"
+	my_make
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		install
+	my_make DESTDIR="${D}" install
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
 }
diff --git a/sys-libs/libsepol/libsepol-9999.ebuild b/sys-libs/libsepol/libsepol-9999.ebuild
index 4cb9db630532..cf71e47eb015 100644
--- a/sys-libs/libsepol/libsepol-9999.ebuild
+++ b/sys-libs/libsepol/libsepol-9999.ebuild
@@ -23,6 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0/2"
+IUSE="static-libs"
 
 # tests are not meant to be run outside of the full SELinux userland repo
 RESTRICT="test"
@@ -32,19 +33,23 @@ src_prepare() {
 	multilib_copy_sources
 }
 
+my_make() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="${EPREFIX}/$(get_libdir)" \
+		"${@}"
+}
+
 multilib_src_compile() {
 	tc-export CC AR RANLIB
 
 	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
 
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)"
+	my_make
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		install
+	my_make DESTDIR="${D}" install
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
 }