diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-18 15:11:02 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-18 15:11:02 +0000 |
| commit | 0fb71e0215ed52863e462cccef73c01aff44d43d (patch) | |
| tree | 428fc3fa92f9c69ed02878e9b6151a9fb810e651 /app-arch/tar | |
| parent | 9bd54251864651f49e673a08aec9ef79cfe08f04 (diff) | |
gentoo resync : 18.12.2017
Diffstat (limited to 'app-arch/tar')
| -rw-r--r-- | app-arch/tar/Manifest | 3 | ||||
| -rw-r--r-- | app-arch/tar/tar-1.30.ebuild (renamed from app-arch/tar/tar-1.29-r2.ebuild) | 36 |
2 files changed, 18 insertions, 21 deletions
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest index 6f9324fa6e37..8723b0b4f719 100644 --- a/app-arch/tar/Manifest +++ b/app-arch/tar/Manifest @@ -3,7 +3,8 @@ AUX tar-1.29-add-files.patch 6602 BLAKE2B ac4687bccd88e1fb3b2c565901815988b0ff0d AUX tar-1.29-extract-pathname-bypass-upstream.patch 1604 BLAKE2B 83364c5dee8d12b7cb67d8497666ec3082e0e209aeb4c84cc26292d43da0820bd14188f3003244a379cf5b6bdb5d3d7d566b42ec2c35d62f1d5713be7395e001 SHA512 c13046f8b0bcc435197c859006b1cfd12b79377f3b90edfd4b77f86ec6d3ca431c716d731be84884f0ec6d6129765cbfbccb5971d0b909c3f45aff8f0b9b45cb AUX tar-1.29-extract-pathname-bypass.patch 723 BLAKE2B c63c23dd1f256263cb4d1371e7a3eeccfe1da4aa74c13fd23f9bc1721b06e06d388eb99e1d9d17fb3344875be8b80e2a433f78360c89f6b2b7408302f346d0cc SHA512 ba06ae53b4effcdd0996be07ae03fae7237c579a82d2606fe25100bed447287a68e37282ba2b017eed0c26cb0f4bf77dcdb4fca2f5175e1bbaed91408b0bd54a DIST tar-1.29.tar.bz2 2715993 BLAKE2B 656b77a49c463ec7ade87a97b71469dadbf01551131bdf0cfa895b7b2a7d073a4cd51e9bec4169b134d83155aca18af1a89ddb5d14cb1dc0d9968184870d69f3 SHA512 d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b +DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85eaf041ec44a38bbd9bc82cc7184d5cb858f9905f503c9178ec6d0ed50be2dc27be9933b29e0a18b8e6c0b8f SHA512 07a1157430898fee1a2c6fd3853d59d4ae13998db685669c8c702f73d2466eeb9892f84a5f0495bfe088c8190a643a99ac9f2cb16b85c9fe3ae0d83cc0f338e8 EBUILD tar-1.29-r1.ebuild 2157 BLAKE2B 4a1e4e3cbbc34cf71f41b5ce9e1f7b8b65a9413fdc3e08bb97f09eb64a4f72b8952461fef59d7b6beca00350ea0b7718d2a4d99d3f9a8a830479d1e194f44641 SHA512 9445561ce892822feb1365f6a227143a3bea6767a19bacea08345057ac2fab80cd5035c81281b27161a443c5103e5432288e9b69ec0fe33218c587ccb9d20a4b -EBUILD tar-1.29-r2.ebuild 2189 BLAKE2B 8654b43f0a55945e58dc448bf14508bc41f1f008749239408a4055d7ad894a8ef4d5b87eead899c9e07a0793ece33b7583e4cc1fd3cb128225dfae0dc2fcbc28 SHA512 940b2a32fe1058e0a40feb016779927019b45bfa402f4e5a32f44110bd2fea67d08e4df842b9ec93c730a25eb6e6a7408ab01174919828827938875d2579db9c EBUILD tar-1.29-r3.ebuild 2237 BLAKE2B a39c564a7349cbe1585566baf6461ef10e3932206af0b7ec82b810050bcd0b756d471605aacc0bf8fd155e18c426a2ba201552b2d9702bd713fb4d4f6ccc8bc2 SHA512 3507c7519fccc100b8f0c12aedfb24ddc907e459a9a66d0cad417f085c05d3d6212654bdf9aabec3ef582f3a90a426c676c34dd7bbbefe79ed76b6f237cf8307 +EBUILD tar-1.30.ebuild 2113 BLAKE2B a4bd375da71e640b23c053badd9bcfc1024bdec8f4374e27a015670900918f643954725f85dea239bb32256b56cdfe96018eff34dc2030a3107474a8dee14c5d SHA512 a1202f7df456107c3c19d080e5daa6534700f7e849b8f78fb74a53495fa5cc7b8d951af31172de8340ce77e39ff7f136627e03d070459ba7f1b82ffc39de5078 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7 diff --git a/app-arch/tar/tar-1.29-r2.ebuild b/app-arch/tar/tar-1.30.ebuild index 722e7f9b5f0d..7a541404f34b 100644 --- a/app-arch/tar/tar-1.29-r2.ebuild +++ b/app-arch/tar/tar-1.30.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 -inherit flag-o-matic eutils +inherit flag-o-matic DESCRIPTION="Use this to make tarballs :)" HOMEPAGE="https://www.gnu.org/software/tar/" @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2 LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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" RDEPEND="acl? ( virtual/acl ) @@ -21,13 +21,8 @@ DEPEND="${RDEPEND} nls? ( >=sys-devel/gettext-0.10.35 ) xattr? ( elibc_glibc? ( sys-apps/attr ) )" -PATCHES=( - "${FILESDIR}/${P}-extract-pathname-bypass-upstream.patch" #598334 -) - src_prepare() { - epatch "${PATCHES[@]}" - epatch_user + default if ! use userland_GNU ; then sed -i \ @@ -39,16 +34,17 @@ src_prepare() { src_configure() { use static && append-ldflags -static - FORCE_UNSAFE_CONFIGURE=1 \ - econf \ - --enable-backup-scripts \ - --bindir="${EPREFIX}"/bin \ - --libexecdir="${EPREFIX}"/usr/sbin \ - $(usex userland_GNU "" "--program-prefix=g") \ - $(use_with acl posix-acls) \ - $(use_enable nls) \ - $(use_with selinux) \ + 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() { @@ -69,8 +65,8 @@ 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/${p}backup{,-tar} || die + mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die if use minimal ; then find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ |