From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99667138334 for ; Tue, 3 Sep 2019 17:30:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2360E0814; Tue, 3 Sep 2019 17:30:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CAB88E0814 for ; Tue, 3 Sep 2019 17:30:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8919134AB40 for ; Tue, 3 Sep 2019 17:30:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F150622 for ; Tue, 3 Sep 2019 17:30:29 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1567531800.d293f1e8299f80a409a548978b99dc8b9b394853.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/coreutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/coreutils/coreutils-8.31-r1.ebuild X-VCS-Directories: sys-apps/coreutils/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: d293f1e8299f80a409a548978b99dc8b9b394853 X-VCS-Branch: master Date: Tue, 3 Sep 2019 17:30:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e1eab1cb-7fbb-4ea6-8253-da68727f161e X-Archives-Hash: d4c83499362d09842233644c43aede26 commit: d293f1e8299f80a409a548978b99dc8b9b394853 Author: William Hubbs sony com> AuthorDate: Tue Sep 3 17:26:21 2019 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Sep 3 17:30:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d293f1e8 sys-apps/coreutils: Remove bsd support This should have been removed along with the *bsd keywords Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: William Hubbs gentoo.org> sys-apps/coreutils/coreutils-8.31-r1.ebuild | 64 +++++++++++++---------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild index 868fdbb8a50..4b4527d1514 100644 --- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild +++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild @@ -17,12 +17,12 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux" -IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr" +IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr" LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) - xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )" + xattr? ( sys-apps/attr[static-libs] )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )" @@ -32,9 +32,7 @@ DEPEND="${RDEPEND} test? ( dev-lang/perl dev-perl/Expect - !userland_BSD? ( - dev-util/strace - ) + dev-util/strace ${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]') )" @@ -104,7 +102,6 @@ src_configure() { export gl_cv_func_mknod_works=yes #409919 use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821 use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782 - use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ ) # kill/uptime - procps # groups/su - shadow # hostname - net-tools @@ -156,37 +153,32 @@ src_install() { insinto /etc newins src/dircolors.hin DIR_COLORS - if [[ ${USERLAND} == "GNU" ]] ; then - if use split-usr ; then - cd "${ED%/}"/usr/bin || die - dodir /bin - # move critical binaries into /bin (required by FHS) - local fhs="cat chgrp chmod chown cp date dd df echo false ln ls - mkdir mknod mv pwd rm rmdir stty sync true uname" - mv ${fhs} ../../bin/ || die "could not move fhs bins" - if use hostname; then - mv hostname ../../bin/ || die - fi - if use kill; then - mv kill ../../bin/ || die - fi - # move critical binaries into /bin (common scripts) - # Why are these required for booting? - local com="basename chroot cut dir dirname du env expr head mkfifo - mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" - mv ${com} ../../bin/ || die "could not move common bins" - # create a symlink for uname in /usr/bin/ since autotools require it - # Other than uname, we need to figure out why we are - # creating symlinks for these in /usr/bin instead of leaving - # the files there in the first place. - local x - for x in ${com} uname ; do - dosym ../../bin/${x} /usr/bin/${x} - done + if use split-usr ; then + cd "${ED%/}"/usr/bin || die + dodir /bin + # move critical binaries into /bin (required by FHS) + local fhs="cat chgrp chmod chown cp date dd df echo false ln ls + mkdir mknod mv pwd rm rmdir stty sync true uname" + mv ${fhs} ../../bin/ || die "could not move fhs bins" + if use hostname; then + mv hostname ../../bin/ || die fi - else - # For now, drop the man pages, collides with the ones of the system. - rm -rf "${ED%/}"/usr/share/man + if use kill; then + mv kill ../../bin/ || die + fi + # move critical binaries into /bin (common scripts) + # Why are these required for booting? + local com="basename chroot cut dir dirname du env expr head mkfifo + mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" + mv ${com} ../../bin/ || die "could not move common bins" + # create a symlink for uname in /usr/bin/ since autotools require it + # Other than uname, we need to figure out why we are + # creating symlinks for these in /usr/bin instead of leaving + # the files there in the first place. + local x + for x in ${com} uname ; do + dosym ../../bin/${x} /usr/bin/${x} + done fi }