gentoo resync : 19.07.2019

29 files changed, 260 insertions, 29 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index d44e1213cf19..08cd96b7a9ce 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bsdsfv/Manifest b/app-arch/bsdsfv/Manifest
index a491a5f4b0da..1c8e1fb99216 100644
--- a/app-arch/bsdsfv/Manifest
+++ b/app-arch/bsdsfv/Manifest
@@ -1,4 +1,4 @@
 AUX bsdsfv-1.18-64bit.patch 2388 BLAKE2B 377975f51f211c90cb9f7571c4b6e437cb75a536238aa703321efcc6ddd13e19b9649468eb8c5aaa23f5ad982148fe92bdb65fb8ef40023d7a4375133810d6c8 SHA512 5831956791b03972b1fdd3199687b10e7a55d562e815f94b863fb75a549eec14b85488bb0a9c9e5d2fb3241a95846f710dd5b19547ce33c425da756c685c18a5
 DIST bsdsfv-1.18.tar.gz 13301 BLAKE2B 663ae589e67455dbea968aeedaed74ed8f267fdb9790417da3d61aec9b3f50a5d87857c5e0f39a359d8b20ebd0bf706c5b775bf61c617669c479460ae8e2ff60 SHA512 f2742cfc5c56c915aff7534eb07025394c57bebf74d6505dc1d7e814e5ca098b474a718ae1c2aeb993cf95dd55fc792c56f9ac80344d112738da2f20157647e6
 EBUILD bsdsfv-1.18-r2.ebuild 582 BLAKE2B abe3c1765ca5dbc8c0996ce4be024f5dde3be36d45a7f9f12d429cf15980815ba663fd4d2a1b21f22f26cdd337f8612d24ec0368a5ce0adccdf9ab6b7138fe87 SHA512 bde8f6f8622c1d7e0ce9091a880b6294ea0f5ec9220378cae97477009eb71c5e033b70b5917fcb5e2641b8eda833c977939a0af40f00e2e824e47cac38bba388
-MISC metadata.xml 282 BLAKE2B 85a3c7f911e18e6a016a1f4a8f79cb25a92b2694a5600cd4af94982babeb156ed4976e2ba5884de772931bcf88133a82d0d00e2a195505f1efaea2316723488b SHA512 49b0ecc9bdba3c6b9a5fb98b41f0a1b4f2f17a9d2eda12c7bfd26d90552237106dec26ba5ae159b4b3e9a1e06e6e0d62be934fa2c01e36df95fc11be8b2506e4
+MISC metadata.xml 309 BLAKE2B 4b2f7c2d25c38ffd3a43fdc64bdafb3e28dead993ce6fdf2302b4cfea2a947e77d1242d145f0bf668ac85a6a118524da418a1f361a69b7064851d14ec8007888 SHA512 a741f56a3f1ccde998c0504b75dac3e3cdf49b2fd7f08f1906f97be7a496ef04b3692a90f27863b7e1d9b8361ac7aeebd8bbc337bc2134eff3324a41ad7353ea
diff --git a/app-arch/bsdsfv/metadata.xml b/app-arch/bsdsfv/metadata.xml
index 869fcb41c15f..f7ca6ac634f8 100644
--- a/app-arch/bsdsfv/metadata.xml
+++ b/app-arch/bsdsfv/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <longdescription>A all in one SFV utility.</longdescription>
   <upstream>
     <remote-id type="sourceforge">bsdsfv</remote-id>
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 55a262430413..d9ac4d324c6d 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -11,9 +11,14 @@ AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e
 AUX bzip2-1.0.6-ubsan-error.patch 921 BLAKE2B a2d746725ed9e40f24ac7c83cdbea06884e0013121bad5a2c748975817293c8f300735d46c85e646e008a54d49d002331a86a31726bc7231451514e628ad4637 SHA512 871ad39056b5b5dba35d90f30e1753569241f1054a2564f115d65186232fd84c427c92199e88ba012b4a646d9f18469b3681ef2992ec028b1004f6b7e13a110d
 AUX bzip2-1.0.7-out-of-tree-build.patch 1999 BLAKE2B b1737d4d693a092819227d70b8ab762257481cf1b776ff21a5327f0a6f185ddc440f963f798e597a09bbb34b69b36a3d5a6b6971d835367f35696ef8ea83208f SHA512 db8e9214e21bc1ee28bab614f0f086fc5b58fe9ce22ceb9341ecc6411dac26fcb5f72d94f02c0520eb6ffb4ab12e98858f5000ce9982be7a38db48701828f91d
 AUX bzip2-1.0.7-saneso.patch 465 BLAKE2B 166abf5793c924e0501716e59feb42366b352670bda399e39141a1461048b30c05c89cf81092f84acd9d8b5ed8a45e018cb394a3d0d644e0012b4ec9d3609c62 SHA512 09d671a8bab59392b3e75529b3b09dc50c8270005885baa1e5fb956568528b662de2ed2bc54c6bb58e4eb532d6a0c01318fb348ea76447263f9873aee3992a32
+AUX bzip2-1.0.8-mingw.patch 330 BLAKE2B 27cfec9fb3fb16f624445d0f035d56a6a747eaa1e602f92e651e6c041bb94ff78a17d0fb03314e2c1ac52afdff42f58cce725f1d733052ad3c4ad2574fe5a1c8 SHA512 49accf2bf744079b5fc4e4349e26dfaaf79a791ac871ffeb1220f8a3c700ca9d502ae78a8ec57b06f072707de1a0df64799d2bc6fe5f26d2c2b58637bb9103f4
+AUX bzip2-1.0.8-out-of-tree-build.patch 1999 BLAKE2B 45eb5383f1d52adb5c426937f6495c53f665220f0ab8680ae47c124935518199ab7d8ab1b2a893b2a3c9914a82b0c119d60b37673410e8052c5931f3f7b5b948 SHA512 d0dcda2614ee215245165fc5e6530f9e6850bd235b7894ab297d730378c63e6e71b1698e71606552497fbdc452546929f1ad8ee43fd99b28c9727cf6e9cf4c5c
+AUX bzip2-1.0.8-saneso.patch 465 BLAKE2B 7af873611a22431a80e1781a219de6d8838a2cb7c4af89c5354b01668fec71072eb9dec9a721d793680d0cc3307ac4d9657c1571a2a3bee69a22031aca961a28 SHA512 3c1171a441d73e098dde2ecc676419eeda2bc3a04491496781d60371ef73d13f80419f7a04fc5162a34373f9fda5c54eb9139399ba59a3ee52d7defb9bb91375
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a SHA512 e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8
-EBUILD bzip2-1.0.6-r11.ebuild 3158 BLAKE2B d1eb6c4e92bda0c1190373820b36a58b4eb1927717f6dd828a3867e616f02a9d725309dd239ad7346e6cc935f945bd32c6a83336b4fb5d7f774e1aaaa9a9e029 SHA512 d172d4d20fc6dbe7db700d165c5c75458c59154d255b40d0be0d5380fa88b606db82ddd88a87077521db0e4749bf0f005aa20870ce9722f06c71bdc8efef479a
-EBUILD bzip2-1.0.7.ebuild 3026 BLAKE2B 1158374c7d219ce05c77338550f12f41fac165d2b98736c203e2f59a1ca352298f9af47827fda0ee87704cddf2da1ee6d811198c876a0b8d56ab23c231412fc9 SHA512 e5aad0dbd1b96f8ab1b323ca1a8a278d9fa4f48103cb13efba2351d3fb546438a4c40932516872725267736bee91787aa48e430cdaa9efa9fd9214b29b7b756c
-EBUILD bzip2-9999.ebuild 1404 BLAKE2B 3e6093b7b44d8e5b9da46f9cffd8efa73e2118711d4e3f87dda2f21ed7ae8fed9d7260b027a4b0b78136350ce7e741bd785fecad7c25b1889537d50b6658af8f SHA512 ab9db8ef978fc43dc71406dc6f8991568770fc059dba34cf360d7fcb4a41fccc86b9c3b5323fa8b7f8ad130cbc9f1fcfa8212ff3fb9b79d63b5e426f4ef132a3
+DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
+EBUILD bzip2-1.0.6-r11.ebuild 3171 BLAKE2B 3e39109f16e6acfbd0f209fe9271446ec4d5932ce0f0ec52dcec9ebf8f1289e5f337c1cdd0787ff9819fe3c03b40751e01252a7aa7c625fa3680c47f1de05666 SHA512 6a37ee93825f8fb19bf914cdb2cf7e882b1e3b2885893df34ed44894e0b8c7d647b31820e106ef03920ced52c4e391647f72bbe76c2ca30b707ab025bd80e4f4
+EBUILD bzip2-1.0.7.ebuild 3039 BLAKE2B fda8ce3919743fb2d2e7d97d075a711ba38fa184558566035cba1306a686a83a8b50b321848f4230335611850675464e5ce15689e079cb25039a1e3f6c7e597f SHA512 6add454fa769e983b99e8a72b2aa14b990a7a693a019f49b9f3e1e85c111644c964460a06dc3f1772a1bd32b720e2643a5a1754f96d3ef0b13e3718408d7b1b4
+EBUILD bzip2-1.0.8.ebuild 2986 BLAKE2B 3678c8015221602f36aed4f3bc03aa8336d55d2b3608646b7ebb45f45f7b97e946a4e433e8038b95e53aa86706bdb6e5d62c14ffeb46ab9839a1347db8e089f8 SHA512 242ce10c80b7bf6e8dde9770cb73c8962dde7d4804217ae18664615a43a3160f3185fae81c7c2a6ef592915748f621b795d52c2da15b028ab62f03663b1f84f3
+EBUILD bzip2-9999.ebuild 1417 BLAKE2B b1e5244700abb4ab7cfbe8642af2cf78aed7d32676fba72b158843e79cf081314b7f9f422abac2ec753ec35b12b463f7dbc1524fdd01f04c088c1357789fccff SHA512 304684431b8fe792beb5adc0d0935ae3b17e991ed2784f4ff1a3464657dab628b653c3f0cada32b1b2f85b2eaad1443df9ad965c237913242198d1add22549e6
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
index 0bad400bb1de..09361b3bc875 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=6
 
-inherit toolchain-funcs multilib-minimal
+inherit toolchain-funcs multilib-minimal usr-ldscript
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://sourceware.org/bzip2/"
diff --git a/app-arch/bzip2/bzip2-1.0.7.ebuild b/app-arch/bzip2/bzip2-1.0.7.ebuild
index b0538f6ddf11..eb484311ab63 100644
--- a/app-arch/bzip2/bzip2-1.0.7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.7.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs multilib-minimal
+inherit toolchain-funcs multilib-minimal usr-ldscript
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://sourceware.org/bzip2/"
diff --git a/app-arch/bzip2/bzip2-1.0.8.ebuild b/app-arch/bzip2/bzip2-1.0.8.ebuild
new file mode 100644
index 000000000000..ffd93f563cb2
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal usr-ldscript
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://sourceware.org/bzip2/"
+SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.0.8-saneso.patch
+	"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+	"${FILESDIR}"/${PN}-1.0.6-progress.patch
+	"${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	"${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
+	"${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+	default
+
+	# - Use right man path
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die
+}
+
+bemake() {
+	emake \
+		VPATH="${S}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	bemake -f "${S}"/Makefile-libbz2_so all
+	# Make sure we link against the shared lib #504648
+	ln -s libbz2.so.${PV} libbz2.so || die
+	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
+}
+
+multilib_src_install() {
+	into /usr
+
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2.so.${PV}
+	local v
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+	done
+	use static-libs && dolib.a libbz2.a
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a bz2
+
+		dobin bzip2recover
+		into /
+		dobin bzip2
+	fi
+}
+
+multilib_src_install_all() {
+	# `make install` doesn't cope with out-of-tree builds, nor with
+	# installing just non-binaries, so handle things ourselves.
+	insinto /usr/include
+	doins bzlib.h
+	into /usr
+	dobin bz{diff,grep,more}
+	doman *.1
+
+	dosym bzdiff /usr/bin/bzcmp
+	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+	dosym bzmore /usr/bin/bzless
+	dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+	local x
+	for x in bunzip2 bzcat bzip2recover ; do
+		dosym bzip2.1 /usr/share/man/man1/${x}.1
+	done
+	for x in bz{e,f}grep ; do
+		dosym bzgrep /usr/bin/${x}
+		dosym bzgrep.1 /usr/share/man/man1/${x}.1
+	done
+
+	einstalldocs
+
+	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
+	dosym bzip2 /bin/bzcat
+	dosym bzip2 /bin/bunzip2
+}
diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild
index 1b4bac424b04..18d203a04c24 100644
--- a/app-arch/bzip2/bzip2-9999.ebuild
+++ b/app-arch/bzip2/bzip2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit meson multilib-minimal
+inherit meson multilib-minimal usr-ldscript
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://gitlab.com/federicomenaquintero/bzip2"
diff --git a/app-arch/bzip2/files/bzip2-1.0.8-mingw.patch b/app-arch/bzip2/files/bzip2-1.0.8-mingw.patch
new file mode 100644
index 000000000000..b512a8f466e2
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.8-mingw.patch
@@ -0,0 +1,16 @@
+make it build for mingw targets
+
+https://bugs.gentoo.org/393573
+
+--- a/bzlib.h
++++ b/bzlib.h
+@@ -81,6 +81,9 @@ typedef
+       /* windows.h define small to char */
+ #      undef small
+ #   endif
++#   ifndef WINAPI
++#   define WINAPI
++#   endif
+ #   ifdef BZ_EXPORT
+ #   define BZ_API(func) WINAPI func
+ #   define BZ_EXTERN extern
diff --git a/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
new file mode 100644
index 000000000000..4a641fdb2e81
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
@@ -0,0 +1,76 @@
+--- bzip2-1.0.8/Makefile
++++ bzip2-1.0.8/Makefile
+@@ -54,7 +54,6 @@
+ 
+ check: test
+ test: bzip2
+-	@cat words1
+ 	./bzip2 -1  < sample1.ref > sample1.rb2
+ 	./bzip2 -2  < sample2.ref > sample2.rb2
+ 	./bzip2 -3  < sample3.ref > sample3.rb2
+@@ -67,7 +66,6 @@
+ 	cmp sample1.tst sample1.ref
+ 	cmp sample2.tst sample2.ref
+ 	cmp sample3.tst sample3.ref
+-	@cat words3
+ 
+ install: bzip2 bzip2recover
+ 	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+@@ -113,25 +111,8 @@
+ 	sample1.rb2 sample2.rb2 sample3.rb2 \
+ 	sample1.tst sample2.tst sample3.tst
+ 
+-blocksort.o: blocksort.c
+-	@cat words0
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
+-bzip2.o: bzip2.c
+-	$(CC) $(CFLAGS) -c bzip2.c
+-bzip2recover.o: bzip2recover.c
+-	$(CC) $(CFLAGS) -c bzip2recover.c
++%.o: %.c
++	$(CC) $(CFLAGS) -c $<
+ 
+ 
+ distclean: clean
+--- bzip2-1.0.8/Makefile-libbz2_so
++++ bzip2-1.0.8/Makefile-libbz2_so
+@@ -36,24 +36,10 @@
+ 
+ all: $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
+-	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.8 libbz2.so.1.0
++	ln -sf libbz2.so.1.0.8 libbz2.so.1.0
+ 
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared
+ 
+-blocksort.o: blocksort.c
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
++%.o: %.c
++	$(CC) $(CFLAGS) -c $<
diff --git a/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
new file mode 100644
index 000000000000..08430831baad
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
@@ -0,0 +1,13 @@
+--- bzip2-1.0.8/Makefile-libbz2_so
++++ bzip2-1.0.8/Makefile-libbz2_so
+@@ -35,8 +35,8 @@
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
+-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
+ 	rm -f libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.8 libbz2.so.1.0
+ 
diff --git a/app-arch/deb2targz/Manifest b/app-arch/deb2targz/Manifest
index 415625766459..d27799480442 100644
--- a/app-arch/deb2targz/Manifest
+++ b/app-arch/deb2targz/Manifest
@@ -1,5 +1,5 @@
 AUX deb2targz-any-data.patch 602 BLAKE2B ee85b284a594cc937e73ea66c24960fdbecf547742c1db010d90e10af72aa667c267fb13f858ca221d80c16af26c09fcaa9812567f0f5b7e9b015d5a44d3cb66 SHA512 0dfc301d17b171e52867e0837701596b60c697cc7a0520f0c003be8146d1d1470305186d443c1f7a4757938b06b2261cfb66f84f5a5776998681b9300bc20903
 DIST deb2targz 1947 BLAKE2B bfbe08a5671bda8da3a5d897f58aca863988a9ec7b7cf23ee81fb45e2bf85bd8b0909457bdc2cb545d42ccb5f56fda5559bd40547231c1c52441bf0b3560173b SHA512 9b6a533fbe232721304f3bc1d9ea952f78fb108ace3bd0a0eab206be8462bc547ff49ab9310f209079b9ed6f86413c8f0819a117b95c67b6082e37d416716b1c
 EBUILD deb2targz-1-r2.ebuild 646 BLAKE2B 4bbad5f015e86c02b923ae39fbbe51eb6c04c95b5977dae1de48faffcb698c611401cfebad4d06b13aec7ea8acb365254fa26267be0c60e6a103634d17797d0b SHA512 496a8acfabeff21f0f0e14dba5242d23f1cd1820c7b0bc2ebb2cce8ac5ab12582a9d1dfd75966f2ca915303064ff06962e4b48da89bc2b7ff4101fca0e2dee2b
-EBUILD deb2targz-1-r3.ebuild 628 BLAKE2B 33ca6ecaca769bb380242e93a598b5cc46034ccb1f5655296355a54f07aead89419e048ff858c43a82fdaf1382bd7440667c94c57ce0c02c81c4c61e0102fdea SHA512 81715a2baa5566feab94ea21f994e8485101f39b6767444dbdfd93548b150c72ca2ecf7cf4fd4ab493157d122a9be3fc33b1269a1fa0e2f25abe569a4ee48391
+EBUILD deb2targz-1-r3.ebuild 628 BLAKE2B 96eb9cc43fb14b6ecc10b38432bb3243d4a8ec384cdddad4ad82f3b792a8f4ba073dd201aa38a7d3d216abd46bb19a9a6da36aeb9526b5d734dcdc207adc46d1 SHA512 3e389e137b2cdd26bea106c3d06c2e67ef113cb4225a266d1011ec5bb3ab5f6968c8ebf03ec8125dde4ced1db19760ac9a25d85fb373a3572f38eba93681905f
 MISC metadata.xml 213 BLAKE2B a6b42a8b7c6f0c5a0b853af172e748301d2f4b9f2aa0424e217029affb54c88b1061dd970241a942e59a2a5ec66521ab9b67818181c03bd1dd019965e39eab3d SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380
diff --git a/app-arch/deb2targz/deb2targz-1-r3.ebuild b/app-arch/deb2targz/deb2targz-1-r3.ebuild
index ce36ff46f149..358edbadab54 100644
--- a/app-arch/deb2targz/deb2targz-1-r3.ebuild
+++ b/app-arch/deb2targz/deb2targz-1-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~amd64-linux ~arm ~hppa ~ia64 ~ppc ~ppc-aix ~ppc-macos ~ppc64 ~sparc ~sparc-solaris ~x86 ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/app-arch/duff/Manifest b/app-arch/duff/Manifest
index 10a89a742e26..409cfe2c619e 100644
--- a/app-arch/duff/Manifest
+++ b/app-arch/duff/Manifest
@@ -1,3 +1,3 @@
 DIST duff-0.5.2.tar.bz2 174545 BLAKE2B 1e2b75a4999333f062a8b25c750f35e785038a5d3ec0264112352fae20af25b8990727287f446d7523c699701b963fdca658241288bd0e79b27751e3be3c4ea3 SHA512 5f64c28ab86523dd4dffaf26dac67d10bea71bd5cf7b4eaa3dfa27309cf8e7cf37a74ee62b5f3df3cb0114a847711b3147a083cbdd72ab8e4b5f9a45c908f333
-EBUILD duff-0.5.2.ebuild 504 BLAKE2B ad8cbb8792abc836acc24a373ee203fa06f75ad58986287533143e9a7864b95d5da76a68cd2356e9d3e640e4cbf5f1f56c6b32e00e48d426db4a3d6ea802ff8f SHA512 08c7e4819ee8975fd5a5e65176356d822630384d711bf7b7ee9350231d7170c1b13badf2218c44a9111288c87d952a1af102253084b1110e6fe88f1742bed577
+EBUILD duff-0.5.2.ebuild 501 BLAKE2B 2c84ea6a5c37857a688dbfafa998f38fed170eee08092ebe10638f2c6cd5d7c5de553b4fa6720a6a2e2b104a026eacb3b3d35047e9923a193a22cbeecea56667 SHA512 34a8d2e93dee9f133d516910045381f4172a67ae2e65eb0917482ebe89dfa75171d94bb517d873bb6868c26ea30ba228e1c3be487f11d1e56e71d8e189f0141c
 MISC metadata.xml 300 BLAKE2B d478e17714747688bca890580e4b0332e301bde95ffd03939e979a3e5a80b6f721b175686b69f6e9add4105ca3953f2905085a62dc0b7be1dfbedcb9f4c537cf SHA512 ef8d27bfa12bb1eb3a821a400c6fc897b5e387d0b99b4c4d5d03d472ca9ad3ed02a13657a9cd627cdd87a01fb7b709640238c223fb7123d5781dae7e48e9fa2e
diff --git a/app-arch/duff/duff-0.5.2.ebuild b/app-arch/duff/duff-0.5.2.ebuild
index 40a5c0d9cd75..ee113c8fa508 100644
--- a/app-arch/duff/duff-0.5.2.ebuild
+++ b/app-arch/duff/duff-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ HOMEPAGE="http://duff.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 RDEPEND=""
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index 7801d4424b46..6713cfe5c1b9 100644
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@@ -1,5 +1,5 @@
 AUX dump-0.4.46-openssl11.patch 3324 BLAKE2B 5cc60ef04e7f53e96e900bc78e41f4c4bcf46f3000663ac7bb1995856b5cf067c69d84331b5dfd52da4ef2649e61f6e410e59f9a99bff3be44f9e46df1b75b4f SHA512 ae7c2549683a4cf33760685fe5b07ca88b158e81f5e3b866e58f618dced4c5909dec231d07a1df590a5ebbbc9f0eee575e63f4ffae719afe01315d53d63a76b0
 DIST dump-0.4b46.tar.gz 578200 BLAKE2B 91102bdba06f3affdf4ebd9de525145c0a4cc1b9fb4c6ff222c411c118b3b7835f3aad666d530019d8b9ee46590e4a283a143d188d6800218100cecf67877274 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d
-EBUILD dump-0.4.46-r1.ebuild 2163 BLAKE2B 5f635773a87a38f5fdb9572cfcc515d5eebe6c6348a3c6912a5f683beb0818a4517d9fbe9b4eec5470a10219a5231f1a783552b7cbec56a10e51b552ffcd6ae6 SHA512 b5f9a6ae66f66b6a242f35e7dd45770ab4fd7982feb8ded709e8be6fff10c00935cd046d1000927ab948f9a6413060e4b2bd179c363ab2e2ae24b5e4e0fa7047
+EBUILD dump-0.4.46-r1.ebuild 2136 BLAKE2B 7d4509f80f75362097f509187e69b487bcb3babbbeea997cb01a4986aa2beb50e3220f4710a1521b7f83d1e8e9e1c54b9157dcc3d8d00ac3b642ae6061ae48fe SHA512 60e4aff1ddc2cc34c4e14b57cb346b79599f0a8aa9d9b11b29b4218a2a78d7eee9d0803c6f6ff5c8deaad92fe8144dc1af5503736a8237529995afb8204e798b
 EBUILD dump-0.4.46.ebuild 2113 BLAKE2B 431fd8ae0fa1c3b28015f27687c28f43a8d6fcb205c97a99f3d4ee1e96d3da7683456f02e4683b85c202848ddcc9efdaac85b63f31e0a4ad5fbf2d430465a8b5 SHA512 b99325a0d0cee4599e2e00ed40ea4a49050321c7b11d6fc2416dafa7b2dff56896d7861940ed009393e73dd514beb9f2b9c7e4c494664ed9c517987844ffba90
 MISC metadata.xml 542 BLAKE2B beff8763f8b3848f9592dbf200cb547e9c416e7d675b4e9015f20b417861523949916da4a6a38553abf7fdf5fc839841870f74258becb4e8dbbcbca9c564e328 SHA512 670b1e0032f69e22337cbd18c25ecda11a239d63345c32526e111ad2eb23199892aa7e1f39a79168bb4b81b6ebde4c7796f8ccf78233f3244bfbaf62c7e0345d
diff --git a/app-arch/dump/dump-0.4.46-r1.ebuild b/app-arch/dump/dump-0.4.46-r1.ebuild
index f984ca0ef78b..c3529b8a5bd7 100644
--- a/app-arch/dump/dump-0.4.46-r1.ebuild
+++ b/app-arch/dump/dump-0.4.46-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit versionator
-
-MY_P="${PN}-$(replace_version_separator 2 b)"
+MY_P="${PN}-$(ver_rs 2 b)"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Dump/restore ext2fs backup utilities"
 HOMEPAGE="http://dump.sourceforge.net/"
@@ -44,10 +42,14 @@ RDEPEND=">=sys-fs/e2fsprogs-1.27:=
 		static? ( sys-libs/ncurses:=[static-libs] )
 	)"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	virtual/os-headers"
+BDEPEND="
+	virtual/pkgconfig
+"
 
-PATCHES=( "${FILESDIR}"/${P}-openssl11.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-openssl11.patch
+)
 
 src_configure() {
 	local myeconfargs=(
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index 7b58b80ffaed..dbd0099c8f46 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -4,4 +4,4 @@ DIST lrzip-0.621.tar.bz2 503286 BLAKE2B 3fb80f72f0bb81340d4e83b996ad2cd94fc0067b
 DIST lrzip-0.631.tar.bz2 522158 BLAKE2B d0ffe63e1bdd21304d6d7a7dc969d4e79770fed105cf03ea9d504f890cda35178566afa5f88e13beadcc1095f052a014deada3b3f102247eadb8c746d989d119 SHA512 6420cd465ccd4581066408482335a82089f84f0aca1b05249b9fc6039b7e67df94457a7c871859e363206df3a40e93cfde576388785113f6c99b31d34c00a307
 EBUILD lrzip-0.621.ebuild 764 BLAKE2B df960ea53f8be42a3c77ff6e4f63969ab3d3d5d591c92d950c8f88c44b719edad1073271399d79bbb5e2d3ab1085b5875f3c811d3ffc660b843ef6296b8fefff SHA512 8fee8f421ebdb8e7e6f66cebbce65346a82f18a8e290fda9dc6295545c9132bbb2f48c1f30f2af880a939ab60f3ed58f74a15bb7939dc8390788bad0f84734b8
 EBUILD lrzip-0.631-r1.ebuild 1015 BLAKE2B 2b8da1555b9c184ea177731d43a6fe47ac9682d3301f2a400a8f7663421b4a51d2a449fcceb4c1306174249c04a3a7ed24da64e79029c26867c79a4f1e00cb54 SHA512 1fc98949066a4769b538a73fda86f484df6e1876ce9e1ea15d138cdce604f3025b8b50f1aeb6f00aa54d1b2fb55c58beac63bd65ab5932ef12cc6444dacf8553
-MISC metadata.xml 581 BLAKE2B e34acd5b35b3f661015d6323b59056a981a7cf41da0b2ee1e440b912022e20e3fb9fe8ea513aa071837320e1d280076e6eac0213add715f1e8b70554536a7c40 SHA512 392a7bd77026e5e4726390c4fc649805234b6fe2803115f205e22f7669675cb404bc0f1341f16ba59c622e1c922300b3a4dc0466b8c420da69a941cd49954c9a
+MISC metadata.xml 607 BLAKE2B 818153c4b56ca259dd824e13c396822f5373d094d50d104562984032f7656703dfd75e617d1d03279c05a52334a265191c633cd609d6c6e948a20fc937f866ca SHA512 7236540b6002789563681648ef8016c9b692f814134fac72ccaf7ada302c8cec3c53c88658bbf2afde7625d8c756dbb5efa6b8d395f8436fe028ed0d49c5206b
diff --git a/app-arch/lrzip/metadata.xml b/app-arch/lrzip/metadata.xml
index 136f7dc61c02..fba000cbc720 100644
--- a/app-arch/lrzip/metadata.xml
+++ b/app-arch/lrzip/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<longdescription>
 	This is a compression program optimised for large files. The larger the
 	file and the more memory you have, the better the compression advantage
diff --git a/app-arch/pet2tgz/Manifest b/app-arch/pet2tgz/Manifest
index d8d5dd388231..a4cc1ee7d309 100644
--- a/app-arch/pet2tgz/Manifest
+++ b/app-arch/pet2tgz/Manifest
@@ -1,3 +1,3 @@
 DIST pet2tgz-0.3.tar.gz 90758 BLAKE2B cfefb54467739e4b045c0ef927f6b21815ec59379635a81f782b6355d459715004ef29de0c9f76a3ce71d9b274ea3f066787d80efb20976316e36f2e486d0e93 SHA512 e6d2612c27184ea06114f9ee1927f0d1c6fa5f2bdecd85366d4b35564b59318a123159180eb3da747d46d4ddcdd2f4ec40def0b10d2882acafe5ed40e84826c5
 EBUILD pet2tgz-0.3.ebuild 343 BLAKE2B 37aebc398e047142749a6737049f7d3e7c49dd4e2dbb30a783f255f8ca1e8456e17d91f7e2f7b6e1780a6b3dc2eb7943ff3443f7d5403f39b60cd0696484574b SHA512 16dc40d1819da026f102234353bd76e02cce512234e4554b645ec076b621172ff16ccd036a15e0aa03224857ef49d91823da09ad52e3103fc62968d697dd5ead
-MISC metadata.xml 220 BLAKE2B 29393a6879c82eba92146de2269d51f8285d9e762dec1a78d3a75ce9ebe7e974adea4c8c015aa896680a196f051f38020b0642a0bd06af4c3b59d34e6902010b SHA512 97f16489a2e8400e75ba59f23e380a89e66d6e9765e2bb3ca309a99a797b525cd6f333194226aea6c933e99907d4fe13f95850d033e4273d8b61ca06814a6be5
+MISC metadata.xml 247 BLAKE2B 6a78ba89b0f5591cd8865331c6ea64fe768be848afc9b0e120ec69da3053a197e064404647c1af82a1cde02b050f0015b45f1afea8ad661e49ced455fdb4ad58 SHA512 45cf64f391c9d283c8e333f9d9a67c980afc89332f3cac538caf898e234a81f7bbce459b8fd65258ceec48ab7f8df22ecede31862775211536f76bf4f8d40e43
diff --git a/app-arch/pet2tgz/metadata.xml b/app-arch/pet2tgz/metadata.xml
index 913962483b48..5e531f2269f7 100644
--- a/app-arch/pet2tgz/metadata.xml
+++ b/app-arch/pet2tgz/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="sourceforge">pet2tgz</remote-id>
   </upstream>
diff --git a/app-arch/unmakeself/Manifest b/app-arch/unmakeself/Manifest
index c120a52d06af..3b4565f18415 100644
--- a/app-arch/unmakeself/Manifest
+++ b/app-arch/unmakeself/Manifest
@@ -1,3 +1,3 @@
 DIST unmakeself-1.1.tar.gz 3635 BLAKE2B 650a7f45dc5204f5ae42002addc5892fb3ce3d4d2b8b5ed343329cd34ae7086e1f680ddcb25123255feff1dd2a70d4427a30aa0a8ac7c0309b19847fefcb5390 SHA512 3e8a05a907b8807080208300f6c20577587a0e87000c6746ba457c276e4dff37c8d61227bd1db37e60ac20d9532290c4110a1204c8389a8a1e97a121b68c682b
 EBUILD unmakeself-1.1.ebuild 650 BLAKE2B 1c5979c4b1dc9bb6e72ae30fa82e96c8ab267ec75244658cf2d678a1e197a1ce6994e4bda91998c0c64532f3975000850b6416afa6b4f096f80a093214701a4a SHA512 223b4154e20e4b028353f5e417fefb5660f986cb80e5db698cf446c4b90b4160e82423050dc6c5e71de996e1bea49641b6d0c74c3328d4f88fdea275c0bde4b1
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/app-arch/unmakeself/metadata.xml b/app-arch/unmakeself/metadata.xml
index 097975e3adc2..c1744fe7fc5b 100644
--- a/app-arch/unmakeself/metadata.xml
+++ b/app-arch/unmakeself/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
 </pkgmetadata>
diff --git a/app-arch/unshield/Manifest b/app-arch/unshield/Manifest
index 6cc468b4621e..5e6c0cb55485 100644
--- a/app-arch/unshield/Manifest
+++ b/app-arch/unshield/Manifest
@@ -1,4 +1,4 @@
 AUX unshield-1.4.3-mandir.patch 776 BLAKE2B 6d0c23a3cf0457ffb03f8f6a08667bfec7bd2fe1744867febfd9ce9a786a0e7b84408cbd5a2c23eb94c68d33a17d2c638ab7e44ea6ae0d95d5c0cc280b0ed585 SHA512 4acc69f49e3828f1dac5448b22d6015cd1c4f551c22c9d824d0650790ec509d02e7ef13f18b58bc338d25d7e93bf334d2ae1bbf198b2b831c183707b22bceceb
 DIST unshield-1.4.3.tar.gz 58822 BLAKE2B 89e23462610d7ffd25358cb1d9f234b5c80a580deb60e85610ddacc8e3aa92420cb0e885e80375089e93786565824813f23c54f7c4d60b7773f23d174c98e5d7 SHA512 2f058e0a28d0497e2afe231ded1b1bb16745401398eb1035e628d263351b10a1343c9664f3937b8912755db9dc5236a1b43e9bcba596affb7aa8b036f49382aa
 EBUILD unshield-1.4.3.ebuild 887 BLAKE2B 0047de0c471b60bb51a4e7f4830eb8fd0cca449ca18e7b668f048ec1574792394243160c9974713d9a62f9da6b719c9f1db3b3da7e06b3998b937a3813ebddbe SHA512 a180935e33e5c92ffcc244360aa4142fa6103de44468155c3db5b2544e79586fa225f80a890a921858b33167fdffccf20fd5a121fbf1d0e08321f83d9fa00bfd
-MISC metadata.xml 224 BLAKE2B 39d3ea8455cb2158a24af3db4266dd569cd7765eafa967c5ae2a2cc9f9ceec9d0a8928b5e99d9e5bc5f610501bb6129f1648d6560e0a4980ef9e026dc821a164 SHA512 3c955bc3bb3a290848f9cc01472321c321ad63b98a10eb1a7986024db98c099e5a18c628c6398b37c42e69d333fe88d74cca5c22293aba196991aa317e6ed670
+MISC metadata.xml 251 BLAKE2B 2a365fe10b8039e015f37a0d9600d841dae51c6b14197a58f901c55af5eca111ee054674bbc294961c042e4445b6953b424f57149ef3f153c74999bd4613ccf8 SHA512 b8b90af336a046be33f7296d073b2be30c006fb5997ad3e65666231efa3fe55eebbaf7da468529831d79cbca17fbfc9be9e7c12189f1faca083d356eec765a73
diff --git a/app-arch/unshield/metadata.xml b/app-arch/unshield/metadata.xml
index 417ce2a21afc..9163e2a027d2 100644
--- a/app-arch/unshield/metadata.xml
+++ b/app-arch/unshield/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="github">twogood/unshield</remote-id>
   </upstream>
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 898a017eb16b..3ff2040da0b6 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,5 +1,5 @@
 DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b SHA512 e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
-EBUILD xz-utils-5.2.4-r2.ebuild 2693 BLAKE2B aa5671f827997a8f32a850f64e4f797223fe6c290c10ebacd626a37bcf2d79e2682e08b8c3da914333f76040c39d104bc3c87eed5bb78cf34208409ce6a9776d SHA512 958d42f3cadcf435322b749c7a573f1148646b10b9113695871c996ea9d7d9a30e060c45afa069faa121f6dd74fb45c7ca017794af2fe26ec5002e7d9fbb98e9
-EBUILD xz-utils-5.2.4-r3.ebuild 2631 BLAKE2B 6125a8e66e33920e836041a10bc7300f83b91796433207982686c177ca527a9c7b812fc49139bb96a7a949d9310981bf75a8e10d7e8d6743b1e9b5e25ce801ce SHA512 4a00c5a7b41d3dd00ee6490c0597eb5e4f56d8ead11fd2469af028ca1d1fcadee542b271f1237d05fdc2bb7c2dbe02704039967a01180a9d27eeef373c7d6812
-EBUILD xz-utils-9999.ebuild 2631 BLAKE2B 6125a8e66e33920e836041a10bc7300f83b91796433207982686c177ca527a9c7b812fc49139bb96a7a949d9310981bf75a8e10d7e8d6743b1e9b5e25ce801ce SHA512 4a00c5a7b41d3dd00ee6490c0597eb5e4f56d8ead11fd2469af028ca1d1fcadee542b271f1237d05fdc2bb7c2dbe02704039967a01180a9d27eeef373c7d6812
+EBUILD xz-utils-5.2.4-r2.ebuild 2706 BLAKE2B d7aafa86f26a9fd8b148cc4d9183365f323852b9dde311b2d91e394119e966379a99e242ec54b312fea89bd453b454035b0d8de0a802bfb4513fb2c675eaf68e SHA512 0aaa33811944233e533d4f90a9682658680371eb47e4e8adffcaec54763f3dad4b0b724e6f3e8e1f3c7b7358468d6f616b07db84c7ab6d6bf1543316c9b6f12b
+EBUILD xz-utils-5.2.4-r3.ebuild 2644 BLAKE2B e1a2bf99fc07ba1d7a7e690fab57f0d1ea0fb8d0fe3827c1cb624bbc9bbf67fc944a0ec1306fbde55ad6c0f1ea37d2a0d9d864653f97cc00e3459198a3b345b3 SHA512 9717a7c77306a020bd547a95bbb4b9ea1b08205800fc7e048ab99ef8027f404c0489224b9cb0d97e255d271c023de0fbb54ddf1126a3dd566bb20c95ddb246e2
+EBUILD xz-utils-9999.ebuild 2644 BLAKE2B e1a2bf99fc07ba1d7a7e690fab57f0d1ea0fb8d0fe3827c1cb624bbc9bbf67fc944a0ec1306fbde55ad6c0f1ea37d2a0d9d864653f97cc00e3459198a3b345b3 SHA512 9717a7c77306a020bd547a95bbb4b9ea1b08205800fc7e048ab99ef8027f404c0489224b9cb0d97e255d271c023de0fbb54ddf1126a3dd566bb20c95ddb246e2
 MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
index 3ba0a112b9ef..46b80edbb4e0 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=6
 
-inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
index 249d0a2b31e2..ac156fa115ad 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=6
 
-inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 249d0a2b31e2..ac156fa115ad 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=6
 
-inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.tukaani.org/xz.git"