commit: fd738e2f9e26c7b42779593cabf9634663fa4f5f Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Sep 26 13:34:15 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Sep 26 13:35:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd738e2f
sys-apps/util-linux: Removed old. Package-Manager: Portage-2.3.50, Repoman-2.3.11 sys-apps/util-linux/Manifest | 1 - .../util-linux-2.32_rc2-umount_completion.patch | 41 ---- sys-apps/util-linux/util-linux-2.30.2-r1.ebuild | 212 ------------------ sys-apps/util-linux/util-linux-2.32-r5.ebuild | 242 --------------------- 4 files changed, 496 deletions(-) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 18bd746f782..c05e3967f53 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,4 +1,3 @@ -DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d DIST util-linux-2.32.1.tar.xz 4561088 BLAKE2B 9e89b7fa2eacd51ad8c5cf90cc78df73de5d414c1039bb38784a376841806c1e0d38b702d29c6a8e91a2c3464fec1edcf68caaaa655400db2e5be483eb5efbcf SHA512 267fedae24a874ee4dc558081f6b8d07b33b955b0635f3348f021c111c17f2e95c01b2cbf909fe13c6ca448cbcf23c658c75f72f25749aa65e99f68fabb94698 DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482 DIST util-linux-2.33-rc1.tar.xz 4619236 BLAKE2B cee133c9d17fd86c5750d3a53e86d0beae2a53db7cf56b7602a7d497d5d615a85ed21ec8349b4a30b5d5dce3e29b3ac421e969b2a9230efca89ed8260f120352 SHA512 7a9de1a60854892f8b3215964a1a934d1fbcce92e159e542977094cbf12e156f37954764cf955e911f28411b8996ac1496c471d560d534204f9b6970dd605684 diff --git a/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch b/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch deleted file mode 100644 index 1317c56f89e..00000000000 --- a/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 75f03badd7ed9f1dd951863d75e756883d3acc55 Mon Sep 17 00:00:00 2001 -From: Karel Zak <[email protected]> -Date: Thu, 16 Nov 2017 16:27:32 +0100 -Subject: [PATCH] bash-completion: (umount) use findmnt, escape a space in - paths - - # mount /dev/sdc1 /mnt/test/foo\ bar - # umount <tab> - -has to return "/mnt/test/foo\ bar". - -Changes: - - * don't use mount | awk output, we have findmnt - * force compgen use \n as entries separator - -Addresses: https://github.com/karelzak/util-linux/issues/539 -Signed-off-by: Karel Zak <[email protected]> ---- - bash-completion/umount | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/bash-completion/umount b/bash-completion/umount -index d76cb9fff..98c90d61a 100644 ---- a/bash-completion/umount -+++ b/bash-completion/umount -@@ -40,9 +40,10 @@ _umount_module() - return 0 - ;; - esac -- local DEVS_MPOINTS -- DEVS_MPOINTS="$(mount | awk '{print $1, $3}')" -- COMPREPLY=( $(compgen -W "$DEVS_MPOINTS" -- $cur) ) -- return 0 -+ -+ local oldifs=$IFS -+ IFS=$'\n' -+ COMPREPLY=( $( compgen -W '$(findmnt -lno TARGET | sed "s/\([[:blank:]]\)/\\\\\1/g")' -- "$cur" ) ) -+ IFS=$oldifs - } - complete -F _umount_module umount diff --git a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild deleted file mode 100644 index dae5303c3ee..00000000000 --- a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pam python-single-r1 multilib-minimal multiprocessing systemd - -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"; - -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode" - -# Most lib deps here are related to programs rather than our libs, -# so we rarely need to specify ${MULTILIB_USEDEP}. -RDEPEND="caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib ) - ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" -RDEPEND+=" - kill? ( - !sys-apps/coreutils[kill] - !sys-process/procps[kill] - ) - !sys-process/schedutils - !sys-apps/setarch - !<sys-apps/sysvinit-2.88-r7 - !<sys-libs/e2fsprogs-libs-1.41.8 - !<sys-fs/e2fsprogs-1.41.8 - !<app-shells/bash-completion-2.3-r2 - !<sys-apps/s390-tools-1.36.1-r1" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-2.32_rc2-umount_completion.patch" #649812 -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - # Prevent uuidd test failure due to socket path limit. #593304 - sed -i \ - -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ - tests/ts/uuid/uuidd || die "Failed to fix uuidd test" - - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - fi - - # Undo bad ncurses handling by upstream. #601530 - sed -i -E \ - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \ - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \ - configure || die - - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include <fcntl.h> - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - -multilib_src_configure() { - lfs_fallocate_test - # The scanf test in a run-time test which fails while cross-compiling. - # Blindly assume a POSIX setup since we require libmount, and libmount - # itself fails when the scanf test fails. #531856 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - - local myeconfargs=( - --disable-chfn-chsh - --disable-login - --disable-nologin - --disable-reset - --disable-su - --docdir='${datarootdir}'/doc/${PF} - --enable-agetty - --enable-bash-completion - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - --enable-line - --enable-partx - --enable-raw - --enable-rename - --enable-schedutils - --with-bashcompletiondir="$(get_bashcompdir)" - --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no") - $(multilib_native_use_enable caps setpriv) - $(multilib_native_use_enable cramfs) - $(multilib_native_use_enable fdformat) - $(multilib_native_use_enable nls) - $(multilib_native_use_enable suid makeinstall-chown) - $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_enable tty-helpers mesg) - $(multilib_native_use_enable tty-helpers wall) - $(multilib_native_use_enable tty-helpers write) - $(multilib_native_use_with python) - $(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 unicode ncursesw)" '--without-ncursesw') - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') - $(tc-has-tls || echo --disable-tls) - $(use_enable unicode widechar) - $(use_enable kill) - $(use_enable static-libs static) - $(use_with selinux) - $(usex ncurses '' '--without-tinfo') - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - # build libraries only - emake -f Makefile -f - mylibs \ - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ - install-pkgconfigDATA install-uuidincHEADERS \ - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ - install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS - fi - - if multilib_is_native_abi; then - # need the libs in / - gen_usr_ldscript -a blkid mount smartcols uuid - - use python && python_optimize - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didnt install .la files, and .pc work fine - find "${ED}" -name "*.la" -delete || die - - if use pam; then - newpamd "${FILESDIR}/runuser.pamd" runuser - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l - fi -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} diff --git a/sys-apps/util-linux/util-linux-2.32-r5.ebuild b/sys-apps/util-linux/util-linux-2.32-r5.ebuild deleted file mode 100644 index 9c2f9a602d9..00000000000 --- a/sys-apps/util-linux/util-linux-2.32-r5.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pam python-single-r1 multilib-minimal multiprocessing systemd - -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"; -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"; - -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU" - -# Most lib deps here are related to programs rather than our libs, -# so we rarely need to specify ${MULTILIB_USEDEP}. -RDEPEND="caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib:= ) - ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) - nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" -RDEPEND+=" - kill? ( - !sys-apps/coreutils[kill] - !sys-process/procps[kill] - ) - !net-wireless/rfkill - !sys-process/schedutils - !sys-apps/setarch - !<sys-apps/sysvinit-2.88-r7 - !<sys-libs/e2fsprogs-libs-1.41.8 - !<sys-fs/e2fsprogs-1.41.8 - !<app-shells/bash-completion-2.7-r1" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/util-linux-2.32-python3-tests.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - eapply "${FILESDIR}"/${P}-add-missing-lintl.patch - touch -r "${S}"/configure "${S}"/libsmartcols/src/Makemodule.am || die - touch -r "${S}"/configure "${S}"/libuuid/src/Makemodule.am || die - - # Prevent uuidd test failure due to socket path limit. #593304 - sed -i \ - -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ - tests/ts/uuid/uuidd || die "Failed to fix uuidd test" - - if ! use userland_GNU; then - # test runner is using GNU-specific xargs call - sed -i -e 's:xargs:gxargs:' tests/run.sh || die - # test requires util-linux uuidgen (which we don't build) - rm tests/ts/uuid/oids || die - fi - - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - fi - - # Undo bad ncurses handling by upstream. #601530 - sed -i -E \ - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \ - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \ - configure || die - - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include <fcntl.h> - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - -multilib_src_configure() { - lfs_fallocate_test - # The scanf test in a run-time test which fails while cross-compiling. - # Blindly assume a POSIX setup since we require libmount, and libmount - # itself fails when the scanf test fails. #531856 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - - local myeconfargs=( - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - --with-bashcompletiondir="$(get_bashcompdir)" - $(multilib_native_use_enable suid makeinstall-chown) - $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_with python) - $(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 unicode ncursesw)" '--without-ncursesw') - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') - $(tc-has-tls || echo --disable-tls) - $(use_enable nls) - $(use_enable unicode widechar) - $(use_enable static-libs static) - $(use_with selinux) - $(usex ncurses '' '--without-tinfo') - ) - # build programs only on GNU, on *BSD we want libraries only - if multilib_is_native_abi && use userland_GNU; then - myeconfargs+=( - --disable-chfn-chsh - --disable-login - --disable-nologin - --disable-su - --enable-agetty - --enable-bash-completion - --enable-line - --enable-partx - --enable-raw - --enable-rename - --enable-rfkill - --enable-schedutils - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable caps setpriv) - $(use_enable cramfs) - $(use_enable fdformat) - $(use_enable tty-helpers mesg) - $(use_enable tty-helpers wall) - $(use_enable tty-helpers write) - $(use_enable kill) - ) - else - myeconfargs+=( - --disable-all-programs - --disable-bash-completion - --without-systemdsystemunitdir - # build libraries - --enable-libuuid - --enable-libblkid - --enable-libsmartcols - --enable-libfdisk - ) - if use userland_GNU; then - # those libraries don't work on *BSD - myeconfargs+=( - --enable-libmount - ) - fi - fi - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use userland_GNU; then - # need the libs in / - gen_usr_ldscript -a blkid fdisk mount smartcols uuid - - use python && python_optimize - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didnt install .la files, and .pc work fine - find "${ED}" -name "*.la" -delete || die - - if ! use userland_GNU; then - # manpage collisions - # TODO: figure out a good way to keep them - rm "${ED%/}"/usr/share/man/man3/uuid* || die - fi - - if use pam; then - newpamd "${FILESDIR}/runuser.pamd" runuser - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l - fi - - # Note: - # Bash completion for "runuser" command is provided by same file which - # would also provide bash completion for "su" command. However, we don't - # use "su" command from this package. - # This triggers a known QA warning which we ignore for now to magically - # keep bash completion for "su" command which shadow package does not - # provide. -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -}
