| 1 |
commit: d293f1e8299f80a409a548978b99dc8b9b394853 |
| 2 |
Author: William Hubbs <william.hubbs <AT> sony <DOT> com> |
| 3 |
AuthorDate: Tue Sep 3 17:26:21 2019 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 3 17:30:00 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d293f1e8 |
| 7 |
|
| 8 |
sys-apps/coreutils: Remove bsd support |
| 9 |
|
| 10 |
This should have been removed along with the *bsd keywords |
| 11 |
|
| 12 |
Copyright: Sony Interactive Entertainment Inc. |
| 13 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 14 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-apps/coreutils/coreutils-8.31-r1.ebuild | 64 +++++++++++++---------------- |
| 17 |
1 file changed, 28 insertions(+), 36 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild |
| 20 |
index 868fdbb8a50..4b4527d1514 100644 |
| 21 |
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild |
| 22 |
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild |
| 23 |
@@ -17,12 +17,12 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz |
| 24 |
LICENSE="GPL-3" |
| 25 |
SLOT="0" |
| 26 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux" |
| 27 |
-IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr" |
| 28 |
+IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr" |
| 29 |
|
| 30 |
LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) |
| 31 |
caps? ( sys-libs/libcap ) |
| 32 |
gmp? ( dev-libs/gmp:=[static-libs] ) |
| 33 |
- xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )" |
| 34 |
+ xattr? ( sys-apps/attr[static-libs] )" |
| 35 |
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) |
| 36 |
selinux? ( sys-libs/libselinux ) |
| 37 |
nls? ( virtual/libintl )" |
| 38 |
@@ -32,9 +32,7 @@ DEPEND="${RDEPEND} |
| 39 |
test? ( |
| 40 |
dev-lang/perl |
| 41 |
dev-perl/Expect |
| 42 |
- !userland_BSD? ( |
| 43 |
- dev-util/strace |
| 44 |
- ) |
| 45 |
+ dev-util/strace |
| 46 |
${PYTHON_DEPS} |
| 47 |
$(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]') |
| 48 |
)" |
| 49 |
@@ -104,7 +102,6 @@ src_configure() { |
| 50 |
export gl_cv_func_mknod_works=yes #409919 |
| 51 |
use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821 |
| 52 |
use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782 |
| 53 |
- use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ ) |
| 54 |
# kill/uptime - procps |
| 55 |
# groups/su - shadow |
| 56 |
# hostname - net-tools |
| 57 |
@@ -156,37 +153,32 @@ src_install() { |
| 58 |
insinto /etc |
| 59 |
newins src/dircolors.hin DIR_COLORS |
| 60 |
|
| 61 |
- if [[ ${USERLAND} == "GNU" ]] ; then |
| 62 |
- if use split-usr ; then |
| 63 |
- cd "${ED%/}"/usr/bin || die |
| 64 |
- dodir /bin |
| 65 |
- # move critical binaries into /bin (required by FHS) |
| 66 |
- local fhs="cat chgrp chmod chown cp date dd df echo false ln ls |
| 67 |
- mkdir mknod mv pwd rm rmdir stty sync true uname" |
| 68 |
- mv ${fhs} ../../bin/ || die "could not move fhs bins" |
| 69 |
- if use hostname; then |
| 70 |
- mv hostname ../../bin/ || die |
| 71 |
- fi |
| 72 |
- if use kill; then |
| 73 |
- mv kill ../../bin/ || die |
| 74 |
- fi |
| 75 |
- # move critical binaries into /bin (common scripts) |
| 76 |
- # Why are these required for booting? |
| 77 |
- local com="basename chroot cut dir dirname du env expr head mkfifo |
| 78 |
- mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" |
| 79 |
- mv ${com} ../../bin/ || die "could not move common bins" |
| 80 |
- # create a symlink for uname in /usr/bin/ since autotools require it |
| 81 |
- # Other than uname, we need to figure out why we are |
| 82 |
- # creating symlinks for these in /usr/bin instead of leaving |
| 83 |
- # the files there in the first place. |
| 84 |
- local x |
| 85 |
- for x in ${com} uname ; do |
| 86 |
- dosym ../../bin/${x} /usr/bin/${x} |
| 87 |
- done |
| 88 |
+ if use split-usr ; then |
| 89 |
+ cd "${ED%/}"/usr/bin || die |
| 90 |
+ dodir /bin |
| 91 |
+ # move critical binaries into /bin (required by FHS) |
| 92 |
+ local fhs="cat chgrp chmod chown cp date dd df echo false ln ls |
| 93 |
+ mkdir mknod mv pwd rm rmdir stty sync true uname" |
| 94 |
+ mv ${fhs} ../../bin/ || die "could not move fhs bins" |
| 95 |
+ if use hostname; then |
| 96 |
+ mv hostname ../../bin/ || die |
| 97 |
fi |
| 98 |
- else |
| 99 |
- # For now, drop the man pages, collides with the ones of the system. |
| 100 |
- rm -rf "${ED%/}"/usr/share/man |
| 101 |
+ if use kill; then |
| 102 |
+ mv kill ../../bin/ || die |
| 103 |
+ fi |
| 104 |
+ # move critical binaries into /bin (common scripts) |
| 105 |
+ # Why are these required for booting? |
| 106 |
+ local com="basename chroot cut dir dirname du env expr head mkfifo |
| 107 |
+ mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" |
| 108 |
+ mv ${com} ../../bin/ || die "could not move common bins" |
| 109 |
+ # create a symlink for uname in /usr/bin/ since autotools require it |
| 110 |
+ # Other than uname, we need to figure out why we are |
| 111 |
+ # creating symlinks for these in /usr/bin instead of leaving |
| 112 |
+ # the files there in the first place. |
| 113 |
+ local x |
| 114 |
+ for x in ${com} uname ; do |
| 115 |
+ dosym ../../bin/${x} /usr/bin/${x} |
| 116 |
+ done |
| 117 |
fi |
| 118 |
} |
Archives