gentoo resync : 18.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
commit: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree: 326613a08f25851c388715e205576a2e7d25dc4f /app-arch
parent: b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
34 files changed, 231 insertions, 529 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c9a5c59808a4..f79d9be3ebd9 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 4a1e7eaebd06..d9aa449f923a 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -1,4 +1,5 @@
 AUX lbzip2-2.3-s_isreg.patch 500 BLAKE2B 7839d78d204c0b88ee68d728d1279dc2bc2e6222046cb28c60001c194513de7f3343dfb93d6db91bc4424fb639e2a1cbe428db1ff6753ec2c5b3c004a2b8f321 SHA512 3158763b364e8ba41b0fea03529c6e4a0c6f3d17e7d0ce796fc9a6f6bc7e70fa7db759dc205026818619e137fb6343cf21534014b64dbf07c1cdb3bc1059cc04
+AUX lbzip2-2.5_p20181227-fix-unaligned.patch 1061 BLAKE2B a8c11adbbf53806b09d9b0b6b724247a17e450eac6953a9d9852539ab6d50901d739b243a0d4c72cc46cd7bfaa609fd6829af659e0c6ed6987e6725c471ca201 SHA512 0ddd04a06d2cc763b454074aba588d2cb252e0ab8c83c37133deb5cef2c265261fc38f6b32f8aed5ddbbc8aafdcb29e96df1b61f2f2cfd2e1b93818efd69114e
 DIST lbzip2-2.5_p20181227.tar.gz 704920 BLAKE2B e5da0091c0e4fb73724c5ea472d757d76356cffbf1fc679bf4ee05e25690b7712dceaf17f355383bfd4eb525c4aea04c2e5312592df5bb99159e000769bcee2e SHA512 53b29721a106d280927f2c18f33247645bb7fb3e67d835885d73e037910bf02e473f1210d848df41a387be30f829213d98ac9387b2a9201b94d12117809fbcf5
-EBUILD lbzip2-2.5_p20181227.ebuild 858 BLAKE2B f5878366f67bdb63ee5c4d68b840d88ba6518b28dc0120600eb83feff2c963e8fee4d1b676dd3e1879caf7e61fba4299b063b851fd9a93a8a222b39e1082374f SHA512 0f51309bff560d98a0597f7e89a38e8c1d91e19af3a7f626643d00daf82cce5b05336ede1bd2d5437eed00253dc4d8a6f6775533d35c149a0835f7fa6e67528a
+EBUILD lbzip2-2.5_p20181227-r1.ebuild 837 BLAKE2B b05e6ea81314e8de6bea2464d2f90e93cf7b5d7b1da4406c06c45dcbdfcd53826727b59e89112ddc7ce7bb301356476ba91bf808ed53f5eed579ec5af956a0bf SHA512 e709c741968d528f8bc29d7fd020a7cbcaed86b3fde44da35e75bcde01ea3e8137e2e07030053862f72a06d1fbac2b18a5ec7d6c16ec0f92300012001d7c511e
 MISC metadata.xml 534 BLAKE2B e09b3c70d05c66c9edffa19cc3e52be55ecade605c97da4e2f4f6c930dd1ebb548ddb873d31c50c995c0493fd3329978db661796c43ae029a5db79ac0e1974f0 SHA512 86b03f188fb14168b7d2d6956fa2df4941d94c95ff00e6bfd27451fe76b9318dac477bdb13b6443ae0186837335d66cf3e52ddc4ccc2f2979e60fe287f5ac2b2
diff --git a/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch b/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch
new file mode 100644
index 000000000000..c23d1afc4ca5
--- /dev/null
+++ b/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch
@@ -0,0 +1,33 @@
+https://github.com/kjn/lbzip2/pull/25
+
+From d570020ade2add591b97e61927545a005a2d4a6f Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Wed, 7 Aug 2019 11:47:04 -0700
+Subject: [PATCH] Align zero-length array to avoid unaligned accesses
+
+When make_tree() creates the left-justified base table (uint64_t *B)
+it does so with 64-bit stores:
+
+    B[k] = sofar;
+
+But B points to memory in the zero-length array "uint32_t tt[0]" at the
+end of struct decoder_state. Since tt's type is uint32_t, it is only
+aligned to a four byte boundary, and so the 64-bit store in make_tree()
+causes an unaligned trap on strict platforms like sparc.
+---
+ src/decode.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/decode.h b/src/decode.h
+index c9a9086..7c0ca3f 100644
+--- a/src/decode.h
++++ b/src/decode.h
+@@ -62,7 +62,7 @@ struct decoder_state {
+   uint8_t rle_char;             /* current character */
+   uint8_t rle_prev;             /* prevoius character */
+ 
+-  uint32_t tt[0];
++  uint32_t tt[0] __attribute__((aligned (8)));
+ };
+ 
+ 
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
index 04fa9267b153..7dc8fcd267ff 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI="7"
 
-inherit autotools
-
 DESCRIPTION="Parallel bzip2 utility"
 HOMEPAGE="https://github.com/kjn/lbzip2/"
 SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
@@ -19,14 +17,9 @@ DEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3-s_isreg.patch
+	"${FILESDIR}"/${P}-fix-unaligned.patch
 )
 
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
 src_configure() {
 	local myeconfargs=(
 		--disable-silent-rules
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 3725a1b1012e..8a5af6dab7ff 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,10 +1,4 @@
-AUX libarchive-3.3.1-libressl.patch 1069 BLAKE2B 0fb6c7c3d85b620387e76e6e2fb7b787effe8fb8c9bd911561e348eb7d0c7cbd504d8932ff5d7c2856649948c556b3807a0fc6019ef4d38fa37d873729275e17 SHA512 d82e3de1201168f6e187824e237f35a9581c34450043ce84478aca3ca74df7b00bbcba5bc462f354837e1720bcc135ce4864f81cfd499b398b1939b886b7fd3f
-AUX libarchive-3.3.2-libressl.patch 1105 BLAKE2B 9b62a5b4029b8c0fd97d4c5012fac9a7dd25655e3b0d8adbcb839f05c1999eb77b902ef476841af8eb8b9de76ce9bad893d065084121434f06717d5f4db93b29 SHA512 ffcc66414f72ee2262544f4d59ca2d0b83ba2eca4f58261ec4694f5cd5d5d7975d9626a1f9ad8a1047d3e656d4dc98dd28d991ef3e6311959d8bf797ad6bc936
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
-DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
-DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
 DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7
-EBUILD libarchive-3.3.1.ebuild 3438 BLAKE2B af5fa17a2a5ff850d88e81dbb88f2e275f4f601b1e61f7e067ff3c6806cb0bb115c307862ba5e74fb913aff9a7bda1399860e220e69c17826cae065e04a78d4a SHA512 31ae25cf9ec76a27098861dcec1a8a80fbfd132296febd7db47c10a8a34dc08a04657d41f66a3aacb0048e4154d740b8d346a287298e9067d555e8908b668194
-EBUILD libarchive-3.3.2.ebuild 3509 BLAKE2B 7338b74ba0ba1b9a120ddae5a320a834e6ce8cef981a2ad59aa26c6973a26e1088094a30334b50a013c34986dec783b872d9c57b117bddd90a11d048c7ebda02 SHA512 6affef3f8d8613fa74dedbf4788eaa103ba4bda8107084197f1790ea6ebd78ce7699dd4ee2ed718ea6c776e4a8b1572e8c00710e994f48f419374cff8d2034f4
-EBUILD libarchive-3.3.3.ebuild 3618 BLAKE2B 5eaceaf333d0f8edbf48853db97f1a543efdc611cec24e86fd5138b0489c721c5cc6544c37a2e73bf04cba6e623afb93dbd3541ae89a8b8e9afe4f0289f0c301 SHA512 dff0378fadb701cfa3186eb6f20f4794072759dd5bb2179fa16d5add136eddc7736c36d00b0d365502b58fd415a0e8303eb8c214ddfb7579f67cb3341f612d9b
+EBUILD libarchive-3.3.3.ebuild 3625 BLAKE2B 572ade5c05fa4a9951c6ffca4ccf5dfecbaa1a13538ec8f7589823b7dd90f3476722f92afa79d615236811f8838f852c2a68803ac74756022eb9167607de32df SHA512 e87384a803a6a4148517ce235f2be295f6b59c7e8e0bba6a9c0c2b1bc3be90d5eb41d1763efe70a30fce202c77bd3e56b71213135dec26aaf8a5540cc46f1c60
 MISC metadata.xml 1447 BLAKE2B 342ab0c5aeb3fdae86b39228d4df3c98163b55c1fa23318b2b7a22f714303f1f0615d60d9c057b0a91f90e61e6a7357043096463ca3efe1e8d5cbcd2a5897ce9 SHA512 85b5c67f258ab07b14f15967024bd5d1f11a81bd203e67d40398b42b3728735e28cf2645a0db865c6b6ed81a64da6de470ce62c882d0f72dbceb5361f791b81d
diff --git a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
deleted file mode 100644
index 7ee48d4e5f50..000000000000
--- a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/libarchive/archive_openssl_evp_private.h       2017-01-29 05:06:27.000000000 +0000
-+++ b/libarchive/archive_openssl_evp_private.h   2018-04-19 04:00:14.061922747 +0000
-@@ -28,7 +28,8 @@
- #include <openssl/evp.h>
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
-
---- a/libarchive/archive_openssl_hmac_private.h	2017-01-29 05:06:27.000000000 +0000
-+++ b/libarchive/archive_openssl_hmac_private.h	2018-04-19 04:02:18.309167446 +0000
-@@ -28,7 +28,8 @@
- #include <openssl/hmac.h>
- #include <openssl/opensslv.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline HMAC_CTX *HMAC_CTX_new(void)
diff --git a/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch
deleted file mode 100644
index e053a539fae8..000000000000
--- a/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/libarchive/archive_openssl_evp_private.h       2017-01-29 05:06:27.000000000 +0000
-+++ b/libarchive/archive_openssl_evp_private.h   2018-04-19 04:00:14.061922747 +0000
-@@ -28,7 +28,8 @@
- #include <openssl/evp.h>
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
-
---- a/libarchive/archive_openssl_hmac_private.h	2017-01-29 05:06:27.000000000 +0000
-+++ b/libarchive/archive_openssl_hmac_private.h	2018-04-19 04:02:18.309167446 +0000
-@@ -28,7 +28,8 @@
- #include <openssl/hmac.h>
- #include <openssl/opensslv.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline HMAC_CTX *HMAC_CTX_new(void)
diff --git a/app-arch/libarchive/libarchive-3.3.1.ebuild b/app-arch/libarchive/libarchive-3.3.1.ebuild
deleted file mode 100644
index 5ccced536ae2..000000000000
--- a/app-arch/libarchive/libarchive-3.3.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/"
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
-
-RDEPEND="
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.1-libressl.patch
-)
-
-# Various test problems, starting with the fact that sandbox
-# explodes on long paths. https://bugs.gentoo.org/598806
-RESTRICT="test"
-
-src_prepare() {
-	default
-	elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=()
-	myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		$(use_with zlib)
-	)
-	if multilib_is_native_abi ; then myconf+=(
-		--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
-		--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
-		--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
-	); else myconf+=(
-		--disable-bsdcat
-		--disable-bsdcpio
-		--disable-bsdtar
-	); fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-multilib_src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-
-		# Create symlinks for FreeBSD
-		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-			# Exclude cat for the time being #589876
-			for bin in cpio tar; do
-				dosym bsd${bin} /usr/bin/${bin}
-				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-				doman "${T}"/${bin}.1
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-includeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	prune_libtool_files
-}
-
-multilib_src_install_all() {
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/app-arch/libarchive/libarchive-3.3.2.ebuild b/app-arch/libarchive/libarchive-3.3.2.ebuild
deleted file mode 100644
index d53b773494cb..000000000000
--- a/app-arch/libarchive/libarchive-3.3.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/"
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
-
-RDEPEND="
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.2-libressl.patch
-)
-
-# Various test problems, starting with the fact that sandbox
-# explodes on long paths. https://bugs.gentoo.org/598806
-RESTRICT="test"
-
-src_prepare() {
-	default
-	elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=()
-	myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		$(use_with zlib)
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
-		)
-	else
-		myconf+=(
-			--disable-bsdcat
-			--disable-bsdcpio
-			--disable-bsdtar
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-multilib_src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-
-		# Create symlinks for FreeBSD
-		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-			# Exclude cat for the time being #589876
-			for bin in cpio tar; do
-				dosym bsd${bin} /usr/bin/${bin}
-				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-				doman "${T}"/${bin}.1
-			done
-		fi
-	else
-		local install_targets=(
-			install-includeHEADERS
-			install-libLTLIBRARIES
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${install_targets[@]}"
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	prune_libtool_files
-}
-
-multilib_src_install_all() {
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/app-arch/libarchive/libarchive-3.3.3.ebuild b/app-arch/libarchive/libarchive-3.3.3.ebuild
index 1755d083bbd4..50cb45ba6497 100644
--- a/app-arch/libarchive/libarchive-3.3.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 7a6768d3abf1..fa25a4386382 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,4 +1,6 @@
 DIST lz4-1.8.3.tar.gz 327897 BLAKE2B e2be80be14c67cf1a07cc6a2e6f6777a87abdd15499b9c32b8096e09284aea19620adf930e28454ce105e325cff684d2625e0a38211705f3c105a80b72f56be5 SHA512 5d284f75a0c4ad11ebc4abb4394d98c863436da0718d62f648ef2e2cda8e5adf47617a4b43594375f7b0b673541a9ccfaf73880a55fd240986594558214dbf9f
+DIST lz4-1.9.1.tar.gz 285336 BLAKE2B 50dfad2e92028a1ccfe186efb5dbe24e4641e104da656990ba5138a84d29fbfea26d96c2d7f64f8d6a686dc98b4890990a280d4d86e321b04f467b65b6c61e1f SHA512 536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e
 EBUILD lz4-1.8.3.ebuild 911 BLAKE2B 674ce798fb551fd4bdc4a0e5b2913f238532439e98c8887a5d3cb64e7bf5a7349e225dc290da191c97f01a2b03a8770409b915513c65d710bbc072de6b4aa8f6 SHA512 982493e85bf02014b490a10e4dc57e25e193e493ef6fcb65f77af84dab9501fef5087bd8d80f3e16f4cffa4cec025e7ecc1829ff163f5a043fd35fa4a55a3487
-EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
-MISC metadata.xml 427 BLAKE2B 6d83f65cd913a612933b067bad6594e6e0e389a85a5b883e8d795f8c9591afa0bdb9b987ea35ceb3dbeebe3fbb81ca217a93fd5a8f8d42bec5aef6707dbf258b SHA512 022a6fcb7f89687c4817778b767e393f4488f893de14f0c68aff9aaa41a9ec3cae5034eed17c9d32e5ecff735cdad0f70bddfc0158d599f22bde70653e0d0f3e
+EBUILD lz4-1.9.1.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
+EBUILD lz4-9999.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
+MISC metadata.xml 537 BLAKE2B fe6b4b4291dd1358a873cf34cd4f62fc6b08ac0db2449c7bb2840a715f13c68521140b244f66f00e8881ed53b4d66e988d71baf75bc6b5c79dbbabc2d12f6615 SHA512 4fc89afbcd032d88e43f346105f02da50e946c706f60aa7991c64e768941409e335005c6a4f283c0dd4d2ddc8faba53e4968334763e9c8c46538bc5810fe9699
diff --git a/app-arch/lz4/lz4-1.9.1.ebuild b/app-arch/lz4/lz4-1.9.1.ebuild
new file mode 100644
index 000000000000..f68caa90b673
--- /dev/null
+++ b/app-arch/lz4/lz4-1.9.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
+	EGIT_BRANCH=dev
+else
+	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/lz4/lz4"
+
+LICENSE="BSD-2 GPL-2"
+# https://abi-laboratory.pro/tracker/timeline/lz4/
+SLOT="0/r132"
+IUSE="static-libs"
+
+CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild
index 267436933dac..f68caa90b673 100644
--- a/app-arch/lz4/lz4-9999.ebuild
+++ b/app-arch/lz4/lz4-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/lz4/lz4"
 
 LICENSE="BSD-2 GPL-2"
 # https://abi-laboratory.pro/tracker/timeline/lz4/
-SLOT="0/r131"
+SLOT="0/r132"
 IUSE="static-libs"
 
 CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
index 7b12b6d572d5..6700e72ced20 100644
--- a/app-arch/lz4/metadata.xml
+++ b/app-arch/lz4/metadata.xml
@@ -9,6 +9,10 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>amadio@gentoo.org</email>
+		<name>Guilherme Amadio</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Cyan4973/lz4</remote-id>
 	</upstream>
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 55aa7b9356e3..ac4cb876c35c 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,3 @@
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-EBUILD pigz-2.4.ebuild 938 BLAKE2B f9c25221d2c94f624905cac3e7da6fededa08879e5c381f9184851cdadab327f782c2064bda6405da255738a8fe4f3ae6d644ff06926e2fe19cb6fc8420b315d SHA512 8ad324443df24c0166caf1a9e46f474e6452a41772dbc2525eec738122a0366b8c5f59865c989d4bf1549ce74144c029167768c68840bbb9e9adc7cbb500ead3
+EBUILD pigz-2.4.ebuild 962 BLAKE2B eae850ab8f99931694b69edb474996f531673049bd83ff7318e868f6da086c9106e6c98a87da2b78aba2106853c9ac609c6e50cd74496bf400c03a48d17e1b4c SHA512 6e321cd89df80d9386b7edb5cc72e4c5ac1c1d253ee74ccafcd3c8e529b9da5624216b216cd7a012269f06c731d8018b1b6dff124b2787cfe04fc8db04239d3f
 MISC metadata.xml 499 BLAKE2B a3f4937154e9907d34d3779407b1bfc07e8de329cb34b0efe4b62f20b4c9f5b9eb09d22023496e4f5228f1cb64bb4829c30730fe6035128b14e759073ec83a82 SHA512 7c954984f01ee2bf1bb9b8f0840445fed7f47899188a884462c59a862bef568845c2cb81a966aa6d46222d45ab7a9fabfc24b1bb4d178f9f8fb1789554ca87fe
diff --git a/app-arch/pigz/pigz-2.4.ebuild b/app-arch/pigz/pigz-2.4.ebuild
index ce6d961daf71..ed4dddd258c9 100644
--- a/app-arch/pigz/pigz-2.4.ebuild
+++ b/app-arch/pigz/pigz-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"
+RESTRICT="!test? ( test )"
 
 LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
index 6548edf35260..f3321392726b 100644
--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@@ -1,10 +1,6 @@
 AUX sharutils-4.14-popen-rb.patch 791 BLAKE2B 3708a7b94ec238957a94ba8105a13543438d7239fe8d3aa75c970c106b5d9096f65814a53d880324f2ed4fe847dd3db9005b5e667c0a8d5d0fb596440bdb4dd9 SHA512 96b7aa7b594cf2d31b6a0d85c7d4ff0901c66776bf83328651a6717f633d9fd3f0ce1e3185b110aecfb8c59009087b0853cbef3736eaf9aa25a08a11500d4833
 AUX sharutils-4.15.2-CVE-2018-1000097.patch 500 BLAKE2B 581ee4fa93ac9b7f2eb0a5b605f0072a15af174f8462f1983833d1314eb3b7dc7763af60f32e6baa054ad00abf4ca4a10a7ae88b59415ab8ea9de3cb674ccf67 SHA512 6415da74c4f6f203bc4ad617bd05fa6ac86e1079538236148763e0b5e81ca8ea4004ea58e9e4755ba371246a7c469ef1e421576260494043d3ce3fc80e73cf69
 AUX sharutils-4.15.2-glibc228.patch 3807 BLAKE2B 644163c477f51b407211e8c9e6d3120ae38307753666fffb7aecbc758793b0b897920246b1f070e727e28728d76eb3283b80ababb881f39f909f9aa96b6e1ace SHA512 179272ae9b528719700bac5b06e4c70116d3d8a06973a69069617fc8dc0fa095227f7ab703b4c5b2beed649d5ffdc661d1d7ad7885185cb6ba6c62fce020e1cf
-DIST sharutils-4.14.tar.xz 1089052 BLAKE2B 2fe3edc016840b51528b9a7c41219f901ed29399051f1f6f4bcedd75ee85037ac3e3b9a67278aea34cd7b4a20d226b4143501bda481612c5b348b2fe57f71e75 SHA512 c1b87bc87915f7aebc9e02dfc1e08321f5ed2e144509c063139cde23eb8f75cb6469aa8042e4c6ec801f55d805e595f4c1c674cf5f2b4580a1e4933fcd605614
-DIST sharutils-4.15.1.tar.xz 1126672 BLAKE2B b570ae35c0f516cdd24c75f59596a0cbff1c0747c92d1cfa78c0828e8d68ceb5b42f0a32113bdd557e099774ef3dbc5af1ef019ffe33469f4011090b8e27a6e6 SHA512 791e37730cfff36ef96793ff7e70af05845eef72c6f581ce05a873d7d9beb7d42504a253fb944c77938f355c5d29c1a9de78653812fbbf859574b7b72dc4d8e1
 DIST sharutils-4.15.2.tar.xz 1122476 BLAKE2B e2acae027679ebdf723ecae6f243608f501f5c24685a19223dd27580ccf76bc7d38905a9d202b30cf2633e5580d727821398f1162b170233f03c17f3da683917 SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d
-EBUILD sharutils-4.14-r1.ebuild 735 BLAKE2B 2afdd68f317d6affd432d6d291a7516906b992f5cea53c1a4cf794fb5dd4da03006759b005f6e66ba7abec0d9ef636dc56f910affe2c6dc43b6f8d337010bb56 SHA512 53c7501e69be3b24924b7178ba561d997a579ac12f45e6e36abed598debee3917ec0bafaba3207a9b266918da3ec055279daaf82544af94c6e0e5b3b2baee71e
-EBUILD sharutils-4.15.1.ebuild 748 BLAKE2B 7af24df5f5a521195425ca96994d285b62f58a08398751ed73c450480af9213f7dd0255d227663c3811a69baa24c911709c6155b9ac400559369ffc43465dfc1 SHA512 b0c5db15b48a7eae0f690b8693b532f070eb29905eeba07f996cf0b46799c13daa9f5192ad15d4e5c1322e38c1519e730e11347d43ba890dc302d74f43bca8fe
 EBUILD sharutils-4.15.2-r1.ebuild 1048 BLAKE2B 55712ae2eef0494292a3287b7b7de69804d8d6f90a84bf208bb3e8ddf49544a1fe692f61abf3f884a75565e702931af9c22c9f40e633b2aeffbf580d9df30fdf SHA512 917398a786d897c72daa51e82014b5393f234519e3f294ebb0afb2df24131e7d0776ea64a442973fb44e3441464b05485c123346bfa289e3baf27982c65c67e7
 MISC metadata.xml 335 BLAKE2B ff8d1603a99aeb199526f9ec3c768adc461d09ae2d5dc5d73bdf2bea0d369dafc75c358b23ed68d4567e8f691b3d84d706356e8496d2b5d181e58563bdca8826 SHA512 4670be25ae746c8384beeff118f00b44d00fb9db553d4d64934bbb6f972eb21e2a4b28e2d5a6a6a708280acd51bed2b2acbb7552165c43a75eb497eb0c04dd94
diff --git a/app-arch/sharutils/sharutils-4.14-r1.ebuild b/app-arch/sharutils/sharutils-4.14-r1.ebuild
deleted file mode 100644
index ed1b2a733c44..000000000000
--- a/app-arch/sharutils/sharutils-4.14-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Tools to deal with shar archives"
-HOMEPAGE="https://www.gnu.org/software/sharutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="app-arch/xz-utils
-	sys-apps/texinfo
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.14-popen-rb.patch
-}
-
-src_configure() {
-	strip-linguas -u po
-	econf $(use_enable nls)
-}
diff --git a/app-arch/sharutils/sharutils-4.15.1.ebuild b/app-arch/sharutils/sharutils-4.15.1.ebuild
deleted file mode 100644
index 402e15b75376..000000000000
--- a/app-arch/sharutils/sharutils-4.15.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Tools to deal with shar archives"
-HOMEPAGE="https://www.gnu.org/software/sharutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="app-arch/xz-utils
-	sys-apps/texinfo
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.14-popen-rb.patch
-}
-
-src_configure() {
-	strip-linguas -u po
-	econf $(use_enable nls)
-}
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 1d4148012169..ea59933ad627 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -2,8 +2,8 @@ AUX unzip-6.0-format-security.patch 4424 BLAKE2B c76ac7c9874238ff20c85e35d8bab80
 AUX unzip-6.0-natspec.patch 14304 BLAKE2B 87f724fcdb0960bfa17d609dbb764f3469b1ddfee1abc810e57cef52780482abd8c25950cf0da4d976d89745f4aa65b6269f21d0eac290230621b782fa1e0d06 SHA512 189ce2045430d2d04e27049672a3cfb205319edab1ac1522700a7f89344e5718235d8a15238390f6b4317af493796a65cac6a83f7dceb402bc736628d7a89cda
 AUX unzip-6.0-no-exec-stack.patch 381 BLAKE2B c298afe0df1c903c0894bf55e55b3f4f0d616662e3fa706bcb9813707af3f2bfebff1a2b4290d943718ca35aa2ce098f20b5d370a624c1a16b81d4e921a3bdeb SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5
 DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
-DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
-EBUILD unzip-6.0_p20.ebuild 2546 BLAKE2B b050ea480f15c7d760a0326566661c877d1b6709ce9886f5a068731db112678c3817b54311ddb46411b80566f15a7fed01ae886f60c17102fb76e12241c2c58f SHA512 7eb1315729c287c0f5b18fcf812837c955e879f447632968bd5e516d799c66143cd4c272b264e1d2ae5c1ddc3062bcacb1fd642794cab70dd4f05fe103d6cff5
+DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
 EBUILD unzip-6.0_p21-r2.ebuild 2593 BLAKE2B f626ff277131a9d5cc952bdfcbef19677acf487435835c0f50a438e74db7c3f8e795d0f95a51f51c14e7517ee90cd5906cf7e3c94206d46796c010d6ffd074ab SHA512 934edfb2983a9e423bd6c48d9bd7d71531c50a3578c8311b2310a126b21012986fe0a2726e40890c841fff13f5d75c56f6bfc48823f495cd227377d0b3bc4268
+EBUILD unzip-6.0_p25.ebuild 2606 BLAKE2B 19fc6e70ec6ea38deff1c0433b7d7367535967919d6b5e9efa15ba1d291d3e4a1203efc41afedac544187193aa2eb4058fd0f46a80106b78d1b38361b1036a6f SHA512 1497ff9cad0d17caaca2045e1adf075ad3bda34985cb73da9bae84f2941b746eeeee9195c26591dccbbbfc67463b09adc0a0998c8105b5a9acae46cded5c8729
 MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild
index 65112b3cb15f..dcd460f9f049 100644
--- a/app-arch/unzip/unzip-6.0_p20.ebuild
+++ b/app-arch/unzip/unzip-6.0_p25.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
 
 MY_PV="${PV//.}"
 MY_PV="${MY_PV%_p*}"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
@@ -27,14 +27,12 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	local deb="${WORKDIR}"/debian/patches
-	rm \
-		"${deb}"/series \
-		"${deb}"/02-branding-patch-this-is-debian-unzip \
-		|| die
-	epatch "${deb}"/*
+	rm "${deb}"/02-this-is-debian-unzip.patch || die
+	eapply "${deb}"/*.patch
 
-	epatch "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
-	use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
+	eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
+	eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
+	use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
 	sed -i -r \
 		-e '/^CFLAGS/d' \
 		-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
@@ -54,30 +52,30 @@ src_prepare() {
 	# Delete bundled code to make sure we don't use it.
 	rm -r bzip2 || die
 
-	epatch_user
+	eapply_user
 }
 
 src_configure() {
 	case ${CHOST} in
-	i?86*-*linux*)       TARGET="linux_asm" ;;
-	*linux*)             TARGET="linux_noasm" ;;
-	i?86*-*bsd* | \
-	i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
-	*bsd* | *dragonfly*) TARGET="bsd" ;;
-	*-darwin*)           TARGET="macosx" ;;
-	*-cygwin*)           TARGET="cygwin" ;;
-	*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
+		i?86*-*linux*)       TARGET="linux_asm" ;;
+		*linux*)             TARGET="linux_noasm" ;;
+		i?86*-*bsd* | \
+		i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
+		*bsd* | *dragonfly*) TARGET="bsd" ;;
+		*-darwin*)           TARGET="macosx" ;;
+		*-cygwin*)           TARGET="cygwin" ;;
+		*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
 	esac
 
 	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
 	use bzip2 && append-cppflags -DUSE_BZIP2
-	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
+	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
 	append-cppflags -DLARGE_FILE_SUPPORT #281473
 }
 
 src_compile() {
 	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
-	emake -f unix/Makefile ${TARGET}
+		emake -f unix/Makefile ${TARGET}
 }
 
 src_install() {
diff --git a/app-arch/upx-bin/Manifest b/app-arch/upx-bin/Manifest
index 11642d6b1f41..ae8671cb4ec8 100644
--- a/app-arch/upx-bin/Manifest
+++ b/app-arch/upx-bin/Manifest
@@ -1,7 +1,9 @@
-DIST upx-3.91-amd64_linux.tar.bz2 373664 BLAKE2B 0c3ea873afc9b1fddce742dd231d4a8be49123aad203f2f868276dbd855db193c9db596b88c20061f2f07671ea3be5607df4a2abe9042d190f482478e744456c SHA512 7f57564c89baf1bad89d6038c17a83268a3f528d2cb3cc992160c6dd4842a6b3ef7123fea86480a491d8df7f7b099d8444effa6f677532f4bf756f72a51066e9
-DIST upx-3.91-armeb_linux.tar.bz2 363100 BLAKE2B 09960871176b4a3b9d12f8658b3c3ecb631ac35570ac1fde79092692b552fc6e71e54515ed3e34e09b0a10d28ac488598bf9c01244f88af63b8a2688ed1fef3b SHA512 730fcf1b8b2a81043f1c1ff611c94c8b4e26850c7dbbbd9fdcb6a6603878792873ef6a48f073feb12e1db3cdf0a7964f747ba4d7daa75cc2bfb8844b234b4332
-DIST upx-3.91-i386_linux.tar.bz2 366446 BLAKE2B 762f80fd26929e65cbab815dfa5c095d722ebadb1ffa4b70a686959dcd3b0b54d04d9d3d18e5efa2c9e3dc2e1bc3a0d89e437ddd876947c0e83943bf00455066 SHA512 b679fc54a4e4bbf1ed7bf11473b85ae33df82752815bdf7fae9499f6d1cb1df0251a284596d7303fcba8465b77c6dd233e1cff288806a73c84a50a48ec13aec4
-DIST upx-3.91-mipsel_linux.tar.bz2 530222 BLAKE2B 73243e4160ee05eaaeb3ccb483c04882fe8b132a0e1098d40eb9311301eb261ea42e6f67e123e61479ee9185520bb6da6b840c52e23b1e37ba9ab3b3ae40b8ee SHA512 66a256127104266350e32cffe6914790586c3f35b4aea49a12ce8c37a911f7b2195eeea72b9a9e4ad32e12e8efe16fda36f93cdff85e15983b496211c961f71f
-DIST upx-3.91-powerpc_linux.tar.bz2 474332 BLAKE2B 893f35220409b8d57c297528dfd1196818b13a7ed112205276a58b6a9643b38b0e8ef62a8c9fed97b7d8a11f15ee449c7be7a4849b5019ab97969e8cd47726a2 SHA512 1ea12baf9f8cf7a40fc58be7b41255f2e65044937faa44232f3ef5d4cfcc6d98ac1cbf7511c941df7610cf5c2378f9c9dfb323a6a1c5c59526b67d38eb800afe
-EBUILD upx-bin-3.91.ebuild 985 BLAKE2B a5632d2cf54efea3f2f6385a34a48b071a95bc202440b6f9e3950e7f153d753995ced164d59f5b5a0fa847e6654d012a75ea345e7c62f447bcae35876655b6d6 SHA512 145bfc6d92604b2cf3e8947f29aa1aadc51fe39117ef8f0632d92ceed290f33ad39042a076bf26d7117c188a43be963680cb17adba17945ccd043f80a068bc2f
-MISC metadata.xml 350 BLAKE2B ad0cbfa7d80f15a0b26544bd317f3c67c1c918d27ac924170e36825db579f7cedfdb779050fc3e914cd7af175a982a53e5836599e833188a8f9f07d4fc2121d3 SHA512 d46dfabc7ce88e5f377d658f33cf45bd107beacc479280d6efddf6611483a7729a038f9e9970e1194739d60fa948b3436493acdba7c08f0004306d715cd73448
+DIST upx-3.95-amd64_linux.tar.xz 456788 BLAKE2B 1ed17ebb799da2c17ec863067f33526f87b84e2fea9643678939c9ac70afdc6c7b689dcf9e5ec716c0b4a6684ecf03370f08c5e2db707e6c3ec2adfb60e0b9f4 SHA512 23067ce45123eaee3810464e91c3ed65527bbed3b9546aa42d3eeae842efdf0ab5de70c584631e5642deaacf16cc574918889ca35b0611afa1b10fb489bda861
+DIST upx-3.95-arm64_linux.tar.xz 457592 BLAKE2B c9c009ba7b63743bc98653f76b8f8f03cc74cfa490e48e0c01b7d8fc9c2146026b1f5a8bf9141a35ab02cd40ab5658bded9180f26ea9f210d1e1fd9f2322c738 SHA512 7a8541bec07f9630521edb98844f7d8f6302d9ff4874ece18673598c8872e626681119e89a64ebfaf3e707bcc6e07f3072f34416e97256d25c8cbcf707f123bb
+DIST upx-3.95-armeb_linux.tar.xz 412608 BLAKE2B 2acd5a06512696f4c52a33014fe25515aedaa9704942048ab0dd5b3b6db48c75160056818f03ee960f93c3a886d1aa501a496509dd04f31b79c6d0a93d2bdb3e SHA512 9e1d9057f1bf0a4262b3d672b1a50f192380e29189d5d0bd8963ec79247a9246db53b3ff9c180ab4c961e464dd1c8fe1c8e7541a3a2cc3c0f8a56fecdedfe956
+DIST upx-3.95-i386_linux.tar.xz 477560 BLAKE2B 7ee9d05227c8b39e186a8e0521eea2831780e142bbf3ec608e805bf33b4ab9ac72b249204b42f640d695a56b03b4576f9ae838129a823ec9fe1ed9b497b1de1b SHA512 bd1c6fb1f1f90732a666d6a254896a6c359d3f21c6be6f751aa8899e03487c696b9cacc79ed3c05af4e53b3e3374c5b64f5af9a4e85e11e4c31d972c0f25ac42
+DIST upx-3.95-mipsel_linux.tar.xz 477840 BLAKE2B f3863d7f8eb33554c5873b0cab0190bcc1f0efb3e40e1aad09a96f6fd2319234620d393f9b0fea344940a42be969862f9e60f05440e7608c77183da6f1899225 SHA512 27c8a328b18ed236856f36d9f520d1f7ee006d181e77674d2b8b2296993c34e6394befbefded58f9a70403d2e65b5a143a748adffe8f517393c884f8e9e4abe5
+DIST upx-3.95-powerpc64le_linux.tar.xz 498012 BLAKE2B 111c174887aed8f748278b0480e3e4e32793c8c8f6aa78cfac684c82f27be6c762921baef2bb39a0a07f004bc2c5af0d3953a6aa4fa41f3c65e543bf74dfb10d SHA512 5ec4d811baf9865669972ca8fd57e455d1baf88340e6cb87170486ff398a38c0e6781026d3a3d9a2b3ccbb8420b1c43825b78aedc24ce3adeda79bc5d57473a2
+DIST upx-3.95-powerpc_linux.tar.xz 473136 BLAKE2B 3b4800db76df4f864cde650827b2fe4d34f97e31d7fe0ff5859e3542042b8b8029df8fb50eb8891634319c75b3e406c2be5c67384585d833852ebb586fb7b7b0 SHA512 f0114c3eea0fa55a8105c3111ddd1c3bf15acf14747529ffd3c4b31a25328571ba85f22ef7b7e5f83113a4bb1dce77029abf279ec46d78bf955cd7ccb77eaf40
+EBUILD upx-bin-3.95.ebuild 1254 BLAKE2B b8fc97956fadb027e3dc3ca47be0a6dc2b09f4ab9412f813d8f4e7541c9cc71beac83e690745e5c909e624eceed31b25ccd566bee750aa3a7942fcc71754f73f SHA512 00a395bcb90d39350f940d2a14a326126a5dd6418b1365789905eb30fe4607ac79bc3f86dd6cf12eb349f82248dbe74f55fb65cb173002ff885e9050db794b4b
+MISC metadata.xml 556 BLAKE2B 79efa27ad3c90188372a09e32997f8e2a6259e546a91518c9b332f5b659f5d21bce26862a0a532a0b63e5fcba3efbb717a1518325184d7f931931a084cbd0396 SHA512 fa0d21d7f5c7b7cdecd54b9c438d1151af0baadb207297cfaa26d7f0230e538156561aeeccd50ef23b7060f6e7d653282a59fabaf6f866aca49cdf0970c35b36
diff --git a/app-arch/upx-bin/metadata.xml b/app-arch/upx-bin/metadata.xml
index 2de76921550c..97da883f8ae3 100644
--- a/app-arch/upx-bin/metadata.xml
+++ b/app-arch/upx-bin/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>UPX is a versatile executable packer with a excellent
-	compression ratio.</longdescription>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">upx</remote-id>
+		<remote-id type="github">upx/upx</remote-id>
 	</upstream>
+	<longdescription>UPX is a versatile executable packer with a excellent compression ratio</longdescription>
 </pkgmetadata>
diff --git a/app-arch/upx-bin/upx-bin-3.91.ebuild b/app-arch/upx-bin/upx-bin-3.91.ebuild
deleted file mode 100644
index d0bd63bbbf48..000000000000
--- a/app-arch/upx-bin/upx-bin-3.91.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit pax-utils
-
-MY_P="${PN/-bin}-${PV}"
-DESCRIPTION="Ultimate Packer for eXecutables, binary version with proprietary NRV compression"
-HOMEPAGE="http://upx.sourceforge.net/"
-SRC_URI="x86? ( http://upx.sourceforge.net/download/${MY_P}-i386_linux.tar.bz2 )
-	amd64? ( http://upx.sourceforge.net/download/${MY_P}-amd64_linux.tar.bz2 )
-	ppc? ( http://upx.sourceforge.net/download/${MY_P}-powerpc_linux.tar.bz2 )
-	arm? ( http://upx.sourceforge.net/download/${MY_P}-armeb_linux.tar.bz2 )
-	mips? ( http://upx.sourceforge.net/download/${MY_P}-mipsel_linux.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-RESTRICT="strip"
-
-RDEPEND="!app-arch/upx-ucl"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/opt/bin/upx"
-
-src_install() {
-	cd ${MY_P}*
-	into /opt
-	dobin upx
-	pax-mark -m "${ED}"/opt/bin/upx
-	doman upx.1
-	dodoc upx.doc BUGS NEWS README* THANKS TODO
-	dohtml upx.html
-}
diff --git a/app-arch/upx-bin/upx-bin-3.95.ebuild b/app-arch/upx-bin/upx-bin-3.95.ebuild
new file mode 100644
index 000000000000..affd20a17ce8
--- /dev/null
+++ b/app-arch/upx-bin/upx-bin-3.95.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P="${PN/-bin}-${PV}"
+
+DESCRIPTION="Ultimate Packer for eXecutables, binary version with proprietary NRV compression"
+HOMEPAGE="https://upx.github.io/"
+SRC_URI="x86? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-i386_linux.tar.xz )
+	amd64? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-amd64_linux.tar.xz )
+	arm64? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-arm64_linux.tar.xz )
+	arm? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-armeb_linux.tar.xz )
+	mips? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-mipsel_linux.tar.xz )
+	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"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="!app-arch/upx"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/opt/bin/upx"
+
+src_install() {
+	cd ${MY_P}* || die
+	into /opt
+	dobin upx
+	pax-mark -m "${ED}"/opt/bin/upx
+	doman upx.1
+	dodoc upx.doc BUGS NEWS README* THANKS upx.html
+}
diff --git a/app-arch/upx-ucl/Manifest b/app-arch/upx-ucl/Manifest
deleted file mode 100644
index 5e4a62927317..000000000000
--- a/app-arch/upx-ucl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST lzma465.tar.bz2 288122 BLAKE2B 93fa080e6539bef79d8d0baff781b9e41329f649724991f608cfa9ee651e79b20cf38d27efa96fe848e61111ff355f58dfde81f0743e1d5f0d701d72e512c70d SHA512 690f005cfa9d3a65db03baddad57cf8dd79f861ac72d2e1bc18a151f3673d5f8043e3331f5dc3fba713dfd7b01ebf0817a2c0b6a1b22e1f7d8255a42b85ea4ac
-DIST upx-3.91-src.tar.bz2 904747 BLAKE2B e9888368e5ddb62dc3cf14bd39a6101c31621c9a1ce2529957cb5c96bd70845db01a2e2f73a5b64dd7b33c9e18679f8e134fffdea41bc5b3663ff350c6de3a6c SHA512 7e9a392fe11daf7baf9632f2c448ef9936da7dfab215f86ba417e9f097770949acb653aaabe6cc5ed812efc486cb35e0c1e128c80026b02825713d8b12251cf5
-EBUILD upx-ucl-3.91.ebuild 1019 BLAKE2B 320d16cddd00e2a39c34fce980535075ab8ac6bfa66b07036992899de80bc78064350d884408c5495382c30e0cb461520f5b5d9d444ebdc875ef6ae740fa609b SHA512 fedea6f60f1360edc30fb28d47ebe373f81ca909d3a13a1b5abe866a6bd5daa63dece6dcfdd2a6dbe3ab9e99cef17e0725379b25abcd8a35fe71bddbd52bc8a5
-MISC metadata.xml 353 BLAKE2B 2a5fc5ef626a2615288b06340627b823187ef1b825697a546691814f3a3c1d410a3824fcf07e3c141d5e56000912c19130412e0252ed501cf3f0229d952c8b42 SHA512 b5aa861749330f58aebf8c047c68f43dae170612d140bbbb795fc79b6db5f625977debebb5f36dcd77c229d1e39b79089400133e0c35817ea9f78adb2fad44e6
diff --git a/app-arch/upx-ucl/metadata.xml b/app-arch/upx-ucl/metadata.xml
deleted file mode 100644
index a9b5374e66fe..000000000000
--- a/app-arch/upx-ucl/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>UPX is a versatile executable packer with a excellent compression ratio</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">sevenzip</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-arch/upx-ucl/upx-ucl-3.91.ebuild b/app-arch/upx-ucl/upx-ucl-3.91.ebuild
deleted file mode 100644
index 6950dc176bdb..000000000000
--- a/app-arch/upx-ucl/upx-ucl-3.91.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-LZMA_VER=465
-#LZMA_VER=920
-MY_P="${P/-ucl}-src"
-DESCRIPTION="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)"
-HOMEPAGE="http://upx.sourceforge.net/"
-SRC_URI="http://upx.sourceforge.net/download/${MY_P}.tar.bz2
-	lzma? ( mirror://sourceforge/sevenzip/lzma${LZMA_VER}.tar.bz2 )"
-
-LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="lzma zlib"
-
-RDEPEND=">=dev-libs/ucl-1.02
-	!app-arch/upx
-	!app-arch/upx-bin"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	use zlib && append-cppflags -DWITH_ZLIB=1
-}
-
-src_compile() {
-	tc-export CXX
-	emake UPX_LZMADIR="${WORKDIR}" all
-}
-
-src_install() {
-	newbin src/upx.out upx
-	dodoc BUGS NEWS PROJECTS README* THANKS TODO doc/*.txt
-	dohtml doc/upx.html
-	doman doc/upx.1
-}
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
new file mode 100644
index 000000000000..6ae8400a5453
--- /dev/null
+++ b/app-arch/upx/Manifest
@@ -0,0 +1,3 @@
+DIST upx-3.95-src.tar.xz 790776 BLAKE2B e7e5e24ba3675ab9f9f3daa36d6d3f00b6af614c2ca64c4d185a065afcdc02373ccf0200f7116ebbfaa1f9b961078f40296b1c716eca80aba86e95d6a9463b99 SHA512 0e1d3e26462057f16587197e73301957e870107808fdbcd24d9976094dfa0e5efbe8da0f9b6732a99f05990dcd4be242a87ea19a7110dc052c6dc982cd596416
+EBUILD upx-3.95.ebuild 807 BLAKE2B 388441afc4a845b9528915a24c8999ba81af251534cefa3ddbd006bdbf1abb9476b536f2c7e857ead636965826d9006fcb29a4c3c27acbfd46401fdf3aef0c3f SHA512 a0884c0ca7e0501d968e364b6726fd4f3eda15bcea687bc77b1eb150da4f27bfc80cc152a0f55cc2223211d9ab81f8bc2f4f3499de5e62bec2860dc989f1720e
+MISC metadata.xml 556 BLAKE2B 79efa27ad3c90188372a09e32997f8e2a6259e546a91518c9b332f5b659f5d21bce26862a0a532a0b63e5fcba3efbb717a1518325184d7f931931a084cbd0396 SHA512 fa0d21d7f5c7b7cdecd54b9c438d1151af0baadb207297cfaa26d7f0230e538156561aeeccd50ef23b7060f6e7d653282a59fabaf6f866aca49cdf0970c35b36
diff --git a/app-arch/upx/metadata.xml b/app-arch/upx/metadata.xml
new file mode 100644
index 000000000000..97da883f8ae3
--- /dev/null
+++ b/app-arch/upx/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">upx/upx</remote-id>
+	</upstream>
+	<longdescription>UPX is a versatile executable packer with a excellent compression ratio</longdescription>
+</pkgmetadata>
diff --git a/app-arch/upx/upx-3.95.ebuild b/app-arch/upx/upx-3.95.ebuild
new file mode 100644
index 000000000000..f0ea16873abd
--- /dev/null
+++ b/app-arch/upx/upx-3.95.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 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="http://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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/ucl-1.03
+	sys-libs/zlib
+	!app-arch/upx-bin"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/${P}-src"
+
+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/vimball/Manifest b/app-arch/vimball/Manifest
index 608442dae57d..80c6687b0e31 100644
--- a/app-arch/vimball/Manifest
+++ b/app-arch/vimball/Manifest
@@ -1,4 +1,4 @@
 DIST vimball-0.5.1.tar.gz 5246 BLAKE2B 8ce95bfe8872f69e501b4453e5a6644d8019367173f8675325775dee58e08618b9ec0908bca9df04839bc165b086d8e5195a0753827d6038d8ccd8adbab80c35 SHA512 f89ba7291e3f4146f2ada7934b0ca74524abc639e586da12e19882e9aebe3f14858a6145b830a32dc19b0deb61f652375d8a56dc7847fd0061d14a2d77208549
-EBUILD vimball-0.5.1.ebuild 651 BLAKE2B f83423486466be61904bf00b08e7dd9dd44773f9a81703549a361a883b857260cec07ba1f806b099c048678e2bae585e4a6b7070364cd06f5bd30a10ad237b5c SHA512 b037210fe9ed5e1d87e2ed506e326d4dc13e42684bc270d1f5d781c99bca013207ddc7a24bc7184c6beead1c3579bf23d4bd31ac45827c88c434eebc653ebf94
-EBUILD vimball-9999.ebuild 649 BLAKE2B 51ebe4c37ebd19274da33409d6db542fd4662a06dfa4d4082dd49f6e1170609e97701a962baf10f0addba1643c167a0ba7831138b726e3cad4f51b77040c3196 SHA512 eae5e949a63aa704b368723c07cdf072735c677c3bbd7a6fd1fa31569c716a86462db57c5c16f43b0b7a1eed12762f552b1123627f597685bedfb3aa7873e3ec
+EBUILD vimball-0.5.1.ebuild 691 BLAKE2B 29527bfb7f6ea8a6af08ff2f935d3a4482b633548c8382e9e6b66934f6a9c158411c47e7be748f7ba280474ee9e885f7ace09c5dcd83f1d6c4bbe7fcbddefb6c SHA512 2c7965147ed6570b9617e58d1687ae090cf274546674f27dedeffbe3c3bcaf1a896c6432973c1a12a9444b98b5d9e36ccab9a264db23d94b69a5441f7e720981
+EBUILD vimball-9999.ebuild 691 BLAKE2B 29527bfb7f6ea8a6af08ff2f935d3a4482b633548c8382e9e6b66934f6a9c158411c47e7be748f7ba280474ee9e885f7ace09c5dcd83f1d6c4bbe7fcbddefb6c SHA512 2c7965147ed6570b9617e58d1687ae090cf274546674f27dedeffbe3c3bcaf1a896c6432973c1a12a9444b98b5d9e36ccab9a264db23d94b69a5441f7e720981
 MISC metadata.xml 385 BLAKE2B 5fa1db1263983a5d57031cb72bf9e2b7074faf2134bea6a8cc02d67f9e48ce198c2a8d4a478029d9e3303555c9d248f96e83e6e8071ea7b055f90bb25d38402c SHA512 7086cce11a9a20d93dd24741e060d289c90bbc3c20d5102452d4c987597921b00195badd68d916a64b03faa5dae1fa4adb68654bce5c70c2e1cfa5d8417b33c3
diff --git a/app-arch/vimball/vimball-0.5.1.ebuild b/app-arch/vimball/vimball-0.5.1.ebuild
index 56775e8beca6..280fc206bc04 100644
--- a/app-arch/vimball/vimball-0.5.1.ebuild
+++ b/app-arch/vimball/vimball-0.5.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
@@ -19,10 +19,11 @@ HOMEPAGE="https://github.com/radhermit/vimball"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}"
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
 	esetup.py test
diff --git a/app-arch/vimball/vimball-9999.ebuild b/app-arch/vimball/vimball-9999.ebuild
index 82a39960d3ea..280fc206bc04 100644
--- a/app-arch/vimball/vimball-9999.ebuild
+++ b/app-arch/vimball/vimball-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
@@ -19,10 +19,11 @@ HOMEPAGE="https://github.com/radhermit/vimball"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}"
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
 	esetup.py test
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
commit	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree	326613a08f25851c388715e205576a2e7d25dc4f /app-arch
parent	b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)