diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-02-07 03:59:02 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-02-07 03:59:02 +0000 |
| commit | 632aa90c53a31517c5d2259537aadc192434a332 (patch) | |
| tree | d466e8c0d3bf25eda998e2f04dc4872de416d117 /sys-apps/util-linux | |
| parent | 6bdf113f9fe24f179ee150bada14098e20e87476 (diff) | |
gentoo auto-resync : 07:02:2024 - 03:59:02
Diffstat (limited to 'sys-apps/util-linux')
| -rw-r--r-- | sys-apps/util-linux/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.39.3-r2.ebuild (renamed from sys-apps/util-linux/util-linux-2.39.3-r1.ebuild) | 7 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 27 |
3 files changed, 20 insertions, 18 deletions
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index a357ce2a8f02..a3414d76027e 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -14,6 +14,6 @@ DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d00 DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa EBUILD util-linux-2.38.1-r3.ebuild 10652 BLAKE2B ffce17852c9c268991be22e76eb9beef14331968f5b8cef20b336a0c58c71b76dd04b757181a31ff5c9f3caf01a48f09dde91d32ee5af1fff0bd2a1d6a5a5a86 SHA512 fe76840ce7d4d37416e51370c1788af1356c8f978683aee5a8d90a240e65905fab1aea7ca3811032f5f4f23d773971ff0614df20215183a12f9f6a1d2caaf7ed EBUILD util-linux-2.39.2-r1.ebuild 10950 BLAKE2B 2be9d6b75028e7e0a1d6e08ae1d03abba6e359b3be8bbbe27cb2863b0d435f4a48e50a2428b78cd3fe46fd3517a36c71c11ba7ea197a3a9878f866f1a75c4261 SHA512 8845c504ebcf28031a9239ba26cc2d9ec03538cd92782ca72ebc402a06673a0a424a5d01de457e82cd49f942888f953756576de7751f396aa9a3def79d95f3f9 -EBUILD util-linux-2.39.3-r1.ebuild 10954 BLAKE2B 9244cb6b8928210b1d08c3a044f51245775a9bb7f0f3719976418be1d54e19541a2a29e0d2a3ee5d1aab414a87a7eb97fa123198463cc4039b6f766fb5346042 SHA512 ddfaa770ab53ddb577204d15e1299c3347602a155d0f6eb98be14a4ab733e0d15c2af63cb845d7af9674634688be571c85fbd5f3ac646f4c52e9174d9b8f5034 -EBUILD util-linux-9999.ebuild 10482 BLAKE2B ada4654d66dac470020c274948442fd531e5221005e0c01f4864c9acfb330b465382656ef1b0152cab1afe0bf815219ca6ecb0fe2056496b1d533fe0373c0b38 SHA512 e95f952e501cb0aa9b8699a5ef13eb43732571f221b2bb6e2f522ae83cc858d2b0276af9c83d67c684d27390e599534bcdfdf5adf188a88fac4e1accf4ffe197 +EBUILD util-linux-2.39.3-r2.ebuild 10824 BLAKE2B 1c84b199627cf7c1286d57814158d7235e2c6977b377e08be3bc8999e75a91c1dbbf486b250724f5fb244019040a9797594feff28e42ea4cdd23b7d19e83dfdd SHA512 72df7f6ab7b8b3382db709d0762ecfe24670776cdaee4f88ff3965f3c4b2c12f3292ff799f24054901c7668f44e2cfef442b3a683500cfdfe77c09f4e54e535b +EBUILD util-linux-9999.ebuild 10471 BLAKE2B 00c7b828d20666fa23bbc289766af5170ee8cacd9afa37b9ee7570d2e5f91d29b1a92276df50d74eeabbf5b528b024cb3a3d5bb91f0de8f70f61eebec561a517 SHA512 696e6acf62b7ace446ccca46ba05d94a23f4aa80fbb21cf6c06f3f3a75e3afea88c819791a5e8bcd06a2bec0624c88a13edd41497dbf6776b354ba99c87c2f5a MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c diff --git a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild index 6d2aa61d4365..bea51fe15f33 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ pam python-r1 multilib-minimal multiprocessing systemd MY_PV="${PV/_/-}" @@ -356,11 +356,6 @@ multilib_src_install() { # This needs to be called AFTER python_install call, bug #689190 emake DESTDIR="${D}" install - - if multilib_is_native_abi ; then - # Need the libs in / - gen_usr_ldscript -a blkid fdisk mount smartcols uuid - fi } multilib_src_install_all() { diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index d7b81f31df52..f0f5f21353c8 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ pam python-r1 multilib-minimal multiprocessing systemd MY_PV="${PV/_/-}" @@ -55,8 +55,10 @@ RDEPEND=" rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= ) + !build? ( + systemd? ( sys-apps/systemd ) + udev? ( virtual/libudev:= ) + ) " BDEPEND=" virtual/pkgconfig @@ -213,8 +215,6 @@ multilib_src_configure() { $(multilib_native_use_enable suid makeinstall-setuid) $(multilib_native_use_with readline) $(multilib_native_use_with slang) - $(multilib_native_use_with systemd) - $(multilib_native_use_with udev) $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') @@ -228,6 +228,18 @@ multilib_src_configure() { $(use_with selinux) ) + if use build ; then + myeconfargs+=( + --without-systemd + --without-udev + ) + else + myeconfargs+=( + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + ) + fi + if multilib_is_native_abi ; then myeconfargs+=( --disable-chfn-chsh @@ -334,11 +346,6 @@ multilib_src_install() { # This needs to be called AFTER python_install call, bug #689190 emake DESTDIR="${D}" install - - if multilib_is_native_abi ; then - # Need the libs in / - gen_usr_ldscript -a blkid fdisk mount smartcols uuid - fi } multilib_src_install_all() { |