[gentoo-commits] repo/gentoo:master commit in: app-arch/tar/

[Sam James]

commit:     d1d2f9c32ada1cfb0c2f4d77a60427684989c7f6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 14:25:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 15:50:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d2f9c3

app-arch/tar: Use --program-prefix=g to avoid mv

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/28044
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/tar/tar-1.34-r1.ebuild | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-arch/tar/tar-1.34-r1.ebuild b/app-arch/tar/tar-1.34-r1.ebuild
index d197850acc05..35df40e4465b 100644
--- a/app-arch/tar/tar-1.34-r1.ebuild
+++ b/app-arch/tar/tar-1.34-r1.ebuild
@@ -43,6 +43,12 @@ src_configure() {
 		$(use_enable nls)
 		$(use_with selinux)
 		$(use_with xattr xattrs)
+
+		# autoconf looks for gtar before tar (in configure scripts), hence
+		# in Prefix it is important that it is there, otherwise, a gtar from
+		# the host system (FreeBSD, Solaris, Darwin) will be found instead
+		# of the Prefix provided (GNU) tar
+		--program-prefix=g
 	)
 
 	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
@@ -55,30 +61,24 @@ src_install() {
 	exeinto /etc
 	doexe "${FILESDIR}"/rmt
 
-	mv "${ED}"/usr/sbin/backup{,-tar} || die
-	mv "${ED}"/usr/sbin/restore{,-tar} || die
+	mv "${ED}"/usr/sbin/{gbackup,backup-tar} || die
+	mv "${ED}"/usr/sbin/{grestore,restore-tar} || die
+	mv "${ED}"/usr/sbin/{g,}backup.sh || die
+	mv "${ED}"/usr/sbin/{g,}dump-remind || die
 
 	if use minimal ; then
 		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
-			-type f -a '!' '(' -name tar -o -name tar ')' \
+			-type f -a '!' -name gtar \
 			-delete || die
 	fi
 
-	# autoconf looks for gtar before tar (in configure scripts), hence
-	# in Prefix it is important that it is there, otherwise, a gtar from
-	# the host system (FreeBSD, Solaris, Darwin) will be found instead
-	# of the Prefix provided (GNU) tar
-	# rename tar to gtar, and make tar a symlink
-	mv "${ED}"/bin/{,g}tar || die
+	# make tar a symlink
 	dosym gtar /bin/tar
 
 	if ! use minimal; then
-		mv "${ED}"/usr/sbin/{,g}rmt || die
 		dosym grmt /usr/sbin/rmt
 	fi
 
-	mv "${ED}"/usr/share/man/man1/{,g}tar.1 || die
 	dosym gtar.1 /usr/share/man/man1/tar.1
-	mv "${ED}"/usr/share/man/man8/{,g}rmt.8 || die
 	dosym grmt.8 /usr/share/man/man8/rmt.8
 }