diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-04-23 19:31:51 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-04-23 19:31:51 +0000 |
commit | 1d399d555b57b004c6075dd416ac1d732374f16a (patch) | |
tree | 43e6b0397a73126f2a9fe8d7e48baaa0a27184a5 | |
parent | 2023-04-23 19:16:55 UTC (diff) | |
parent | acct-user.eclass: add ~arm64-macos to KEYWORDS (diff) | |
download | gentoo-1d399d555b57b004c6075dd416ac1d732374f16a.tar.gz gentoo-1d399d555b57b004c6075dd416ac1d732374f16a.tar.bz2 gentoo-1d399d555b57b004c6075dd416ac1d732374f16a.zip |
Merge updates from master
-rw-r--r-- | app-arch/tar/tar-1.34-r2.ebuild | 7 | ||||
-rw-r--r-- | app-arch/tar/tar-1.34-r3.ebuild | 7 | ||||
-rw-r--r-- | app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild | 2 | ||||
-rw-r--r-- | eclass/acct-group.eclass | 2 | ||||
-rw-r--r-- | eclass/acct-user.eclass | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/app-arch/tar/tar-1.34-r2.ebuild b/app-arch/tar/tar-1.34-r2.ebuild index 86fdc8e05e20..805941b1f61c 100644 --- a/app-arch/tar/tar-1.34-r2.ebuild +++ b/app-arch/tar/tar-1.34-r2.ebuild @@ -90,6 +90,13 @@ pkg_postinst() { # ensure to preserve the symlink before app-alternatives/tar # is installed if [[ ! -h ${EROOT}/bin/tar ]]; then + if [[ -e ${EROOT}/usr/bin/tar ]] ; then + # bug #904887 + ewarn "${EROOT}/usr/bin/tar exists but is not a symlink." + ewarn "This is expected during Prefix bootstrap and unsual otherwise." + ewarn "Moving away unexpected ${EROOT}/usr/bin/tar to .bak." + mv "${EROOT}/usr/bin/tar" "${EROOT}/usr/bin/tar.bak" || die + fi ln -s gtar "${EROOT}/bin/tar" || die fi } diff --git a/app-arch/tar/tar-1.34-r3.ebuild b/app-arch/tar/tar-1.34-r3.ebuild index f92891dceff1..da958a84470e 100644 --- a/app-arch/tar/tar-1.34-r3.ebuild +++ b/app-arch/tar/tar-1.34-r3.ebuild @@ -94,6 +94,13 @@ pkg_postinst() { # ensure to preserve the symlink before app-alternatives/tar # is installed if [[ ! -h ${EROOT}/bin/tar ]]; then + if [[ -e ${EROOT}/usr/bin/tar ]] ; then + # bug #904887 + ewarn "${EROOT}/usr/bin/tar exists but is not a symlink." + ewarn "This is expected during Prefix bootstrap and unsual otherwise." + ewarn "Moving away unexpected ${EROOT}/usr/bin/tar to .bak." + mv "${EROOT}/usr/bin/tar" "${EROOT}/usr/bin/tar.bak" || die + fi ln -s gtar "${EROOT}/bin/tar" || die fi } diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild index e2a95f02b83e..fec0fa4938b6 100644 --- a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild +++ b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild @@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/mgorny/eselect-lib-bin-symlink.git" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~arm64-macos" +KEYWORDS="" IUSE="" RDEPEND="app-admin/eselect" diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass index 6e67e072e34b..3d4520a5dfd0 100644 --- a/eclass/acct-group.eclass +++ b/eclass/acct-group.eclass @@ -78,7 +78,7 @@ readonly ACCT_GROUP_NAME # << Boilerplate ebuild variables >> : "${DESCRIPTION:="System group: ${ACCT_GROUP_NAME}"}" : "${SLOT:=0}" -: "${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris}" +: "${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris}" S=${WORKDIR} diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass index cf9b3191660b..40bd39799797 100644 --- a/eclass/acct-user.eclass +++ b/eclass/acct-user.eclass @@ -144,7 +144,7 @@ readonly ACCT_USER_NAME # << Boilerplate ebuild variables >> : "${DESCRIPTION:="System user: ${ACCT_USER_NAME}"}" : "${SLOT:=0}" -: "${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris}" +: "${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris}" S=${WORKDIR} |