summaryrefslogtreecommitdiff
path: root/app-arch
diff options
context:
space:
mode:
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/Manifest.gzbin17263 -> 17251 bytes
-rw-r--r--app-arch/tar/Manifest3
-rw-r--r--app-arch/tar/tar-1.30.ebuild (renamed from app-arch/tar/tar-1.29-r2.ebuild)36
-rw-r--r--app-arch/unrar/Manifest2
-rw-r--r--app-arch/unrar/unrar-5.5.8.ebuild2
-rw-r--r--app-arch/xz-utils/Manifest8
-rw-r--r--app-arch/xz-utils/metadata.xml5
-rw-r--r--app-arch/xz-utils/xz-utils-5.2.2.ebuild4
-rw-r--r--app-arch/xz-utils/xz-utils-5.2.3.ebuild34
-rw-r--r--app-arch/xz-utils/xz-utils-9999.ebuild34
10 files changed, 83 insertions, 45 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 5189a937061d..561a8276a495 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
Binary files differ
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/ \
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 0119aa5fed85..f5f0ddd8bc03 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,5 +1,5 @@
AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d03aa47f4c10f8d4c93689eac919aa68651bf20393fbadd94bb88439fddaa1448cf00153a2dbfb0468c938f1b1 SHA512 c6875ef2ed3f1cd5e8baae74fdc92c7c44c694169bfaa2b63af10eaacb52dd27ff12360ac6757a82499a0f14fb78cfa1bfbd8391435f95b125a81b2e776f28a0
AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
-EBUILD unrar-5.5.8.ebuild 1861 BLAKE2B 194fce94521026875ccc5fbe5b6c5a594f375a7f7d9708d42d3ee5530c385d72d1d29f020a88ca2ad314f641ce6c171d2dcdc227481b29fa36089efbc67efcfc SHA512 dacd50014b98f3698ced2edbc868b59908b6289114cfa0824f88d4190e36664d6e525e3ad677f2db29d3041aba01c54f2f39b9ddcc53b1e6f969a3f0ee8a8f14
+EBUILD unrar-5.5.8.ebuild 1860 BLAKE2B 05707ae5839ec56d2f6238a68fbd52749809e32484bb251a6691191507776996561ac0febf1efad0de6c16bdb82b67ae5f49517b55604953267b7fbae4f347eb SHA512 0f7e829f935d4ad1417b733e384bb9332e12397c18a458c0c456021ce7350862862ac39afa1857faefb013745b0ae823b8d624523f2e3c24d5d27278aa3e650d
MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.5.8.ebuild b/app-arch/unrar/unrar-5.5.8.ebuild
index 309bb4d4bcb1..870cc370fd97 100644
--- a/app-arch/unrar/unrar-5.5.8.ebuild
+++ b/app-arch/unrar/unrar-5.5.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="unRAR"
# subslot = soname version
SLOT="0/5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 7ee7a324cdbf..c413c172c9a4 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,6 +1,6 @@
DIST xz-5.2.2.tar.gz 1464228 BLAKE2B aea079d094ad23e305eb273c4b126816d36ec3b92e6d626bdf6cb6903bb49183c764b97a85eda52dfe5fb5ebc9bb87913a8caa0523a00acc2d2f4edf70b1418f SHA512 8d6249f93c5c43e1c8eeb21f93b22330fd54575e20bbb4af3d06721192d9f0ca3351878964c9640238ac410b7dd9f16329793c7be7355c7ca0db92c6db6ab813
DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078 SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6
-EBUILD xz-utils-5.2.2.ebuild 2097 BLAKE2B 3ecb6c0db1210b0fb246cfe39a43f7dcbc7a2b8961655d16ded35184d9acbc67442c2c7c8c554f2cb3e2d92404ffe0bad0fbfa8bb76353d4f5623ed50882afd1 SHA512 19a6df27b09c8911375424a287d138b15e6db3f3c51dcd3b95fc83b3cf2bcffbd8779622e3c398e7a7d623b83b87bb4a272b98976ec12a4248b2ab826bb25f60
-EBUILD xz-utils-5.2.3.ebuild 2111 BLAKE2B 9727e5e45e5265c69e6c1f2211f4bea175354ba59251eaa7bafe30635ec6d7fccaf025cc405061aa8fe7f200d466c157ff53fe028d71449fd80d069cb71d198f SHA512 6f8d099b820445cc5ae05cb62a8e582dc80f0dc9decbe448bedd85fd340ac35313e4d510b61cd1126bb2d95f4776a69e960572a604e29b05cd6736711e500efc
-EBUILD xz-utils-9999.ebuild 2108 BLAKE2B 29a572a22b9979fb25267e3cd857ec6c0c5426d98357e01d5022550e0ed9529c407a4e977a72653a2b5944436be7dfaba206c7133af61f6abb1a2a76c894604c SHA512 46dd4e4c6de3863c0ed400de486905e408eeb33a4d3b2a9155db68001342d89a3a80334b8916df65a90d5b8fdfa4b7ea1220d328a68e97d6f423b4c1af7e85ed
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD xz-utils-5.2.2.ebuild 2099 BLAKE2B 5ba3aa8d0f75b216aec28b9fdfde482f008a499ad83e7e77339d19b42fcb4746dc8ecbab40a8bcc90a47409fc5aed9f4fea94698336db1606e85a95f2eb27dfc SHA512 c08130f3f0a71af52f0307f29570112e33b657ca1ea81836d31b4a78bcee20afc02c0e456a0d011325c3f6ee34610aecb4f5de8f258517a9c9ebaa85d128b739
+EBUILD xz-utils-5.2.3.ebuild 2607 BLAKE2B 150f322fb1a07ff66f46e0839a3e9123be7feb048baaaa4efce4c099dac1e7729a302d9aef860e225c88b681dfff443a19d0ad96f17d9848d3b8b456adab6a3d SHA512 3a492a0b8f063e11fe88109f22d2635f6499076d6785ff01f9900add586ce9108d1367974dcb1f93bc65c47d8ce2eb8127e7e4b499430466e7d592dbe0be128e
+EBUILD xz-utils-9999.ebuild 2604 BLAKE2B e2bfd9bf478dc11c5b93aa17b81b5738175255239d1ec79193ba4e69d50cf9d0c1fbfde4a3256d601b651234d5a1baef91c15caa620820e93c58b2ef986a6e65 SHA512 a03a44c48ded24c0a00015d592714a903fd0fc244f67f0c7198e2dd140afee6a59b26ae4c71e3e9d55ddd7b003b954b8b8348fca47ae193aec58f550b8f9f012
+MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 56c124413057..fac09b73379a 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -5,4 +5,9 @@
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
+<use>
+ <flag name='extra-filters'>Build additional filters that are not
+ used in any of the default xz presets. This includes delta
+ and BCJ coders, additional match finders and SHA256 checks.</flag>
+</use>
</pkgmetadata>
diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
index 227aa3cf924f..738007c75cbf 100644
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
@@ -9,13 +9,13 @@ EAPI="4"
inherit eutils multilib toolchain-funcs libtool multilib-minimal
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+ EGIT_REPO_URI="https://git.tukaani.org/xz.git"
inherit git-2 autotools
SRC_URI=""
EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
else
MY_P="${PN/-utils}-${PV/_}"
- SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+ SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-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"
S=${WORKDIR}/${MY_P}
EXTRA_DEPEND=
diff --git a/app-arch/xz-utils/xz-utils-5.2.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
index b074679f0e09..219b2145b252 100644
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@@ -9,13 +9,13 @@ EAPI=5
inherit eutils multilib toolchain-funcs libtool multilib-minimal
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+ EGIT_REPO_URI="https://git.tukaani.org/xz.git"
inherit git-2 autotools
SRC_URI=""
EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
else
MY_P="${PN/-utils}-${PV/_}"
- SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+ SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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"
S=${WORKDIR}/${MY_P}
EXTRA_DEPEND=
@@ -27,7 +27,7 @@ HOMEPAGE="http://tukaani.org/xz/"
# See top-level COPYING file as it outlines the various pieces and their licenses.
LICENSE="public-domain LGPL-2.1+ GPL-2+"
SLOT="0"
-IUSE="elibc_FreeBSD nls static-libs +threads"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
RDEPEND="!<app-arch/lzma-4.63
!app-arch/lzma-utils
@@ -35,6 +35,9 @@ RDEPEND="!<app-arch/lzma-4.63
DEPEND="${RDEPEND}
${EXTRA_DEPEND}"
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
src_prepare() {
if [[ ${PV} == "9999" ]] ; then
eautopoint
@@ -45,12 +48,27 @@ src_prepare() {
}
multilib_src_configure() {
+ local myconf=(
+ $(use_enable nls)
+ $(use_enable threads)
+ $(use_enable static-libs static)
+ )
+ multilib_is_native_abi ||
+ myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+ if ! use extra-filters; then
+ myconf+=(
+ # LZMA1 + LZMA2 for standard .lzma & .xz files
+ --enable-encoders=lzma1,lzma2
+ --enable-decoders=lzma1,lzma2
+ # those are used by default, depending on preset
+ --enable-match-finders=hc3,hc4,bt4
+ # CRC64 is used by default, though some (old?) files use CRC32
+ --enable-checks=crc32,crc64
+ )
+ fi
+
use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
- ECONF_SOURCE="${S}" econf \
- $(use_enable nls) \
- $(use_enable threads) \
- $(use_enable static-libs static) \
- $(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
}
multilib_src_install() {
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index cf2f6076d65b..26f34b6536a2 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -9,13 +9,13 @@ EAPI=5
inherit eutils multilib toolchain-funcs libtool multilib-minimal
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+ EGIT_REPO_URI="https://git.tukaani.org/xz.git"
inherit git-2 autotools
SRC_URI=""
EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
else
MY_P="${PN/-utils}-${PV/_}"
- SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+ SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-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"
S=${WORKDIR}/${MY_P}
EXTRA_DEPEND=
@@ -27,7 +27,7 @@ HOMEPAGE="http://tukaani.org/xz/"
# See top-level COPYING file as it outlines the various pieces and their licenses.
LICENSE="public-domain LGPL-2.1+ GPL-2+"
SLOT="0"
-IUSE="elibc_FreeBSD nls static-libs +threads"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
RDEPEND="!<app-arch/lzma-4.63
!app-arch/lzma-utils
@@ -35,6 +35,9 @@ RDEPEND="!<app-arch/lzma-4.63
DEPEND="${RDEPEND}
${EXTRA_DEPEND}"
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
src_prepare() {
if [[ ${PV} == "9999" ]] ; then
eautopoint
@@ -45,12 +48,27 @@ src_prepare() {
}
multilib_src_configure() {
+ local myconf=(
+ $(use_enable nls)
+ $(use_enable threads)
+ $(use_enable static-libs static)
+ )
+ multilib_is_native_abi ||
+ myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+ if ! use extra-filters; then
+ myconf+=(
+ # LZMA1 + LZMA2 for standard .lzma & .xz files
+ --enable-encoders=lzma1,lzma2
+ --enable-decoders=lzma1,lzma2
+ # those are used by default, depending on preset
+ --enable-match-finders=hc3,hc4,bt4
+ # CRC64 is used by default, though some (old?) files use CRC32
+ --enable-checks=crc32,crc64
+ )
+ fi
+
use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
- ECONF_SOURCE="${S}" econf \
- $(use_enable nls) \
- $(use_enable threads) \
- $(use_enable static-libs static) \
- $(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
}
multilib_src_install() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-15 22:32:53 +0000