gentoo auto-resync : 01:11:2022 - 03:06:31

8 files changed, 33 insertions, 168 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index bc1e99f2b006..cfcff4aa2b74 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/upx-bin/Manifest b/app-arch/upx-bin/Manifest
index 3100bb7fe1e9..c18ea105f607 100644
--- a/app-arch/upx-bin/Manifest
+++ b/app-arch/upx-bin/Manifest
@@ -1,9 +1,9 @@
-DIST upx-3.96-amd64_linux.tar.xz 462784 BLAKE2B bac24742528b241c15bb49cfd6f006c485c28c051606deefc9b3c64d045658d029fe8dd1110120b6c21c03c30c0220ff8638d7e254a0376037b0d0ab013e9f3d SHA512 b4e7ad9ca58e07a0a59bcc1959d7901b1960a0975e4030b16c6aebfccd2f5f9163318f8f5b4a08bfd513138fe4c0fa3e3683f9141f221faa7bdfb8eaba4d0782
-DIST upx-3.96-arm64_linux.tar.xz 462376 BLAKE2B 202e888def2d60dab9d119548ac85ac6dcd0bff7e0c442fccd9a81961dc10ad96e7fe19b4a7a250c65d0bf9dd49ced8cdc7fdfb08cc7b75953a02afbff682865 SHA512 f1f6556068df27747dd40cdce3f3dfeb5c9a8723bfa76772715db69473267dd11242bf026c5a45e869b0f343559ede232d9a0067f4e4adce555cef1f26013f65
-DIST upx-3.96-armeb_linux.tar.xz 418060 BLAKE2B bb987a0a1466b3e5f4f2797888bf28c844f42eab3800dae00106cf4078c7196d6737ce9a3b9d1792d1ad1a190da8e90f2d29272127a20e4b2a9f5551511659ff SHA512 1bb570926a44c5471e00e3e2797728fa8122bc4035884f8fe8d7f4f3100e7dbddb84c80ad13c02d1a7454b1df504f96b8c0543913b1963c434ee2191d748e486
-DIST upx-3.96-i386_linux.tar.xz 485836 BLAKE2B 1bbcbde3d510eec9a38876958bb127eebe46c1f18146a62e5697fcfac0aa34bc910f3908e1783541466e46b305cdfd353902682c97301df38cd0550ca0302c34 SHA512 c679ddaf447735378d116cbff48276e13f9703f19a11364cad411915a153e2d7a6377f2ae8ce0f0383557ec889f44bb9860fd0b65bafce9935c6f381d485b13d
-DIST upx-3.96-mipsel_linux.tar.xz 483832 BLAKE2B c7f79ecc0e9f0b3f4ae9beaf0dc06e43e4cd747fde5bbd8d24505a008171f55c14ef411927cd112dd7fb170923679266170975e89cbeab43b17d842c20e29ff0 SHA512 252f64bb2d44d687daca645b1e0cd91665a562e86e1ce8fa95b57709134f74810f29f5792f7b8a1fe6c0517728632613a202a209465f1bd56ccbb383d9eea1ae
-DIST upx-3.96-powerpc64le_linux.tar.xz 505260 BLAKE2B 9e92e5e72436a3309c788a96a03c98bfd53bf51d3a22e85c6e58669b8c5536e107949fa860b25e1abc759b229aef76607819e62db353983f6f87f04d59395599 SHA512 8b577444366288427d6b114793b3f8fb42bf223b82bb78a391e5233c3cb3fe6906722ff7430aeaa764ef3feb77f052da469eab9d0dee90182929beefc5b1f17c
-DIST upx-3.96-powerpc_linux.tar.xz 479488 BLAKE2B 2d07dd57b742dd5a3ddcc86298618a939bd46a4af6f9bed41a3e0f12456bffb0ba7d76c866076489cb03130a9b9d84493f5401db5e76571cda4d7e9d65bef691 SHA512 a8f38f2467bc31d8cff2dc0fed191d1451aed766ab49336c7c99fe1b1a48455b08d9d45b14c78d655bc3c811c5fa2466701e1a990a5c954b0ce84499458024cb
-EBUILD upx-bin-3.96.ebuild 1297 BLAKE2B d7b5e92863099b0b34266b9e1b6ca0eb3e9b5d6cc9f774e01330ef229d820eccaa9b1f7212606f2bf23df85456122b4105eb369023955d67732f82f176fe9773 SHA512 b8ed79d48bd3e279c975f616b859bc733c0243e5266990301de28ddf150ff31684ed36ff0cc4190e86f840b7d1410445ef364022c0eb4022bab0ddcec38b2049
+DIST upx-4.0.0-amd64_linux.tar.xz 509584 BLAKE2B 18ec4cb6ddd04abaa2493164938e65c868e457d9554a0a93f1526cc46effee8f70130d0351fb49399bb31e62b04b344905c69f0c337ca608c4cf1fb1e62ae190 SHA512 48e9e4c78fc7a7358fcb66996870eb9ae39945e99b68c87b196d33a95d7b8bfd7d9e904eb3dce8a8bdbde68c0d2c8dbec4e55014aae330c7faed324f000c9950
+DIST upx-4.0.0-arm64_linux.tar.xz 494992 BLAKE2B 53e029a4e7b9ec44f60eaaf2255860a30d2b27e288e60dbad223936f1cc5a61011b52341f89a1b62636adea28c27361fbe774917d2c7f0bc5a781e5f5bd067b9 SHA512 c35d8f96acbc35d3cf05236a811917c671b01c52fadf792379dc867b3b5bf1c0edb7f5a1255577622dec218e9cfa8808c37725810d16245c2d0b4c0764ca3451
+DIST upx-4.0.0-armeb_linux.tar.xz 571268 BLAKE2B f3921ac4dcf3aa30309e3f766b5ba5c2aca3f29832f99964ce6339bb2d432c20f70dc8f10ef56433cbe702b6eefca9b3fecf8592e5f3303c7f7313dac0a8d539 SHA512 0c9f73746bc7af8e21c9ae5ed30f0466141c35a21bcefc3d49b2e7056c1238bb17b996a4b264c73739c2c3334376e4eb9dbbd6c1ea59d4bdfb0f10b2059027e0
+DIST upx-4.0.0-i386_linux.tar.xz 540496 BLAKE2B 2e284c59f5330ce64d1bf99e2dae65dbd76ab2713be47ac36d03f263cf136343847d1e6554e318959c10f10f491fff739d92ad2785513ea39a039875d3d8b90a SHA512 34e83ad5f7509981291919d251a386a26c4eb6b0e4c2f6ad4d8c3023fd86c953f1e55f2aa8a93bf64134731f18f71236068a01c78e5e61340ec2875dd84c2176
+DIST upx-4.0.0-mipsel_linux.tar.xz 552492 BLAKE2B eeb3bf051d5770cd4cc3a776ff3bd824408fec284adb30aacd592d7b1705778cedad37ced0f7b4a9568f234209c69d3e73f8553d8ec638e6e064775332f88df5 SHA512 c29dd06e64a7c79a0e157e4eb135dd9540b40e58611c0b77c3cfab9c1ebac174c2dae512a3f2427b6f4a5c8f94d52e0574845056331067fe3954c616e8115427
+DIST upx-4.0.0-powerpc64le_linux.tar.xz 560504 BLAKE2B c34d3259af01990f934b643dd59fef89dcb7d7471aa5012b231e584c80eb7b763b331c9433813ea573e9b638077ab701d1cf02e387418e601eba08de5efe7497 SHA512 46319b4737e6d8f6dd4f6b72ddcfe3a2e6755b87a58ec789017a598f3ddc44706770f5fe3e820de6df8348fc6ad42baced240aad77275c867f55d6d4e13b7ab0
+DIST upx-4.0.0-powerpc_linux.tar.xz 552572 BLAKE2B 2569b29618d828c8a7ff08cb2e302c6201b8422f0ba8eaa78b483c770839795121d12165dd8448812524f63dce115a9d0cfbe07ffde4465ddde7aad0bace136d SHA512 6b9135d482704a81e14d99b223c7f623f79933f09901f94c31a605da3ae0118af513785c9efec6c66d1395d27ce56fe2e25b2830b34652264c8298bae975b882
+EBUILD upx-bin-4.0.0.ebuild 1317 BLAKE2B 533d34c253e36a66405fdd5ead3166d5a0e53961d3cd7d8fd4eebf05166b6ed90839371bfb2030c389bbc5feedfd646bdae7c358f71318ee115ed46fffa8ccec SHA512 a060f5843e23b785910fd9bf22d6611cb6128939e58a06d2d7de753744f880002fecfc126455009335819ab2b954db6865752564977e4ddddcb3ba1d6f75fe89
 MISC metadata.xml 479 BLAKE2B fafbeeb827ba16ec14c3682982e7cbb1ef9264b637086d58aca32a632b1f273f1cc7ede069d61439a498f04e09368e4095829de7dd95b17afafc80f7ceb15695 SHA512 956e31235fec93e773f9bdbe62de739e3994d92b3a56ea97f65db5b20f182f4fbeed62370a28bf98447fddfa89efec4b8b4d63daf9020210810bd8bb201534e4
diff --git a/app-arch/upx-bin/upx-bin-3.96.ebuild b/app-arch/upx-bin/upx-bin-4.0.0.ebuild
index be332492449e..a6902194c16d 100644
--- a/app-arch/upx-bin/upx-bin-3.96.ebuild
+++ b/app-arch/upx-bin/upx-bin-4.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit pax-utils
 
@@ -17,9 +17,9 @@ SRC_URI="x86? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-i386
 	ppc? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-powerpc_linux.tar.xz )
 	ppc64? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-powerpc64le_linux.tar.xz )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ UPX-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 RESTRICT="strip"
 
 RDEPEND="!app-arch/upx"
@@ -35,5 +35,5 @@ src_install() {
 	dobin upx
 	pax-mark -m "${ED}"/opt/bin/upx
 	doman upx.1
-	dodoc upx.doc BUGS NEWS README* THANKS upx.html
+	dodoc NEWS README THANKS upx-doc.html upx-doc.txt
 }
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index 53a3935bac19..084b6db76174 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1,5 +1,3 @@
-AUX upx-3.96_CVE-2020-24119.patch 1371 BLAKE2B 54209c114c4a8cab51e7e7ec13cfee055a5f940df4dcbe40b7a35664378a20effdbedfef7b34e4a98510272f221540f87bf47bb439db96a68cc19177e6be71ff SHA512 9b887882e7344d77635091cd01d3c7aa9f45156f43896155988e3e1b7726d76642b4bc9b6c2db06af14710aaa9bfda16e97bc0d1127b77190b72e683d394beff
-AUX upx-3.96_CVE-2021-20285.patch 4481 BLAKE2B 345bce505a045c53b48dad3102f52588ceb7f2736cdbeab31ed5f65a5cf5a5344cb9ca700cfc3d7fac2569a91f454a652a676c83aafb1be884b0fae229d3afae SHA512 f596f13634eb2173f4c549d41387bdb6785501afb7d3a68d70f90dcdbadc615e95de024e1810af2b3663137692a7322d32a290357e0f7a96ca2acf51228b0abc
-DIST upx-3.96-src.tar.xz 792524 BLAKE2B 21af85dbcfdd1bf0151a653c865db13c9f30b9de0b9b4b94557ddd55736c7053dd829c5d72b9a7e5aa94a71ecc0151145dd66d7d98ded178c50ff7357d0ba442 SHA512 2d4d1be21d274d9bfdee9b9815396f5e5ff0bcdfb781b7be5fafa4d1e224028e412ec5f5ba607c482671aae27ccf9069abb2db0fb58f78f3a102a51897df2b11
-EBUILD upx-3.96-r2.ebuild 950 BLAKE2B 8d82f08655dbebcee420bb234e846a607ba5927eed16cfede97b62a4a34e7d67633e5f4721081709f621d6b1b16a81b3a9677a8d09f3deef8cb2b80a6671f09e SHA512 72816d4a1f956032cde555d93e4dacd18393f808bc1ad662c2f3fb3c43d3354bf11afb719859654ab59dac25e171c31cb6de3a20a91604f8cbadc62809987ccf
+DIST upx-4.0.0-src.tar.xz 1159308 BLAKE2B d2626a63b626f9b4e913b822e699fa93b7080d322b19555d44d7cf4ce17b37f0d50ec1381d07d0e4f8827e8edcd29d525d497fa79acd18d520ac58e176fb2b72 SHA512 fe3e8c594e845a91338b1e11fe3cb6371430af40a567187d63835e27da8b2abf993a104b0693063f4db984234bada7b2bd16ad79e3ad90861a1f495d99de7de6
+EBUILD upx-4.0.0.ebuild 575 BLAKE2B 65e6b039add2d11a9c84ff1e37cf611e8fe0f9231c65e178ebb85c2e7f2081884e0eca0bb0382a8e245683bb67d5acb04880b99087f6a9fccdd3773176ba784a SHA512 9b058ba2aaca4fef07c60d5e804546f4339ad5b0cf6273f7b33461805b28cdeb64f8a26798ef7988afcdb690bd9fef33533a268a40331f219dfed810812b58fe
 MISC metadata.xml 479 BLAKE2B fafbeeb827ba16ec14c3682982e7cbb1ef9264b637086d58aca32a632b1f273f1cc7ede069d61439a498f04e09368e4095829de7dd95b17afafc80f7ceb15695 SHA512 956e31235fec93e773f9bdbe62de739e3994d92b3a56ea97f65db5b20f182f4fbeed62370a28bf98447fddfa89efec4b8b4d63daf9020210810bd8bb201534e4
diff --git a/app-arch/upx/files/upx-3.96_CVE-2020-24119.patch b/app-arch/upx/files/upx-3.96_CVE-2020-24119.patch
deleted file mode 100644
index 7e6de04948bd..000000000000
--- a/app-arch/upx/files/upx-3.96_CVE-2020-24119.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 87b73e5cfdc12da94c251b2cd83bb01c7d9f616c Mon Sep 17 00:00:00 2001
-From: John Reiser <jreiser@BitWagon.com>
-Date: Wed, 22 Jul 2020 19:34:27 -0700
-Subject: [PATCH] Unpack: Phdrs must be within expansion of first compressed
- block
-
-https://github.com/upx/upx/issues/388
-	modified:   p_lx_elf.cpp
----
- src/p_lx_elf.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
-index cd9e4ec97..453d5c457 100644
---- a/src/p_lx_elf.cpp
-+++ b/src/p_lx_elf.cpp
-@@ -4550,7 +4550,7 @@ void PackLinuxElf64::unpack(OutputFile *fo)
-     unsigned c_adler = upx_adler32(NULL, 0);
-     unsigned u_adler = upx_adler32(NULL, 0);
- #define MAX_ELF_HDR 1024
--    if ((MAX_ELF_HDR - sizeof(Elf64_Ehdr))/sizeof(Elf64_Phdr) < u_phnum) {
-+    if ((umin64(MAX_ELF_HDR, ph.u_len) - sizeof(Elf64_Ehdr))/sizeof(Elf64_Phdr) < u_phnum) {
-         throwCantUnpack("bad compressed e_phnum");
-     }
- #undef MAX_ELF_HDR
-@@ -5617,7 +5617,7 @@ void PackLinuxElf32::unpack(OutputFile *fo)
-     unsigned c_adler = upx_adler32(NULL, 0);
-     unsigned u_adler = upx_adler32(NULL, 0);
- #define MAX_ELF_HDR 512
--    if ((MAX_ELF_HDR - sizeof(Elf32_Ehdr))/sizeof(Elf32_Phdr) < u_phnum) {
-+    if ((umin(MAX_ELF_HDR, ph.u_len) - sizeof(Elf32_Ehdr))/sizeof(Elf32_Phdr) < u_phnum) {
-         throwCantUnpack("bad compressed e_phnum");
-     }
- #undef MAX_ELF_HDR
diff --git a/app-arch/upx/files/upx-3.96_CVE-2021-20285.patch b/app-arch/upx/files/upx-3.96_CVE-2021-20285.patch
deleted file mode 100644
index 1d47b2a8bb67..000000000000
--- a/app-arch/upx/files/upx-3.96_CVE-2021-20285.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001
-From: John Reiser <jreiser@BitWagon.com>
-Date: Fri, 11 Dec 2020 13:38:18 -0800
-Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ
-
-https://github.com/upx/upx/issues/421
-	modified:   p_lx_elf.cpp
----
- src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++-----
- 1 file changed, 29 insertions(+), 5 deletions(-)
-
-diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
-index 182db192..3a4101cf 100644
---- a/src/p_lx_elf.cpp
-+++ b/src/p_lx_elf.cpp
-@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack()
-                         int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ];
-                         if (z_rel && z_rsz) {
-                             unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val);
-+                            if ((unsigned)file_size <= rel_off) {
-+                                char msg[70]; snprintf(msg, sizeof(msg),
-+                                     "bad Elf32_Dynamic[DT_REL] %#x\n",
-+                                     rel_off);
-+                                throwCantPack(msg);
-+                            }
-                             Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off];
-                             unsigned relsz   = get_te32(&dynseg[-1+ z_rsz].d_val);
-+                            if ((unsigned)file_size <= relsz) {
-+                                char msg[70]; snprintf(msg, sizeof(msg),
-+                                     "bad Elf32_Dynamic[DT_RELSZ] %#x\n",
-+                                     relsz);
-+                                throwCantPack(msg);
-+                            }
-                             Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp);
-                             for (; rp < last; ++rp) {
-                                 unsigned r_va = get_te32(&rp->r_offset);
-@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack()
-                         int z_rel = dt_table[Elf64_Dyn::DT_RELA];
-                         int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ];
-                         if (z_rel && z_rsz) {
--                            unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val);
-+                            upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val);
-+                            if ((u64_t)file_size <= rel_off) {
-+                                char msg[70]; snprintf(msg, sizeof(msg),
-+                                     "bad Elf64_Dynamic[DT_RELA] %#llx\n",
-+                                     rel_off);
-+                                throwCantPack(msg);
-+                            }
-                             Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off];
--                            unsigned relsz   = get_te64(&dynseg[-1+ z_rsz].d_val);
-+                            upx_uint64_t relsz   = get_te64(&dynseg[-1+ z_rsz].d_val);
-+                            if ((u64_t)file_size <= relsz) {
-+                                char msg[70]; snprintf(msg, sizeof(msg),
-+                                     "bad Elf64_Dynamic[DT_RELASZ] %#llx\n",
-+                                     relsz);
-+                                throwCantPack(msg);
-+                            }
-                             Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp);
-                             for (; rp < last; ++rp) {
--                                unsigned r_va = get_te64(&rp->r_offset);
-+                                upx_uint64_t r_va = get_te64(&rp->r_offset);
-                                 if (r_va == user_init_ava) { // found the Elf64_Rela
--                                    unsigned r_info = get_te64(&rp->r_info);
-+                                    upx_uint64_t r_info = get_te64(&rp->r_info);
-                                     unsigned r_type = ELF64_R_TYPE(r_info);
-                                     if (Elf64_Ehdr::EM_AARCH64 == e_machine
-                                     &&  R_AARCH64_RELATIVE == r_type) {
-@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack()
-                                     }
-                                     else {
-                                         char msg[50]; snprintf(msg, sizeof(msg),
--                                            "bad relocation %#x DT_INIT_ARRAY[0]",
-+                                            "bad relocation %#llx DT_INIT_ARRAY[0]",
-                                             r_info);
-                                         throwCantPack(msg);
-                                     }
diff --git a/app-arch/upx/upx-3.96-r2.ebuild b/app-arch/upx/upx-3.96-r2.ebuild
deleted file mode 100644
index 14c355bb6351..000000000000
--- a/app-arch/upx/upx-3.96-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)"
-HOMEPAGE="https://upx.github.io/"
-SRC_URI="https://github.com/upx/upx/releases/download/v${PV}/${P}-src.tar.xz"
-
-LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/ucl-1.03
-	sys-libs/zlib"
-RDEPEND="${RDEPEND}
-	!app-arch/upx-bin"
-BDEPEND="
-	app-arch/xz-utils[extra-filters]
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}/${P}_CVE-2020-24119.patch"
-	"${FILESDIR}/${P}_CVE-2021-20285.patch"
-)
-
-src_compile() {
-	tc-export CXX
-	emake CXXFLAGS_WERROR="" all
-}
-
-src_install() {
-	newbin src/upx.out upx
-	dodoc BUGS NEWS PROJECTS README* THANKS doc/*.txt doc/upx.html
-	doman doc/upx.1
-}
diff --git a/app-arch/upx/upx-4.0.0.ebuild b/app-arch/upx/upx-4.0.0.ebuild
new file mode 100644
index 000000000000..dcfcfaccee67
--- /dev/null
+++ b/app-arch/upx/upx-4.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)"
+HOMEPAGE="https://upx.github.io/"
+SRC_URI="https://github.com/upx/upx/releases/download/v${PV}/${P}-src.tar.xz"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="!app-arch/upx-bin"
+BDEPEND="app-arch/xz-utils[extra-filters]"