diff options
| author |   David Seifert <soap@gentoo.org> | 2022-01-06 10:06:48 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2022-01-06 10:06:48 +0100 |
| commit | 124ed6bfb14dab3f763ad7e07f94104d143910a0 (patch) | |
| tree | 5fec9d6316a902b002461904102f85fed3c60f8b /app-arch | |
| parent | app-containers/containerd: drop 1.5.7 (diff) | |
| download | gentoo-124ed6bfb14dab3f763ad7e07f94104d143910a0.tar.gz gentoo-124ed6bfb14dab3f763ad7e07f94104d143910a0.tar.bz2 gentoo-124ed6bfb14dab3f763ad7e07f94104d143910a0.zip | |
app-arch/tar: remove userland_GNU
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/tar/tar-1.34.ebuild | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/app-arch/tar/tar-1.34.ebuild b/app-arch/tar/tar-1.34.ebuild index efbb004e37fe..b92c607064a9 100644 --- a/app-arch/tar/tar-1.34.ebuild +++ b/app-arch/tar/tar-1.34.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-3+" SLOT="0" [[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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" -IUSE="acl minimal nls selinux userland_GNU xattr" +IUSE="acl minimal nls selinux xattr" RDEPEND=" acl? ( virtual/acl ) @@ -25,23 +25,11 @@ BDEPEND=" nls? ( sys-devel/gettext ) " -src_prepare() { - default - - if ! use userland_GNU ; then - sed -i \ - -e 's:/backup\.sh:/gbackup.sh:' \ - scripts/{backup,dump-remind,restore}.in \ - || die "sed non-GNU" - fi -} - src_configure() { local myeconfargs=( --bindir="${EPREFIX}"/bin --enable-backup-scripts --libexecdir="${EPREFIX}"/usr/sbin - $(usex userland_GNU "" "--program-prefix=g") $(use_with acl posix-acls) $(use_enable nls) $(use_with selinux) @@ -53,12 +41,9 @@ src_configure() { src_install() { default - local p=$(usex userland_GNU "" "g") - if [[ -z ${p} ]] ; then - # a nasty yet required piece of baggage - exeinto /etc - doexe "${FILESDIR}"/rmt - fi + # a nasty yet required piece of baggage + exeinto /etc + doexe "${FILESDIR}"/rmt # autoconf looks for gtar before tar (in configure scripts), hence # in Prefix it is important that it is there, otherwise, a gtar from @@ -68,12 +53,12 @@ src_install() { dosym tar /bin/gtar fi - mv "${ED}"/usr/sbin/${p}backup{,-tar} || die - mv "${ED}"/usr/sbin/${p}restore{,-tar} || die + mv "${ED}"/usr/sbin/backup{,-tar} || die + mv "${ED}"/usr/sbin/restore{,-tar} || die if use minimal ; then find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ - -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ + -type f -a '!' '(' -name tar -o -name tar ')' \ -delete || die fi } |