mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-08 10:52:03 +01:00
Merge pull request #196 from aniruddha2000/aniruddha2000/update-tar-1.34
Update tar to 1.34
This commit is contained in:
commit
1bfc04fbe1
@ -1,2 +1 @@
|
|||||||
DIST tar-1.32.90.tar.xz 2145976 BLAKE2B 95f1442da87bcbd58e0a6aad303b8c9da9179cc32a6e835d3fbe2e090ad4316e96265a54f573906b262034b92d8d3e56f3ff2609145249bd16dd4ea2a79bb601 SHA512 a42703b73ec3c1f462849469f00dd190a0164972fd2e97f128c3b559a6e9c79e87d5bbf47fca17ca9f8b6810221fbc727b6c15e38693256d9e43a2c2a2d7b593
|
DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
|
||||||
DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
|
|
||||||
|
|||||||
@ -1,79 +0,0 @@
|
|||||||
# Copyright 1999-2020 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
inherit flag-o-matic
|
|
||||||
|
|
||||||
DESCRIPTION="Use this to make tarballs :)"
|
|
||||||
HOMEPAGE="https://www.gnu.org/software/tar/"
|
|
||||||
SRC_URI="mirror://gnu/tar/${P}.tar.bz2
|
|
||||||
mirror://gnu-alpha/tar/${P}.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="GPL-3+"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
|
||||||
IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
|
|
||||||
|
|
||||||
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
|
|
||||||
|
|
||||||
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
|
||||||
selinux? ( sys-libs/libselinux )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
nls? ( >=sys-devel/gettext-0.10.35 )
|
|
||||||
static? ( ${LIB_DEPEND} )
|
|
||||||
xattr? ( elibc_glibc? ( sys-apps/attr ) )"
|
|
||||||
|
|
||||||
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() {
|
|
||||||
use static && append-ldflags -static
|
|
||||||
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)
|
|
||||||
$(use_with xattr xattrs)
|
|
||||||
)
|
|
||||||
FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
# 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
|
|
||||||
if use prefix ; then
|
|
||||||
dosym tar /bin/gtar
|
|
||||||
fi
|
|
||||||
|
|
||||||
mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die
|
|
||||||
mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die
|
|
||||||
|
|
||||||
if use minimal ; then
|
|
||||||
find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \
|
|
||||||
-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
|
|
||||||
-delete || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
@ -1,29 +1,29 @@
|
|||||||
# Copyright 1999-2020 Gentoo Authors
|
# Copyright 1999-2021 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
|
||||||
inherit flag-o-matic
|
|
||||||
|
|
||||||
DESCRIPTION="Use this to make tarballs :)"
|
DESCRIPTION="Use this to make tarballs :)"
|
||||||
HOMEPAGE="https://www.gnu.org/software/tar/"
|
HOMEPAGE="https://www.gnu.org/software/tar/"
|
||||||
SRC_URI="mirror://gnu/tar/${P}.tar.xz
|
SRC_URI="mirror://gnu/tar/${P}.tar.xz
|
||||||
mirror://gnu-alpha/tar/${P}.tar.xz"
|
https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
|
||||||
|
|
||||||
LICENSE="GPL-3+"
|
LICENSE="GPL-3+"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
[[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
|
[[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
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 elibc_glibc minimal nls selinux static userland_GNU xattr"
|
IUSE="acl elibc_glibc minimal nls selinux userland_GNU xattr"
|
||||||
|
|
||||||
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
|
RDEPEND="
|
||||||
|
acl? ( virtual/acl )
|
||||||
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
selinux? ( sys-libs/libselinux )
|
||||||
selinux? ( sys-libs/libselinux )"
|
"
|
||||||
DEPEND="${RDEPEND}
|
DEPEND="${RDEPEND}
|
||||||
static? ( ${LIB_DEPEND} )
|
xattr? ( elibc_glibc? ( sys-apps/attr ) )
|
||||||
xattr? ( elibc_glibc? ( sys-apps/attr ) )"
|
"
|
||||||
BDEPEND="nls? ( sys-devel/gettext )"
|
BDEPEND="
|
||||||
|
nls? ( sys-devel/gettext )
|
||||||
|
"
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
default
|
default
|
||||||
@ -37,7 +37,6 @@ src_prepare() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
use static && append-ldflags -static
|
|
||||||
local myeconfargs=(
|
local myeconfargs=(
|
||||||
--bindir="${EPREFIX}"/bin
|
--bindir="${EPREFIX}"/bin
|
||||||
--enable-backup-scripts
|
--enable-backup-scripts
|
||||||
Loading…
x
Reference in New Issue
Block a user