gentoo Easter resync : 12.04.2020

9 files changed, 34 insertions, 19 deletions

diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 4e66a06afa75..6d9e22f878b7 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -9,16 +9,16 @@ AUX bzip2-1.0.6-out-of-tree-build.patch 2121 BLAKE2B ff2d18e161e2ed437b3452639b3
 AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e8f88d1ad906ef4bcecf4796ec125434b0e4d56f83715f30114d808aad9811b72cc890e85ace1901350d96f9d3f91 SHA512 e72ada256b08b539e4489d714d4d8612c643549cd25b1ec4e455b2c769c0955fe0e1f54504b259db213f3c72aa78c08d1f0513ce1ae113182691b504bd9c09b7
 AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e55a8491bec0318741dc53ad6da321553e73c8929c5fb4938e7275671c04d4b5c86730b580a042a18bb81b7116 SHA512 b9798368d12ab3547ccd3bb614e3a81f1b232990c0f9e3e4472532a8070a3c212274d5b9d093cd046cfee7c8d25da9cfd368c7ca4bd86fbb67f34510107159ab
 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.7-out-of-tree-build.patch 1997 BLAKE2B f4cb04658aa8bba2300a07080009e4b949875e206e302b0d39167899f507572d5f2a2065a22a2df70c3513e8c26bc4a89de7cf3dd8a3850061cd774236a194bd SHA512 f2c8a5ca920f5c3d6a515692fd657e10f381257bca14c1a296b6f54a8823a223aa8da881f9618df035601afad6778ba374a11d83ebf993f7f2e4c51855399e77
+AUX bzip2-1.0.7-saneso.patch 463 BLAKE2B e16398fa15e9eae5f277c1b075c171c351f234e403386c4a8702f9dc7ed2999ac9735f130796d3dab8349222a33997d371d873a76d8cf6c1e3300b88e9a40e17 SHA512 a039db1147236245743b844f68543f58f39e7e996f90d8e444d3b385bb56717ceb66703696be486fd57094971e52d88a87e36fcdd46cf8aa7f935bb7245b0723
 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
+AUX bzip2-1.0.8-out-of-tree-build.patch 1997 BLAKE2B 87791ad7b5c702110a7a45bb4a01908fcd2eb8f1b187c822991d818011e49165abaed679d899a2fa29adb6751faa82659e31c6e0f853b4548061f2913cb0cd18 SHA512 9008152aeb299825635eb9b6f4887951ba6ec190b7e545e12d82e2222ba4ed1ceb31e3eef1275b5f196b726e34a04da1e7c2c95a694c7c771a8852f20a1bf305
+AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8ababee2b5ff0221965f1ee6675c4060cec841dcf4370018a7fc6376cced900c6410eca96579962d52fd07563d SHA512 19d1a721680e4113c3b3267af74fa5a7ec5947c6630946c60ac5cf165476d9e7c2229e0cb099029dc9f5708b5ba15864f84af198940709144b65dbd2cd3a76a8
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a SHA512 e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
-EBUILD bzip2-1.0.6-r11.ebuild 3150 BLAKE2B f62cf794d8b4ebe499cacb70570485fe6798818160fbc61ba2a40fec56c6a359bf3bd98af46b2d7010a44fe808fce8a6c114b063041397b55b31ae606d4a16f3 SHA512 98205fa216aef015a55698a92c06438255df5319fcbc4df3a777fcf244c588256d092daf20e84020bb95cccc03cc53613cf27b927c36f7a9d75df472bc7e261d
-EBUILD bzip2-1.0.7.ebuild 3017 BLAKE2B c53ac9c2079a0c3d7dbad1834eb2ecc023f7954ec23420b27d9670ebd3400256cc44cae80d1e9acf2b4d7df7e4fcf4a554af31428b254d7d05e6eaeaa72185d4 SHA512 a8981ceadd8c39e6a3d544c14db01605db3173a6d9adf4fde767712fa602027bc1033d4c2b9b8b85beeffeb67c5579ebed2ff94d4dccf27f2b4f0d4810a822ea
-EBUILD bzip2-1.0.8.ebuild 2964 BLAKE2B 24d35a378df299fb6de58a6784c0ebf44476699e62515c719182ee712b7dedeaae55c767fbfa74dac9fc09a6f1b26532cdf8cda01e9491f0de541400fd67203d SHA512 3b93c95003795e0667fc7b0705abed7ed2f575aabb000f30e5db4b9263e10a9ea1c04d30dc25deeebfac503dc522e30e368dad580a56078418c1a34c66fbce35
-EBUILD bzip2-9999.ebuild 1395 BLAKE2B 5da5e48cbd8fe10d149bea4e31c8ce977ca31b9bfd1a47aafb3c14f34b6556ad3eb9cb3aba29fb534c42d65edd77229f7aa11b16e52c9b908a085ede6722b441 SHA512 60d3b6244fb19fe8691a4b72ba596be0fbe5a2620da151cb4638656a8ffaa631bd0e473ee23c43b86c57921aa87f3cad76a92aba4c5fd8c351c011d275c3b716
+EBUILD bzip2-1.0.6-r11.ebuild 3148 BLAKE2B ab21689beaecfd55c0d4262079ef57ec00c38a4bb25fdddd63e6ea97be3514405458ee62caa20b6d08a469a65e48542d65b152aecd2afe7813b0d9744b973c43 SHA512 cd927c7d0467f0a3499f2a72cdaab67583afe14ffe42e7ea378aaf28851d98b555219f2ea1a0f89fc038d0275172dca5d0bb170e1a83c0f97837c9c8e82dc8f2
+EBUILD bzip2-1.0.7-r1.ebuild 3013 BLAKE2B 8bc2d3f4c5622462b632002b44b039266d555f0d820d9f21fb4786426ee3704a5a14b7ba6d025e24329800c8f8c5fcc2f01d5e80a65799e679b2015fa1221808 SHA512 6d51134ac7304905e2c2a1b6fb75cb57256f751776026a0319cd75b8dec3a4c5b4ef7799655ace1e4a9de4284f05435cae24d44c9de783749457654d7d02081f
+EBUILD bzip2-1.0.8-r1.ebuild 3252 BLAKE2B 8dd88c02318e290e7d11d40c4ad0ad4ca5a746933b7780827bc75eca8baf8c10da93bae6513376976422d25999ef97b0b51c51e96519ad6ab0ee5c33c0618962 SHA512 c49de662256a41a6467cd00780839f5a2777cbca7e24aac113dc00c18af6f9f49f1767142f4519a8b4ef3c5228b9322e258001da2d8c16edb7ef1dacfcefa504
+EBUILD bzip2-9999.ebuild 1678 BLAKE2B 9b5c0dd688618e60c0be87e75dfffa168271ed8b335c1050435fec76c70c0d52ca069768e1f8a6cf4a473c220ac51ea5c948b086141f13bade0e916b03338d20 SHA512 8231a7fee67e3df64687c10cc815184ec46d744e3248bbdd27dd93f33df8112a1bcdc4457c97e02eb55a68decbcc704bdc074966bd23692e6fad538dafc5ef3e
 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 c140ad8820f8..87ba02ba5c7e 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/bzip2/bzip2-1.0.7.ebuild b/app-arch/bzip2/bzip2-1.0.7-r1.ebuild
index 95c7e67969f4..37ab7244dad5 100644
--- a/app-arch/bzip2/bzip2-1.0.7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/bzip2/bzip2-1.0.8.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index 98b583d85c46..34b92d2ea541 100644
--- a/app-arch/bzip2/bzip2-1.0.8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="static static-libs"
 
 PATCHES=(
@@ -71,6 +71,14 @@ multilib_src_install() {
 	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
 		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
 	done
+
+	# Install libbz2.so.1.0 due to accidental soname change in 1.0.7.
+	# Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24.
+	# OK to remove one year after 2020-04-11.
+	if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then
+		dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2.so.1.0"
+	fi
+
 	use static-libs && dolib.a libbz2.a
 
 	if multilib_is_native_abi ; then
diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild
index ac95fff0d7be..579f0b8f44dd 100644
--- a/app-arch/bzip2/bzip2-9999.ebuild
+++ b/app-arch/bzip2/bzip2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/federicomenaquintero/bzip2.git"
 else
 	SRC_URI=""
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
@@ -36,6 +36,13 @@ multilib_src_compile() {
 multilib_src_install() {
 	meson_src_install
 
+	# Install libbz2.so.1.0 due to accidental soname change in 1.0.7.
+	# Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24.
+	# OK to remove one year after 2020-04-11.
+	if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then
+		dosym libbz2.so.1 "/usr/$(get_libdir)/libbz2.so.1.0"
+	fi
+
 	if multilib_is_native_abi ; then
 		gen_usr_ldscript -a bz2
 
diff --git a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
index 977d9b3cd309..64cca58eac34 100644
--- a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
@@ -49,7 +49,7 @@
 @@ -36,24 +36,10 @@
  
  all: $(OBJS)
- 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS)
 -	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
 -	rm -f libbz2.so.1.0
 -	ln -s libbz2.so.1.0.7 libbz2.so.1.0
diff --git a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
index 5ab0cb52d050..d63226684f66 100644
--- a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
@@ -6,7 +6,7 @@
  all: $(OBJS)
 -	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
 -	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS)
 +	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
  	rm -f libbz2.so.1.0
  	ln -s libbz2.so.1.0.7 libbz2.so.1.0
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
index 4a641fdb2e81..04818265b7e2 100644
--- 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
@@ -49,7 +49,7 @@
 @@ -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) -shared -Wl,-soname -Wl,libbz2.so.1 -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/bzip2/files/bzip2-1.0.8-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
index 08430831baad..63409f5a8576 100644
--- a/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
@@ -6,7 +6,7 @@
  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) -shared -Wl,-soname -Wl,libbz2.so.1 -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