From 9816b3d831a9e3ed744865fdd139a138a7ce904e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 5 Feb 2020 20:37:58 +0100
Subject: [PATCH] bsdtar, tar: remove tar alternative

Alternative for tar was introduced to make switch from gnu tar to bsdtar in base-devel easier.

However, bsdtar has different interface than gnu tar, and with alternatives using gnu tar as tar is actually harder when it is needed.

There are also many user-used scripts assuming gnu tar, which are broken now. They should not be affected because of internal matters of packaging.
---
 srcpkgs/libarchive/template | 3 +--
 srcpkgs/tar/template        | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 87179ac18a2..fc56b27183c 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.4.1
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -28,7 +28,6 @@ post_install() {
 }
 
 bsdtar_package() {
-	alternatives="tar:tar:/usr/bin/bsdtar"
 	replaces="bsdcpio>=0"
 	short_desc="BSD utilities using libarchive"
 	pkg_install() {
diff --git a/srcpkgs/tar/template b/srcpkgs/tar/template
index d730ea8e101..08ad615bc0c 100644
--- a/srcpkgs/tar/template
+++ b/srcpkgs/tar/template
@@ -1,9 +1,9 @@
 # Template file for 'tar'
 pkgname=tar
 version=1.32
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--program-prefix=g gl_cv_struct_dirent_d_ino=yes"
+configure_args="gl_cv_struct_dirent_d_ino=yes"
 makedepends="acl-devel"
 short_desc="GNU tape archiver with remote magnetic tape support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,8 +12,6 @@ homepage="https://www.gnu.org/software/tar/"
 distfiles="${GNU_SITE}/tar/${pkgname}-${version}.tar.xz"
 checksum=d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8
 
-alternatives="tar:tar:/usr/bin/gtar"
-
 pre_configure() {
 	# chroot-style=ethereal
 	export FORCE_UNSAFE_CONFIGURE=1