summaryrefslogtreecommitdiff
path: root/sys-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-30 12:37:28 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-30 12:37:28 +0100
commitbe9d77d3ac6af8f4ead98d89706f356b65578c93 (patch)
treef82923fbca262493e83dd1382e561a2fae24cc46 /sys-libs
parent7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff)
parent6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff)
Merge branch 'edge' into next
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/Manifest.gzbin14597 -> 14602 bytes
-rw-r--r--sys-libs/binutils-libs/Manifest2
-rw-r--r--sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild2
-rw-r--r--sys-libs/cracklib/Manifest4
-rw-r--r--sys-libs/cracklib/cracklib-2.9.6-r2.ebuild2
-rw-r--r--sys-libs/cracklib/cracklib-2.9.7.ebuild2
-rw-r--r--sys-libs/db/Manifest16
-rw-r--r--sys-libs/db/db-1.85-r4.ebuild2
-rw-r--r--sys-libs/db/db-3.2.9_p2-r1.ebuild2
-rw-r--r--sys-libs/db/db-4.2.52_p5-r3.ebuild2
-rw-r--r--sys-libs/db/db-4.3.29_p1-r3.ebuild2
-rw-r--r--sys-libs/db/db-4.5.20_p2-r3.ebuild2
-rw-r--r--sys-libs/db/db-4.6.21_p4-r2.ebuild2
-rw-r--r--sys-libs/db/db-4.7.25_p4-r2.ebuild2
-rw-r--r--sys-libs/db/db-4.8.30-r3.ebuild2
-rw-r--r--sys-libs/e2fsprogs-libs/Manifest2
-rw-r--r--sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild2
-rw-r--r--sys-libs/gdbm/Manifest2
-rw-r--r--sys-libs/gdbm/gdbm-1.13-r2.ebuild2
-rw-r--r--sys-libs/glibc/Manifest23
-rw-r--r--sys-libs/glibc/glibc-2.24-r4.ebuild173
-rw-r--r--sys-libs/glibc/glibc-2.25-r11.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.26-r7.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.27-r6.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.28-r6.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.29-r8.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.30-r7.ebuild1471
-rw-r--r--sys-libs/glibc/glibc-2.30-r8.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.31-r2.ebuild7
-rw-r--r--sys-libs/glibc/glibc-9999.ebuild3
-rw-r--r--sys-libs/gpm/Manifest2
-rw-r--r--sys-libs/gpm/gpm-1.20.7-r2.ebuild2
-rw-r--r--sys-libs/libblockdev/Manifest4
-rw-r--r--sys-libs/libblockdev/libblockdev-2.23-r1.ebuild (renamed from sys-libs/libblockdev/libblockdev-2.23.ebuild)5
-rw-r--r--sys-libs/libblockdev/libblockdev-9999.ebuild3
-rw-r--r--sys-libs/libcap-ng/Manifest2
-rw-r--r--sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild2
-rw-r--r--sys-libs/libcap/Manifest2
-rw-r--r--sys-libs/libcap/libcap-2.26-r2.ebuild2
-rw-r--r--sys-libs/libnih/Manifest8
-rw-r--r--sys-libs/libnih/files/libnih-1.0.3-fno-common.patch11
-rw-r--r--sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch8
-rw-r--r--sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch40
-rw-r--r--sys-libs/libnih/files/libnih-1.0.3-signal-race.patch20
-rw-r--r--sys-libs/libnih/libnih-1.0.3-r4.ebuild53
-rw-r--r--sys-libs/liburing/Manifest2
-rw-r--r--sys-libs/liburing/liburing-0.5.ebuild2
-rw-r--r--sys-libs/ncurses-compat/Manifest2
-rw-r--r--sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild2
-rw-r--r--sys-libs/newlib/Manifest4
-rw-r--r--sys-libs/newlib/newlib-3.1.0.ebuild141
-rw-r--r--sys-libs/newlib/newlib-3.3.0.ebuild7
-rw-r--r--sys-libs/pam/Manifest2
-rw-r--r--sys-libs/pam/pam-1.3.1-r2.ebuild2
-rw-r--r--sys-libs/pwdb/Manifest2
-rw-r--r--sys-libs/pwdb/pwdb-0.62-r1.ebuild2
-rw-r--r--sys-libs/readline/Manifest4
-rw-r--r--sys-libs/readline/readline-6.3_p8-r3.ebuild2
-rw-r--r--sys-libs/readline/readline-7.0_p5-r1.ebuild2
-rw-r--r--sys-libs/timezone-data/Manifest2
-rw-r--r--sys-libs/timezone-data/timezone-data-2019c.ebuild2
-rw-r--r--sys-libs/uclibc-ng/Manifest4
-rw-r--r--sys-libs/uclibc-ng/uclibc-ng-1.0.33.ebuild (renamed from sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild)20
-rw-r--r--sys-libs/zlib/Manifest2
-rw-r--r--sys-libs/zlib/zlib-1.2.11-r2.ebuild2
65 files changed, 321 insertions, 1792 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 57c70e072966..815110b209f0 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
Binary files differ
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index cb001c91b852..796ab9df617d 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -4,7 +4,7 @@ DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95
DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
DIST binutils-2.34-patches-1.tar.xz 20388 BLAKE2B 8828505f62259a307de445357320827e7f6bc416a7f4c72140add505f62eef3928c7daec13be158b52c2a7a1d989f539025e4be6ec27ef80ede81477a42c5042 SHA512 951dffcc30ad5706dc48e71995217655c5d96472446ab66a357f19486b57d1868143a9809887eab7ba8c42c33124f8b37d3bab6618388ea8a08b4399d348a645
DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
-EBUILD binutils-libs-2.32-r1.ebuild 3673 BLAKE2B e25c2c988f087ba4bd904a53502c25d3bb192249ecc21d663b30199b05bae1c2f3d438be0fe5c22b6880d3e0822ddd94233e8e2a67e87359d3fac1f2dc455889 SHA512 98b1cb1e2c6b80832c29c9facd0236c7112e1daad7f3e02d6437b186426de62501b69db2112631b2e9fa4fd7ac711fe3201cc777554354689cd137f63f12ff63
+EBUILD binutils-libs-2.32-r1.ebuild 3674 BLAKE2B b2109ac10a9c0e2f79b4342fbe1b3d11273167cd3bd91e7d3a3282d3656ad58ecf7461a2b323b87abba8b02ef6649fb6cb04d282980763396f934bdff994d68c SHA512 030897408d1c5bd33c3d82b4de5e14cc034bcb17251efa2bb468de623a7e6ec57d891e199b879f45aa043ee5396c14b6a1914ccfbfc8403fe798e8f960dd3e21
EBUILD binutils-libs-2.33.1-r1.ebuild 3549 BLAKE2B 931ae3c38edbeed8cca61909b5e0897bc37f3855820ac49ed97955c611a2c8a58c50df2e87d4f13674ea7de511638205f49932663f25afd9f2b96970803dd91c SHA512 9e17954c198e39f725603fd9b6d1c3c24e39c99ee823a3e15b3d5c4838ae507787cb23aaf36e5dbfb9052656955b114a95b2cb3f8b0fc96ecfb0b5ed970053d0
EBUILD binutils-libs-2.34.ebuild 3611 BLAKE2B add6cdcffe47e1666118939c6bfacd05317fe38dabe34a46a85d47113ca62de800d07e46e86e2f6a526fd1ffb586f0b059224491e1957e73878d4245cba5a0a6 SHA512 e9a329164cd52d95b1d452fd54c3f58cb4656ab1af90a8af0553be36e9b574a3dec9e0dfc228b2ecfde295e77007bd6f319aecd2d2166cb6b8fe48aac1f8ed4c
MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
index a52af5e1ea5b..9479eb9e2157 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0/${PV}"
IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
DEPEND="${COMMON_DEPEND}
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 80ccdf6ef386..7f44484d2dd4 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -2,6 +2,6 @@ AUX cracklib-2.9.6-CVE-2016-6318.patch 3288 BLAKE2B ed213c5d5228ded6ceed088bed2b
AUX cracklib-2.9.6-fix-long-word-bufferoverflow.patch 1614 BLAKE2B 01add5ae4241f0200e8b3e35c376f176c137c8ab9a75e4364e4fd285ac85d1b2e59327eb34bb21f29e0b638199cf4f9c9603b8e747d52e62978fd392b13ce89d SHA512 e4a2f9f467d3f0ce8acd4c9ea6ca19787dca6bd2bfaa80ddbf9ec1214a5e2b519c088b07760349adac9bd6805a4b512c015181863d679643cc12c68104c29a6d
DIST cracklib-2.9.6.tar.gz 642402 BLAKE2B 4d7a0d12d1e7101c82d03f76e073407481078747c283fe3251f947542017fff03fbc5e98505c6a7a8987a2bbcea99dab558c15b1eb8fd16755859ce5a4440ed2 SHA512 2b09672e5b412d670e7ed911ebf0c0023fe2901ea05c9c02eefb7a58a13cddbc27a65d75bb20be9f8cebf4c90a9a56dfe1a3b656dff62b1d6048f5376e671786
DIST cracklib-2.9.7.tar.bz2 603630 BLAKE2B 81a45b2fb9f34da84d4fb864e1a9f67a4b22c246f1e4db1c599a555f79d560a04d95afb01a89cd3a2e0936f0e8fc51ff5ada26098c24d7af0777a94f51b82bbd SHA512 f6bf65ac092ba46ff78ddbc115692260fb76dc71219cd679d2ea935ebfb9e709fbb30259a7406743ed00dbdc415335b3ac9d9fcba1d204ea36d5eb96bf1333a2
-EBUILD cracklib-2.9.6-r2.ebuild 2804 BLAKE2B 7f5d48ac1e520ca616bbbc884ed5eb5406bce817a2b20554e334c0410bca217fcd97f43144193a610e2b0f157b6a12e84148ce5ddd8d5e095aa9db3d851b31a4 SHA512 2d25581c6d6ecd0c132906435bdbc0f7fb73fec25b5b4c78be6cd70f86452d9b4b1f325fbfe35c59e8b4fb9acf989836cae3e15088ffb7c52264e8a09adf0c08
-EBUILD cracklib-2.9.7.ebuild 2532 BLAKE2B 72ab19dc638b7d110f6110df0835a7d819ee9db094363d829d6422d4bd56b4bed9ead2daa6443c30b81b70b753703302f3ac64fe4dec8504fc1ab2766c522b69 SHA512 71a0e0299a4731adc0284a5a6129307d33fb11563e5eea6fe54ac7055ad3d361e9fd3de6477d8d97098e114dd74825784b6cc33d17889e78f40436758dbd38e3
+EBUILD cracklib-2.9.6-r2.ebuild 2805 BLAKE2B d35eef237a661e312e3d335f1eb8ee70a42ec557f86a6844459f5c152b0b690811e8432b7f88f4142c12cf6d1e8eb2ed89c63dc8653a23ed27445992a6622dc4 SHA512 16915b5de982373df31325d037a5af3233b422a77dd59ce2065f096633111055b53ded49ef1e7748da42ec046f14b60314a923789d2bf4e5119276440a5abe61
+EBUILD cracklib-2.9.7.ebuild 2533 BLAKE2B da5870da3ef1c8c00f716303ca0db9474116f0cc3f0ee8f8310d52f02c3aedea84f1761bef5f73eab91d68043b3ddb19b218896ab6d9e74e61d446322bd65423 SHA512 8ddcbcf8f504e754c8651ad00b338bf7ec01b38b3e4d2b367b8f5690c331452aebe097825bb6e74467ab3af08e2148e7b4728b8c96860f306f61c024e2c90852
MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1
diff --git a/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild b/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
index 2136313c2395..4c9accab75f9 100644
--- a/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
IUSE="nls python static-libs zlib"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-libs/cracklib/cracklib-2.9.7.ebuild b/sys-libs/cracklib/cracklib-2.9.7.ebuild
index 2463d104a9e6..9e8027f90c30 100644
--- a/sys-libs/cracklib/cracklib-2.9.7.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
IUSE="nls python static-libs zlib"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index c8b5fffa997e..cbac24e965fc 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -61,16 +61,16 @@ DIST patch.4.7.25.1 2072 BLAKE2B 773fb96f9c5995cee22931fcd504b9962d0c3407f7b4239
DIST patch.4.7.25.2 2210 BLAKE2B 3e9727a4e006fa8e4502f1481a44144458401d0df0eeea26eb135b1979f330f354cd5016f56b86400118f13fe29a92798b0dcf19581738d3e9cf83b9be1ebb6d SHA512 d57746a527574966606955a8ad6b97742ff3979e85a0d087ae0c33b64b4fc2fd854f3ac145e2efc061b3479de5ee8172a02183cf54ada91fce3e331ab948ff18
DIST patch.4.7.25.3 8442 BLAKE2B 666b643b3bf0d1e5ef5e445ae03228f436a5528bc197338c3c9bd468d7002bc81a16e295cf34fe6b38903e7f65c2c5c3cd9be0a3227f1122aeda22afc165e2a9 SHA512 815560c45c9c8491fd58d881a0bc1d23a82a13298d4757ed7d2ae4df4b88b278b8e4d6063eb46349a8f6f11ca9aa5b8555f3ce01df025715c2579dfa36241238
DIST patch.4.7.25.4 5647 BLAKE2B 60ecb24fb137f7aeacb9689d8edc41791f78f96d1aa15c7fa47032371533d668c5dc12a5e1641945402f0e21f4e596cebb5010ac170ef462279b2efb887be020 SHA512 df9810034773a9d0556cbd174e4f131f0461402bf3f476ae5da1deb92f3e2e9ef789687c5cc5c2df6385f6b14251e893be225ffacd895d71dfb305b9de32567e
-EBUILD db-1.85-r4.ebuild 1305 BLAKE2B d7411f09ad2e785bebdd5d79f772571eea74471a7d86d0b040e5241f2d68eed72ae1f2d26b75a58f77dc782b2a32fef64fa51f673da0840928b2c85c32850fcd SHA512 e20a74b665ca26f512caa5ce16323c361fe9f2f367c7c9e3ab9868885c7f410cec02f0577b8726d04e106d741b91295cdfe463864f591dd9749eb7d6dd46e91e
+EBUILD db-1.85-r4.ebuild 1306 BLAKE2B ecd0cc2b53b8ef0a1cf0a0b3934d41d0f45e190dd62cdbac291d53e7512ed6abcbdcd06d94ba49abe1c722d5f912985ac68d31932fd12dd56180301de5f5a8ff SHA512 e8ecdcd559c6a9abc78d47f9efc011475105715be1d875ba2733b22d836dcc6228fb59999ef2a6d7dc8c26e4895f020e000200778070de7821ae2fab621fa510
EBUILD db-18.1.32.ebuild 6940 BLAKE2B 869d66cd41771a5fb8ca879079c3c166645b6047d75429c0f12e55e975fc784d7acdbf69cbbc6e46940583cd840896d39368840d3d466f5e54cf3ef2f11c3c04 SHA512 d741d0203a37cc47cbff6adbc2d2072130823f54be2d50096191307b4b88ff62d660884ea2b5d701a3ee86ec9a2d17490a6635628298751d3d1aa5917ca9e434
-EBUILD db-3.2.9_p2-r1.ebuild 4897 BLAKE2B 1a8fa86bc5f24df7bbb0b73560b22b29124af1e29e8850cda60ad1c2e0a5ef61c4a404dea5bf00bda0c6d993394ec9fc40d6661c760506b422c3cc2cec11508b SHA512 948650105b0974815fadf70d118b0474542910635c5f37b5d60ad6ea424ff7a400aefccb10d163d6831f346763c5e4190f8a299624932886102f562fd94672b3
-EBUILD db-4.2.52_p5-r3.ebuild 4627 BLAKE2B c73d82a6091c32b671076d7e99e53ed4ee363d762ce5727e691ba63f5c507e4c762fc3817dd52e4cae92e5da2418f6bb5acc834c630a8cf15bf518df7d9f4b6a SHA512 60c265ec752bebc7e349a0c8127fda9f015450a046de89a932a5f8e9e578760363bf27e268f13cf7bb1b4988a0f0aa774766f7afcaa88a3fe7ede6c9e8d79acc
-EBUILD db-4.3.29_p1-r3.ebuild 4537 BLAKE2B 68eda36f5996eb82195e3b229a1c52484a29ab7a67867a39af36e92c4c7c392a33178a1e9a55389919567f914f3c7a5e037d361239b025fc5f321f734dd6cc30 SHA512 5771ab9ccb598f823baca539412ff800bb16d6c21a360d28ff13ec95d6c6fef0a0d438e9e974d7a64e1a44571d6a23b6c2a30a1ea98defdb29a4768c4286671a
+EBUILD db-3.2.9_p2-r1.ebuild 4898 BLAKE2B ed7d56c9bfa4593755cfd5f769a099f6fdb4e2a091f938501be28fcc0a2e96c1642be763a4bffe0ea992b4063cf3b64f3f92999b88755fe4f43344a113803b71 SHA512 acadbbd870165059a9cf640126679974eb7034d53b878ca71a5117d3792f8224a7806a02c31a5b34619b60f6a733344d9ffebf0a19f3e65d3afd3fb98546e045
+EBUILD db-4.2.52_p5-r3.ebuild 4628 BLAKE2B c0091684c0b7b0fff8a3bcb5079e1407a8b8df8d948f2bdac41ed805cf12ca748ea51ca693be9bb33807056f95c05bd2ff6f2cd0b6a6d9dc799d61802a943ee9 SHA512 d124c6d5a71fd813e368550ff096fa1ed4d20cac6cffd40942d682f77c54a5e56ecfdfa5843ca1faed65c4e54513e083ebc730f46e159427260073f16d889a8e
+EBUILD db-4.3.29_p1-r3.ebuild 4538 BLAKE2B 96c516cff7265d233970675813e8baad5f348fca381ebc600cb7c6566bcc1bd4782098117e18ec24322b0d106c5edbd49e32367035a6174376b3e56bbffb8007 SHA512 508347615aa4de923ade8124e9697102b5fc40ed2dbde727dbc7ebd82fbfc4ae5600f92ee437d5b66da00ccbdafeec01a912f6755f708c65b2b8693b156c8169
EBUILD db-4.4.20_p4-r3.ebuild 4427 BLAKE2B d50b789a433d466e1bc72625aae2f759121ff47048e248c8b42911907714035411f31affd7314a4dec2f19e941e75156a07e6120e3cc54f991495af6f21aaadc SHA512 f67c3d6a7e4350d1ba4c641abfa96ab909a8083fcaabbcbd2d8b6d10155a3c5775edc2f2a9f676c433922b5620f4832eaf6322f7a63782ae09611767306af682
-EBUILD db-4.5.20_p2-r3.ebuild 4665 BLAKE2B aedc11777322c32c2828d43bc8677a316e230b35ed6edfc6354ef164bd640db13643219c6a4e22965a76cc5531b87e843984244e28aaf9516ab3d3a4a9c58544 SHA512 fb617e19ee11a6a3b98b846e7289f98c203492a45d6eeb2ce4f62aa679d8e163b487323274bd485066490cb2f07dd74ddcbfda004a90559a8fc11bda043864e0
-EBUILD db-4.6.21_p4-r2.ebuild 4387 BLAKE2B 0fdf59a6c27fad1381d05a17fee4981a9cf6dd9f694a1a2bb8621a9046fcbe2d9a91004737c2679c7309582349677bcd886a874df9e053f014f6387cd4c99e7a SHA512 7300e3886f9e9b23670c63fa53fcc8e93ee4b213a8b52464eef4e89094414984f247307959517e6d52e3ede20dd606c2c7e4021d6cdc841c388ca908eea9840e
-EBUILD db-4.7.25_p4-r2.ebuild 4713 BLAKE2B 708f5a7f4e6fe001fde880354635cc74d6113b33b2542d38f69e3f9eef0761e488d808522f7dbf31b927c760be84882c20996f14d8fa0f3edc1fb13f8c121a09 SHA512 aa9b7797ce9e169d4c579535e606a7272e8788ba31b1009346682a69abde968591c9b7b3482d080f83412c1228f8fa87e2dd59fbc77798aae9be0889e61c0570
-EBUILD db-4.8.30-r3.ebuild 5204 BLAKE2B 299ae5e8e9664113f23c05a816587b9996f894a29e4a609c496aa0445fdae0254bd2aa0f6d86f64f264d6eb24fb7b70e585b434b0e9c90569fce013a24f233aa SHA512 6d6a6462d3e78a8362b9b899f4c7b3de48501e563c494bcd4ae0e9e9d52b26e49167ff6ba728ad50d3369777ccb13a04561a723eaf9a148a24fdd0992546b68f
+EBUILD db-4.5.20_p2-r3.ebuild 4666 BLAKE2B a614fa3f48db7e280387faf5e4fd426c5f70d979e1c09183818347b37401e3f415ccf7af0193dfde54ec0356b9f19af21b1ad75cbafd941bc4427b9abdff817d SHA512 38c027d8eb609d4ca573d4bd380bba37f70470a73fe18359354902ace847e8cae06809a258602f60de0f63fbe9e014139ec11119cdc0a978c5ec236d2078d49a
+EBUILD db-4.6.21_p4-r2.ebuild 4388 BLAKE2B 59d672479fcee5a0b492368361f852977605ea43689f4b7ee905b8d89def85fa71ea18d2e53561ec35db0f55a9ac7c523b25176e3542467b04cfad0cfb982fdc SHA512 db3ff49cf67824a04bec6b9a09efda676730db05ca5bc316a77c7791f1272350ed80b0f9eddb64894fe742640af415e1611b155db0e80eb10ac9f4c8c6a6d389
+EBUILD db-4.7.25_p4-r2.ebuild 4714 BLAKE2B 6b56de4aedb91dce39f2a99a665b5f9e130bf9dc7d2b36782e725976ef9ac9d158e24c1c45df459192734b82d0437a6b8936aef9548b47fb8c85260f7c221123 SHA512 e8c15d4c86a82287773f9bdd626bccf5081c0dc274c302b29a1e276fd0d07028cf27b9a7a41af8d0d4af5b7a254381e4835cac89e0321893299eeff60559ef84
+EBUILD db-4.8.30-r3.ebuild 5205 BLAKE2B 4480d161aa607fcc24c890ad6d71529ade3355838192c345d5efcff87e655b00e6517b9bcbfbfc66860d38f77fc406639e8eb0a592ea3b651c8368baa565ee04 SHA512 6116d916d5c509c6001033fdeb07a7c07cca6001fce64ccbc2a604d64e998d544cf94220d51e9fb78ffffab641c0608935f26ce764e6b6f8fa25a5932af77b82
EBUILD db-5.1.29-r2.ebuild 5852 BLAKE2B 134957fc864e77d18bb7ad43d1d042a464aa6afb741a04ae23f9ae332676c4fc4312f8fefbf6f7cb751c9dd14933eeb2f245e36d84880fcf2d4fadde1b3c0cb3 SHA512 4f686764cd7caa4bb0453ec482a9310b6887f40b3f79e76f02a0f2e33fd6095d715ec0b105035dd3a41ede58fc19d0b0b6267099ad3fbe977f2d4881bf1bf279
EBUILD db-5.3.28-r2.ebuild 7134 BLAKE2B 8fa99af39ae1c253152d9ce31b9f647db85dbdac3fd6cdfc61e673511158bbcd389e2770ac3175a6eb2c013500dc32937352153b8d2acf97e1bf346f8ca57a06 SHA512 a13f32fce2e3f351449b2e0ad12d4103838df89663aa2f9eb87b4fbf7a0aa425a8f4d17b20057abc6787e71f40514477df1490dcd9a974c74e7683d06864f0c6
EBUILD db-5.3.28-r4.ebuild 7138 BLAKE2B 663da54915b4c999ccbcdee709dd9d9f3c32b932ba5aaea39d6632cf505fdacb43cf3810bd259c134bae068126991a51629837e75857b6e070584a9687577a29 SHA512 a3e6b517796856fa7a5489f14c4b65799398435f1b82d4b3d695548c44d4d73353517dd56738dd7e05167d3318de35d53dd1eea530e2f7e29d5f3bbedec61c1a
diff --git a/sys-libs/db/db-1.85-r4.ebuild b/sys-libs/db/db-1.85-r4.ebuild
index 585f6acb1c85..e643d4f2ed68 100644
--- a/sys-libs/db/db-1.85-r4.ebuild
+++ b/sys-libs/db/db-1.85-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.oracle.com/berkeley-db/db.${PV}.tar.gz
LICENSE="Sleepycat"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/sys-libs/db/db-3.2.9_p2-r1.ebuild b/sys-libs/db/db-3.2.9_p2-r1.ebuild
index 93042b6f29b8..804eb7f92543 100644
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild
@@ -28,7 +28,7 @@ LICENSE="Sleepycat"
SLOT="3"
# This ebuild is to be the compatibility ebuild for when db4 is put
# in the tree.
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.2.52_p5-r3.ebuild b/sys-libs/db/db-4.2.52_p5-r3.ebuild
index 9d759a72c662..dd191ead6b9f 100644
--- a/sys-libs/db/db-4.2.52_p5-r3.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r3.ebuild
@@ -27,7 +27,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="tcl java doc cxx"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.3.29_p1-r3.ebuild b/sys-libs/db/db-4.3.29_p1-r3.ebuild
index 166282439034..b2852ed59b78 100644
--- a/sys-libs/db/db-4.3.29_p1-r3.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r3.ebuild
@@ -27,7 +27,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
IUSE="tcl java doc cxx"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.5.20_p2-r3.ebuild b/sys-libs/db/db-4.5.20_p2-r3.ebuild
index 190ce7f7699e..0167e85d91b2 100644
--- a/sys-libs/db/db-4.5.20_p2-r3.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r3.ebuild
@@ -27,7 +27,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="tcl java doc cxx"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.6.21_p4-r2.ebuild b/sys-libs/db/db-4.6.21_p4-r2.ebuild
index 75ffe55fa00c..e0038732223a 100644
--- a/sys-libs/db/db-4.6.21_p4-r2.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r2.ebuild
@@ -27,7 +27,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="tcl java doc cxx"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.7.25_p4-r2.ebuild b/sys-libs/db/db-4.7.25_p4-r2.ebuild
index d017f0dff1c2..51fc314037da 100644
--- a/sys-libs/db/db-4.7.25_p4-r2.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r2.ebuild
@@ -29,7 +29,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
IUSE="doc java cxx tcl test"
# the entire testsuite needs the TCL functionality
diff --git a/sys-libs/db/db-4.8.30-r3.ebuild b/sys-libs/db/db-4.8.30-r3.ebuild
index e08beab6240a..11a3e2639681 100644
--- a/sys-libs/db/db-4.8.30-r3.ebuild
+++ b/sys-libs/db/db-4.8.30-r3.ebuild
@@ -29,7 +29,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc java cxx tcl test"
REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 3eca70c70513..10a564866562 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -2,7 +2,7 @@ AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b
DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
-EBUILD e2fsprogs-libs-1.45.4.ebuild 2217 BLAKE2B 22f4b307244a118b022d0dc072abcb5ca5ebbd399f0d635691e71d647f97ba63499c63d33663b2b6a7508e3def09c35eab49b0102263b5cd428a239d779586d2 SHA512 e1f9ed9a064ce8537b6bf4bf38a10c4ab53b64d0dc6ff0a20b8d085df15d26e458c3ce5b413c1aca5e0ebf958b1d76f63c1fe439b7f8057e43496a3b84e2826f
+EBUILD e2fsprogs-libs-1.45.4.ebuild 2218 BLAKE2B 25ef186951ef58eb15f500c536ad3f8f39297208f87197c81e094d499fb47379074024b9ba0126d64e711ef62bbf37dc0063320f04d6cb2ae5904b619c9743a2 SHA512 356fd05f5995ff4c90a964ba1271dc6c0730d997506e16c2253ea1c048df0a413afd3b9ff0a0de3c7b22ed50895ae66efb96e01b6db6799053cf32af4c91fb50
EBUILD e2fsprogs-libs-1.45.5.ebuild 2218 BLAKE2B 25ef186951ef58eb15f500c536ad3f8f39297208f87197c81e094d499fb47379074024b9ba0126d64e711ef62bbf37dc0063320f04d6cb2ae5904b619c9743a2 SHA512 356fd05f5995ff4c90a964ba1271dc6c0730d997506e16c2253ea1c048df0a413afd3b9ff0a0de3c7b22ed50895ae66efb96e01b6db6799053cf32af4c91fb50
EBUILD e2fsprogs-libs-1.45.6.ebuild 2227 BLAKE2B e469ba0db1f533fe014e1058b68b34f290f9602ae1d1e7f9c20b9404768619133d77ef5c1a71d479a4619b8f7cd23a65667fd516797d8ac12baf2bd73a8bf601 SHA512 2344a9f504bf99e7aa0d84f171d2f14d5ca62eb05078ae9f778058b07d36c307ececea85f74702a059ac0c4b0c258dd8acf5431bdd56f0cbbbaf0d8519ed7858
MISC metadata.xml 399 BLAKE2B 7f75ab727887efba1f1991c5944cd262c95b53dbc48a391afdd67cb5c1f99d9c06753b06c7d28c5472075835ff5da4718eb0c3ca5b9e68a4d83173f223162c31 SHA512 45e90f3d9b83bffd42173290d47dce2247a2eff4d6293b7bcbcf422115e11b8c958a7a13f60b7742a96350bd5a2b37d8e76a807776f943c88833b77782d4f180
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
index 4333c8104127..4d8e8d0d7e00 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
IUSE="static-libs"
RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index c94c498b2ced..cd05812b2b19 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -7,7 +7,7 @@ DIST gdbm-1.17.tar.gz 938173 BLAKE2B bef5d449b250af139e5c660ba700694bac28af3e7f2
DIST gdbm-1.18.1.tar.gz 941863 BLAKE2B b7717224e966321d7499a90214bfb62d0402e867db475ed4eddacfe3944d8d9cca1052e41d625f447936bfb3cbd7f1b79cfe6ff435a018efed3d5a7c5eae52d7 SHA512 adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef
DIST gdbm-1.18.tar.gz 939352 BLAKE2B c4b84abc6bda852c486634cf03668f189f57debe4034244c51e738f1ff791469e7b1cb6514ae03514f5288b550a436dccaaee79b9de5594a5b307d84be2ad88d SHA512 57c7e5dc52464e97ad955e28d49fdb3557d8e3bdf280f7d3cee69539e4878f055db17cb9dd591f82fadb8fa5041a5a56d8a571d34f6e115470a3a82537f872a8
DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bdb9ec323d185a0980f235ff6a225d180d86d984469ce04a3f0266d20881f317f4339915bc6f61ab150ac2ac SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7
-EBUILD gdbm-1.13-r2.ebuild 1843 BLAKE2B c86c26b07efe1a69bda794e2574d1c5215ea408d872de88cd10db56b31b0270547778c2e525ab62e9abd24f8728a0699dbd7a5ff0104c54f6f0fa2f0ab69e855 SHA512 834ddfccf628fc6379e2c95cc068b90dbcbc4db61b9e2572abd33ea65fac1a1eec9847d51ed2a724d3f5f9452dd199162d7d80d5b6bddca8560861565869e138
+EBUILD gdbm-1.13-r2.ebuild 1844 BLAKE2B 4ab07bf0205140ff52040f07a994be6e83703d5ad75dfd7fae9e0f933355b8526a514b4da56ef64f63c6abcdbff5f6e7173963249ba20dfbc13d9bcedd2d0476 SHA512 5e158e014d255146c7b6d7d749777862d0259b71dc4e61162bc6b1a60be947c2425028fce020405276a38d4492baec10af19395df519c1cf8387f098ab58e5af
EBUILD gdbm-1.14.1.ebuild 1762 BLAKE2B 573c5b48f5e65f1c00ea6dbed01f9af99db7873c0a9f51028eda17589d11c11b82444418d99cd24234d0bd96c3daf28920718aed6e00371766a67a34ff38442d SHA512 c5e4335786ad8b8fb4fc38f2b2a4a9f0db5a60bbb0e3c99fba80c74301c657f4b0f13f8a3f4d39a0a7ee27eeaa5727795be69c05332ad463464babde6ea31b5f
EBUILD gdbm-1.17.ebuild 1358 BLAKE2B 663f146c1603834593e9f03fc037b5b54f73880458d00678447026253eaa0df7c2f0f874a694c7dc8a325e965b1fa2416cd7bcb11a91cabfc4b1dc086253ff51 SHA512 49fc0a53786f46aab733e30301e8547a98b338ba1f3c29f5e42e361a776514750744196538fe6a87027dba8e263f690bae6b4af2c5d37b4e43456fb6c299e703
EBUILD gdbm-1.18.1.ebuild 1309 BLAKE2B 2d948e8bd23db6ed43be7ba2183087f1827a66bbcc918184d668f9366348dd62c82655875d250032db4714e2ae829c47d7ea16ebb13345fb8ac46c55ea80c3af SHA512 0c13fef5dbfafb76f966db725fc41b8068ef4f728ae961c5652054fbe7b18a1bec3afa8efa0c27821a397ac2cf447422a1c8a86cb4b3c5de38efcb83bd933c9b
diff --git a/sys-libs/gdbm/gdbm-1.13-r2.ebuild b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
index 3c29ef1c4fc7..d8d1557a69ff 100644
--- a/sys-libs/gdbm/gdbm-1.13-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0/1.13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+berkdb exporter nls +readline static-libs"
DEPEND="
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 8bd4d8c52392..53784a04a153 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -8,8 +8,6 @@ DIST gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 8064097 BLAKE2B 3cc5c82cd57d0fbd26d
DIST gcc-multilib-bootstrap-20180511.tar.xz 2392908 BLAKE2B f3cf614399368acd8908f60d894c6344a2fa09383b30c1633a0682bc668367c8a2f8c6fec2d41b6e2178d709a2bd8db57e8b2ab56ba263c7d56f819c15acd061 SHA512 98c766e913693ab42ff790557acde2a36a8001e2648046a685b21964200df8d4d52d8452d499c0068c6648284d086ce062c2d36e2c6c2fd8aacd232d193f2853
DIST glibc-2.19-patches-9.tar.bz2 24584 BLAKE2B a96e930a5bd20fa75d9f259cc2117fa5ce98072274a24a5823bf877e3739fa4c001a94d7865e065ee0527f3974430d27da8038e042340a451ad2052c62724f26 SHA512 a95b3063ade974a3556480b798b317d33c7423a8cb9e69f67249ffb8b3d3c671d70d2d5f782c1efadc0bec4cc49a96d4fe89911f3dfcd85b459f69f3b4f38f0e
DIST glibc-2.19.tar.xz 12083312 BLAKE2B 9dc03346e0f0df4bf009a92d894b0a9f964ff92b7f4c9663cedf1cb6cf90435f28a15539d33791ecf43ee578fa4e26f916af0367651312ef8f9c1c38ce0dafa2 SHA512 9e021fcb3afbb9ace2a0e37fded231a62de861bd766e29d47163a03182e37add718b7acc3963d1c525f9556773e842297725715acde48dcfbaab6e756af1a23d
-DIST glibc-2.24-patches-10.tar.bz2 73586 BLAKE2B f42cc78b907e7cb5c8ba1672c845cdc0959f4d29f89ff642bd2efa795d7ac69409b514338ac1f4235ce2fbc0c9c9bb2d152f55fd14c02997517dc048a306e1c1 SHA512 fc9191a85da53a2515bbaab228648936682e04267284049468e0c82284f618ab2907b9247baca701e16edc50640199ff6d8e2a6a93ccbd5a9d3b0eb73cc484ca
-DIST glibc-2.24.tar.xz 13554048 BLAKE2B 9f93ac00f68eb88e3a2272752624163fac25dd064170e336143aa697908fba2b27ed926582f978da99c6c2489c0ce34d3eb266b5d00be69d27b36126bc2c8efb SHA512 a4cb28a2c51a0cc029ed69da7cba11931a615ba897235590b4f7fad2eaabec9042f8250eaac2a5860997437a69ab13304f10a634000e52c0336b5593b7969adb
DIST glibc-2.25-patches-15.tar.bz2 78320 BLAKE2B 70c62cc10db13e2844de4d8a18972e0f4d01ba52fbd40db57c11d7b1c2c0d571b894f01e762bb26632fd696a77c299ef0766e2f129d2eda896f58325a754a13c SHA512 7204218ea82b677e0f278c4752ddb90aa0c08ac2349d061de81ec91dac204b0f10fe223d7b1055b9e0c21dac97c835f913a90c0168a5000d3be00dd20027c185
DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1b93e557b6c58129bfb50f863c06f8b49425d75fd2df537dd9c4a68bad790cff770c50a6889732d66f507d349 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e
DIST glibc-2.26-patches-7.tar.bz2 413976 BLAKE2B 18263201cf33abf911eb7b802ed539b217391156f897a8db50f65a69627d8f8cceded78414168986ee98eba038364a6b2f3599b23f95e7b0ad2643481c399718 SHA512 0c812a343fcc68c10d92117cb2a0cf1c255470e81f0a7a04d6db2fe35445e410ef37f15162f145c2eb772b08ab55af246f5b52f5e57c2e91038181f6f027abc3
@@ -22,21 +20,18 @@ DIST glibc-2.29-patches-8.tar.xz 102712 BLAKE2B 49aacff358c0f8499c444e73eec92f40
DIST glibc-2.29-patches-9.tar.xz 104444 BLAKE2B 3c20891ee5c435925e67bbb641da54b6b7fe0114f5f1d3ea9e616414f9bafb4d32b4303f4f798507ee4e42227d68a543da203450b9bd10b61628cd0b3547725c SHA512 c38f23e78e313fe2a9e223b720e8fd93c7c57e8408c6bc3ceacbfde354fa5d963e3cb525fe75aad7aaf7347066c0e4a671c0553fe490888478ff909492fdd164
DIST glibc-2.29.tar.xz 16515488 BLAKE2B b754e6825176538a2b8ca03fce014f0d87d333dc4d038bf0cda5ee8a2f484cd3ce93ad78ec126737e093ab64b55ceedf04cd08aecb4f8041daaa329e99717afa SHA512 146bc0769fe853d9edbf93cea7f74c5b3d84d69cb7614c62588e7acdecd1ec789a9d8949f3e8b99f8f36f2ccac740a003bed94f32b07817baf780b06cfeb6ed0
DIST glibc-2.30-patches-10.tar.xz 72808 BLAKE2B a7a95c99482524b2896d15539766f1e6b1fe34a22f32119248c6dd44f42632076e86fdcbbdc2d604ec73ceccdd8a7f5936a62a6f4c3d039fae8f6901dfc6be77 SHA512 af5e213ff08bf38f6f529816c36b4e38df27207c2df254609ebe45b2f039ab553bbe563aa6f64b6667d328fd2c120dc21b6e2676540bdd94e58079237089eac3
-DIST glibc-2.30-patches-9.tar.xz 73112 BLAKE2B 3156d3badafb1d44f72953a256c2325e107613557d28c5b257e6dbf55f233efa3ca5fe6a742751a86f14aa5b4e541d0870c0e0a7659a4414c80cd5404a76bb80 SHA512 fad2f8ac9bc3557b69365b5f168aa99834d8a00f69aab81232009893722274ffa73e0baa0a0ff95a77551575f89a1cb2a7e61521b68e9950aa079c5eae586a04
DIST glibc-2.30.tar.xz 16576920 BLAKE2B bd5aae4c9854f40785b91f83c3b632de6d48d811027ddfe61651cb1bc617db8017d7914c23a770cdd3feed06fcc316da841eea916cdba54179e7eace4ea45484 SHA512 37483990cd653685873e96c45dd1651b32b441b6d7919a68ebe3bae31a0c3f7ce183fc9b110f0b268b353f80312f18370559a1e7aecea0e5aa755c8f2aef1d6b
-DIST glibc-2.31-patches-3.tar.xz 35652 BLAKE2B aca41fce54d50f09013963a54b44331a6e6ad3a8e62e51b210346a3375b7af7680c990e4824bf125597e6f53c13a3cfd81fe7727b73f7959b30b75e234751719 SHA512 b9bcf136cc2424aea21eb6497baffeca31b80b09373b770ce62dc2ce81f1c20b094fb5e2ada3afeff22785acf99e3e008ef7aa3af1068a6e53e2bccbc8dbd470
+DIST glibc-2.31-patches-4.tar.xz 40464 BLAKE2B 8c79b446a37be8f33c10b9fe987d2f55f285bf672a48bf307b60cbc322aadad1eec209b8d2ab88c023fcc718b08d089a151797e2b7352672234044ccd5eb9a9d SHA512 385de24a814646af3c8504ac1b76aa9d8ee5043d1e666656f7b31fc4a66c32b7c2a7b361b1a77e910182c07ff44bb1d228fd8de13a1915210035cad71251001a
DIST glibc-2.31.tar.xz 16676764 BLAKE2B 91df1792345f157265eae405185a81fd4b8ce36d4c2388f44b0d5b1ae38174ea374cbc909cd260770b9f38ea58051da13766d4fa22abf41c2d4a2493257b179b SHA512 735e4c0ef10418b6ea945ad3906585e5bbd8b282d76f2131309dce4cec6b15066a5e4a3731773ce428a819b542579c9957867bb0abf05ed2030983fca4412306
DIST glibc-9999-patches-16.tar.xz 17736 BLAKE2B 772f5012ead8e27f5cf5fd2613de9a76ead2128ecd9324cc499e677ea3a96110cb0d4b1d3f12860ffa1267093db310503d7d873fb95060b0c1e046c6a60601d0 SHA512 eb885b7743ac88df7e9eb3a1cd415bc9eabff1c6bd00d32c4e50f1d9dfcc32419eb72ef06749b279d5b80a200a83bc951a851b8c96a023ab09a8a0c28045d563
EBUILD glibc-2.19-r2.ebuild 38287 BLAKE2B 6537e90257900cfb0abd28c3391fb530fa24ce74cdcf870ce340f8ee605b941550329120b1598266ed9ace251f5d12980a20d0297c04fdff633ab92baed66ed4 SHA512 7082dfd299db188b9fad3a3807e723d7b274520cb579b8681030b10d8807520ccbc960ac47d03ad7c6788add345caaeae894e2f2bce2bc1394e564540707c488
-EBUILD glibc-2.24-r4.ebuild 6073 BLAKE2B d118847d3fc31ef71631117d8185ad63421defc890ace6c26685aa915ed3e8d999082d0818e2009fd22d7043f96d5a789e2cc4c4c067178a0ab8ca8a50f736f8 SHA512 10520e63d2860b976b65a77b5004bfe12088bb1530822a992e76a4e53b65398a54a7434248c674499b229bc2ea3ef60ceab47a7922c53efa74edc234db8a82a9
-EBUILD glibc-2.25-r11.ebuild 6062 BLAKE2B faec483e80c06b4b2a8f0f487291b97f2586d1074148aecdc8e0102ee8559cef5874de8e87dd2f0b6d7cef2ec54330fd92aa784aea12f9fbfbfb54a9a761fd7b SHA512 eae0b6c54f161e6c667b59aa8016e7839bd07cc93f2e6d21f64d5b11fe80a9add8aed0918e6d798c64854298b42ec25e0baae6e8721f6935f156b69cedf26f5d
-EBUILD glibc-2.26-r7.ebuild 26445 BLAKE2B 55294adb419661046ed77b4ff7cee93e65f20020770ecb4545822f9199fd752ac74a55f59c7e4f468a1a39bb3a6b22f9492d18f9d24bc16ddbaff6d0ee6d8a6e SHA512 e4e2f5028b983a90dfd533b65a871a075b79c1e3d861d2a4e4f3ba43dfcfc72874ef2854f5fbfd772009a274a7447f1d0cb55adba8d93d9a402c5db2e2be7112
-EBUILD glibc-2.27-r6.ebuild 41794 BLAKE2B 22a724389a01b2f209ae715a5d0d8ef0a8fadec80166b73818749a95882551301ce164ff069189826734c43afb03de5edcda26e718bb78f4cb72fe1d77eb4d56 SHA512 bdd5feca1faa0ca16dad3342d6abab409010c9fca8c96b4e9f37ef12bf4798a0db4a789ee2837de2074698049d3a02114d7f091f33de4ddfee14a17d0e70ad2a
-EBUILD glibc-2.28-r6.ebuild 41562 BLAKE2B 136fa0939e6cea391a70e8250abe580e6997d17b22a9294de98a28570ea297713a61de3c82afd845aaf39f006e29d70fd8db301f8df9b3192f2ab15c462d7a66 SHA512 88021bce3ea15d56bd83afa3112dcac24e6187952e53ff194ad2f6f5292b7b5396106917ab08dbfb5d7aa9c3201e1f5727e44b7fab5dd31e24f4a680a62e1f92
+EBUILD glibc-2.25-r11.ebuild 6063 BLAKE2B a995a2553fad56abe09f0f890e2c70f94568675057367795acc7e62fdeb8b103a8ed9b5228bbe3aa74a70c7d657808ee0420c6c8931386c7a9c2adb0c330d15c SHA512 1b8e906841492e4f9361f909e91069c3a642d84a0216fab18b434f61db991c13765a31e29175854d43bf1b8159b462cd02e138bd593990c2306afd70f163a0cd
+EBUILD glibc-2.26-r7.ebuild 26446 BLAKE2B dfc367d5351a5e010d48a1307a2358ec7637cb1a9302a95d04231e6818bc5b5abb89e884096190195433330cb7e2482ebf7d430e171029b31e7da011712cd3ea SHA512 37959b14a9ae60eff133f896f24bad56490e95a29a953a14df10d33ea588afd3e8f0c51ae29ecf12ea0d7596a736e3b2a7e0b95665400f8f2fca1ebe8d8c7f8c
+EBUILD glibc-2.27-r6.ebuild 41795 BLAKE2B cff5d02f78f3d4f5a5d68ee93774240f79738e439cc2f132ec0a6ad2f7e78b079115c62bf48dd39f4c9fe344128083a787b5029f628c7812a0b2607c6a845e0b SHA512 88143de8b73408374f3386499cdf982e464dcfd8b104426e723af99b01a013e61206d0da3ec7b1421ffcac05b025cb7aa944c714d69ff5a9782dd407ac8ad012
+EBUILD glibc-2.28-r6.ebuild 41563 BLAKE2B 8e0e67db7d98de149e07171cd40b26451068b48dff9c5f334a264c00987aff129c24f09b38703003139423fb81e0abd455a360c00bc76895e17e3b78be028608 SHA512 b021a2330f124a946b416cbd3f276be7226e5c26740f83e7d8c7bd8dd31632112c47cfcf9025715ee5e10649dad7ce402d711bec767a30fa90c20adf676116eb
EBUILD glibc-2.29-r7.ebuild 42146 BLAKE2B fc30939690b9a461fda38378198b8435be0fef975fe097722cce175275c0007ca09eb67aeb0746f6d358eaf458ad5aacd929c71dc7e71eb849e0de7df4837ca8 SHA512 0b429a1da4c45dcf2d8938299f44425a5411e9c8d856b4e5c5e623619362c1eb2c4c6b92f61a0855f94dd15b2f161b950d695551321cccefce43909cecedc5b3
-EBUILD glibc-2.29-r8.ebuild 42381 BLAKE2B b2d827a81913fe4cca89a738cc3a8cfea2258376a49073121ed8190e19f645a676cac952d069d5aa13a3958f3145724327407e28d422dd46bf6374741cd1213d SHA512 0d5d02315c715601780ddd345a2963195772752538d10d4804ec4fc3525f6c38f371f4fa16309dfeab285ed0b3a5af5f27dbc4ef2eca9bb0ab7f027552ded848
-EBUILD glibc-2.30-r7.ebuild 43415 BLAKE2B 7b329cab2a5fe7ef557e8278f88fa12310417d12f13fb27bc4cbbc41c05f8f189809dd98915f72d1b32f44a10987b7121b3eac6f59b888af3e36ba645363aafb SHA512 9feb12adc8ce95ba18f1adcac04cde0cc93dd0438eb8594e2b45403a728c3e82d38214d3beaf358ff782c7cb78466617e159910cd885dffc7c4278afcc30b256
-EBUILD glibc-2.30-r8.ebuild 43419 BLAKE2B d994286f8d4c3320818e01af67ce1a8fdfbbcd19961dc22cd6c4478050fd1ff4b4797faea1b3822f3790cf10c8cf2b55d330192796d4eb663f4409f1ce246711 SHA512 492a407986771ae8dc7f528489f4096f9583c0f2ddc4d97494cb2dd9eba48522dc35d7d31c58cdff3affc03dc113bf20cfc46a39cb5fd0775a415d31417a3f6c
-EBUILD glibc-2.31-r2.ebuild 42553 BLAKE2B a1825db913c872d427796acc5b62774bd34f09f98659e71b0bbacc03813bc74587282327bb7aa342b204a3791cd868f9896c87471966973caaaf9fdc619fa9d2 SHA512 369afac31beb44a911c9ad0c1cfb27a067d6a79769bcf8a0c516be38b77dc1334153b501654e9d0042a3b7a5e620ec4104ada79d85bb8e766c8ff2f9401d5a6a
-EBUILD glibc-9999.ebuild 42516 BLAKE2B a1402b7228694284f2d6f8d50305f1ebe47874e63b0188003ef136c0902aee644948a86353ebc7f02da7528f9d6cbc5893c5429c9a120ff26b5c1b37697d216d SHA512 2e8590e4278ba960fe1db2e11cfbaf0a7ed0f67b221990bc17a77956b6f7942fcb744e715dce2f02fe57f81a09c299f6abf9c61b495ea75df0727e97187f5328
+EBUILD glibc-2.29-r8.ebuild 42374 BLAKE2B 153acc4a84a09217795c55e748faeb8443f2eecf51dbc668601a65e9dedb80c4c0b6748b5d69914532c0c3fed7d827d064ae1373a614370751e86d2c84683f82 SHA512 cf05ad9bbed00b0d6ec69518764679ee170f8950568fbe3a4dc849d006b497003c58919b2ee58f89a4250a6ec80f715cb708f99484cec8a13c6b8042d6a19bc2
+EBUILD glibc-2.30-r8.ebuild 43412 BLAKE2B 538223619b741818228e5d0e000bd862c58416f165a739d579c526a6b4f59b2d458cf907cc9ad46c1524c6d5678114b33b1a196f29cad5210decdf85dfedb6e0 SHA512 63f4bbe64b2596eacbe05c4a3baf63a4b967c283a5a6f526092daf464ff34109ff52c22a7e1c4c6d7744a169a4b97bb135dd96a90196b0abbbc9910f41dc031e
+EBUILD glibc-2.31-r2.ebuild 42667 BLAKE2B 5b40b5eab6038150442b0f03b695503fc0b686281c72b07bf3b2a63cb108c981b5684021014ff1606b9adb35c208765a9e017dbf4f5475df0d2e9af2001d0229 SHA512 9fd6375c0717ae7183bee46c8b53bc8962406ac8838429e5a84884c2af287b39d882f2608adf72e5c066fcf242e7e4661b4e387459325fd5839134490c27097b
+EBUILD glibc-9999.ebuild 42635 BLAKE2B 02963f47e76ef21b2e0b6864136cad1053ee215ba9de9a968e85c1b34164b6067049f72e120c51092c10c7c9994cd07960463190bf01c4533e6fe0f70bdcd4ab SHA512 ec4f746b8209173bdad00fe7894fc48d9b6aac6dd213cb2a212d7971f1d03620ecb6901d995baba54c4718a520ccab3d9850d0a30622f270ba784945677fb2b6
MISC metadata.xml 1491 BLAKE2B 4688b54e937163824a5895f4fbbcc9f09152378c68416f62294f7f1506379ecb82de43e8d2c6a64d1647c16700abe7c750b3cc658a9c7053891b3a9504f2ae93 SHA512 f6c002a52bb81471fbb631c7c430e1e91f6fdefc84a0c1f330606ac6347067b60f8a6d078169d49d2b30fa6991883466fff05caf4f93f53c00e5ced625dd8c88
diff --git a/sys-libs/glibc/glibc-2.24-r4.ebuild b/sys-libs/glibc/glibc-2.24-r4.ebuild
deleted file mode 100644
index 567bb1615175..000000000000
--- a/sys-libs/glibc/glibc-2.24-r4.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs toolchain-glibc
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-case ${PV} in
-9999*)
- EGIT_REPO_URIS="https://sourceware.org/git/glibc.git"
- inherit git-r3
- ;;
-*)
- RELEASE_VER=${PV}
- ;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="10" # Gentoo patchset
-: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires
-
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only"
-
-# Here's how the cross-compile logic breaks down ...
-# CTARGET - machine that will target the binaries
-# CHOST - machine that will host the binaries
-# CBUILD - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-# CBUILD = CHOST = CTARGET - native build/install
-# CBUILD != (CHOST = CTARGET) - cross-compile a native build
-# (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler
-# For install paths:
-# CHOST = CTARGET - install into /
-# CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-# Note [Disable automatic stripping]
-# Disabling automatic stripping for a few reasons:
-# - portage's attempt to strip breaks non-native binaries at least on
-# arm: bug #697428
-# - portage's attempt to strip libpthread.so.0 breaks gdb thread
-# enumeration: bug #697910. This is quite subtle:
-# * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
-# * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
-# via 'ps_pglobal_lookup' symbol defined in gdb.
-# * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
-# known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
-# (unexported) is used to sanity check compatibility before enabling
-# debugging.
-# Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
-# * normal 'strip' command trims '.symtab'
-# Thus our main goal here is to prevent 'libpthread.so.0' from
-# losing it's '.symtab' entries.
-# As Gentoo's strip does not allow us to pass less aggressive stripping
-# options and does not check the machine target we disable stripping
-# entirely.
-RESTRICT=strip
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-COMMON_DEPEND="
- nscd? ( selinux? (
- audit? ( sys-process/audit )
- caps? ( sys-libs/libcap )
- ) )
- suid? ( caps? ( sys-libs/libcap ) )
- selinux? ( sys-libs/libselinux )
-"
-DEPEND="${COMMON_DEPEND}
- >=app-misc/pax-utils-0.1.10
-"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/gentoo-functions
-"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
- DEPEND+=" !headers-only? (
- >=${CATEGORY}/binutils-2.24
- >=${CATEGORY}/gcc-4.7
- )"
- [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
- DEPEND+="
- >=sys-devel/binutils-2.24
- >=sys-devel/gcc-4.7
- virtual/os-headers"
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
- PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-upstream_uris() {
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-}
-gentoo_uris() {
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI"
- devspace=${devspace//HTTP/https://dev.gentoo.org/}
- echo mirror://gentoo/$1 ${devspace//URI/$1}
-}
-SRC_URI=$(
- [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
- [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
-)
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
-
-src_unpack() {
- [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-
- toolchain-glibc_src_unpack
-}
-
-src_prepare() {
- toolchain-glibc_src_prepare
-
- cd "${S}"
-
- epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
-
- if use hardened ; then
- # We don't enable these for non-hardened as the output is very terse --
- # it only states that a crash happened. The default upstream behavior
- # includes backtraces and symbols.
- einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die
-
- if use debug ; then
- # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
- sed -i \
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
- debug/Makefile || die
- fi
-
- # Build various bits with ssp-all
- sed -i \
- -e 's:-fstack-protector$:-fstack-protector-all:' \
- */Makefile || die
- fi
-
- case $(gcc-fullversion) in
- 4.8.[0-3]|4.9.0)
- eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile"
- eerror "glibc. See https://bugs.gentoo.org/547420 for details."
- die "need to switch compilers #547420"
- ;;
- esac
-}
diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild
index 1c8c64b250fc..1946fcf4489c 100644
--- a/sys-libs/glibc/glibc-2.25-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r11.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
EMULTILIB_PKG="true"
# Configuration variables
diff --git a/sys-libs/glibc/glibc-2.26-r7.ebuild b/sys-libs/glibc/glibc-2.26-r7.ebuild
index d93751d9a5f6..95efd5f51399 100644
--- a/sys-libs/glibc/glibc-2.26-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r7.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
fi
diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild
index f434b1122423..70de8f8358bf 100644
--- a/sys-libs/glibc/glibc-2.27-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
fi
diff --git a/sys-libs/glibc/glibc-2.28-r6.ebuild b/sys-libs/glibc/glibc-2.28-r6.ebuild
index 86e3b7b7f565..1569309d3f9c 100644
--- a/sys-libs/glibc/glibc-2.28-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
fi
diff --git a/sys-libs/glibc/glibc-2.29-r8.ebuild b/sys-libs/glibc/glibc-2.29-r8.ebuild
index c95d7016c40f..b255df21e867 100644
--- a/sys-libs/glibc/glibc-2.29-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r8.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
fi
diff --git a/sys-libs/glibc/glibc-2.30-r7.ebuild b/sys-libs/glibc/glibc-2.30-r7.ebuild
deleted file mode 100644
index 58f64e8203c3..000000000000
--- a/sys-libs/glibc/glibc-2.30-r7.ebuild
+++ /dev/null
@@ -1,1471 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
- multilib systemd multiprocessing
-
-DESCRIPTION="GNU libc C library"
-HOMEPAGE="https://www.gnu.org/software/libc/"
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-SLOT="2.2"
-
-EMULTILIB_PKG="true"
-
-if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
- inherit git-r3
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
- SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
-fi
-
-RELEASE_VER=${PV}
-
-GCC_BOOTSTRAP_VER=20180511
-
-# Gentoo patchset
-PATCH_VER=9
-PATCH_DEV=slyfox
-
-SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
-SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
-
-IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs suid systemtap test vanilla"
-
-# Minimum kernel version that glibc requires
-MIN_KERN_VER="3.2.0"
-
-# Here's how the cross-compile logic breaks down ...
-# CTARGET - machine that will target the binaries
-# CHOST - machine that will host the binaries
-# CBUILD - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-# CBUILD = CHOST = CTARGET - native build/install
-# CBUILD != (CHOST = CTARGET) - cross-compile a native build
-# (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler
-# For install paths:
-# CHOST = CTARGET - install into /
-# CHOST != CTARGET - install into /usr/CTARGET/
-#
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-# Note [Disable automatic stripping]
-# Disabling automatic stripping for a few reasons:
-# - portage's attempt to strip breaks non-native binaries at least on
-# arm: bug #697428
-# - portage's attempt to strip libpthread.so.0 breaks gdb thread
-# enumeration: bug #697910. This is quite subtle:
-# * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
-# * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
-# via 'ps_pglobal_lookup' symbol defined in gdb.
-# * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
-# known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
-# (unexported) is used to sanity check compatibility before enabling
-# debugging.
-# Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
-# * normal 'strip' command trims '.symtab'
-# Thus our main goal here is to prevent 'libpthread.so.0' from
-# losing it's '.symtab' entries.
-# As Gentoo's strip does not allow us to pass less aggressive stripping
-# options and does not check the machine target we strip selectively.
-
-# We need a new-enough binutils/gcc to match upstream baseline.
-# Also we need to make sure our binutils/gcc supports TLS,
-# and that gcc already contains the hardened patches.
-BDEPEND="
- ${PYTHON_DEPS}
- >=app-misc/pax-utils-0.1.10
- sys-devel/bison
- !<sys-devel/bison-2.7
- doc? ( sys-apps/texinfo )
-"
-COMMON_DEPEND="
- gd? ( media-libs/gd:2= )
- nscd? ( selinux? (
- audit? ( sys-process/audit )
- caps? ( sys-libs/libcap )
- ) )
- suid? ( caps? ( sys-libs/libcap ) )
- selinux? ( sys-libs/libselinux )
- systemtap? ( dev-util/systemtap )
-"
-DEPEND="${COMMON_DEPEND}
- test? ( >=net-dns/libidn2-2.3.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/gentoo-functions
-"
-
-RESTRICT="!test? ( test )"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
- BDEPEND+=" !headers-only? (
- >=${CATEGORY}/binutils-2.24
- >=${CATEGORY}/gcc-6
- )"
- [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
- BDEPEND+="
- >=sys-devel/binutils-2.24
- >=sys-devel/gcc-6
- "
- DEPEND+=" virtual/os-headers "
- RDEPEND+="
- >=net-dns/libidn2-2.3.0
- vanilla? ( !sys-libs/timezone-data )
- "
- PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-# Ignore tests whitelisted below
-GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
-
-# The following tests fail due to the Gentoo build system and are thus
-# executed but ignored:
-XFAIL_TEST_LIST=(
- # 1) Sandbox
- tst-ldconfig-bad-aux-cache
- tst-pldd
- tst-mallocfork2
- tst-nss-db-endgrent
- tst-nss-db-endpwent
- tst-nss-files-hosts-long
- tst-nss-test3
- # 2) Namespaces and cgroup
- tst-locale-locpath
- # 9) Failures of unknown origin
- tst-latepthread
-)
-
-#
-# Small helper functions
-#
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- is_crosscompile && use headers-only
-}
-
-alt_prefix() {
- is_crosscompile && echo /usr/${CTARGET}
-}
-
-# This prefix is applicable to CHOST when building against this
-# glibc. It is baked into the library at configure time.
-host_eprefix() {
- is_crosscompile || echo "${EPREFIX}"
-}
-
-# This prefix is applicable to CBUILD when building against this
-# glibc. It determines the destination path at install time.
-build_eprefix() {
- is_crosscompile && echo "${EPREFIX}"
-}
-
-# We need to be able to set alternative headers for compiling for non-native
-# platform. Will also become useful for testing kernel-headers without screwing
-# up the whole system.
-alt_headers() {
- echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
-}
-
-alt_build_headers() {
- if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
- ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
- if tc-is-cross-compiler ; then
- ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
- if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
- local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
- ALT_BUILD_HEADERS=${header_path%/linux/version.h}
- fi
- fi
- fi
- echo "${ALT_BUILD_HEADERS}"
-}
-
-alt_libdir() {
- echo $(alt_prefix)/$(get_libdir)
-}
-alt_usrlibdir() {
- echo $(alt_prefix)/usr/$(get_libdir)
-}
-
-builddir() {
- echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
-}
-
-do_compile_test() {
- local ret save_cflags=${CFLAGS}
- CFLAGS+=" $1"
- shift
-
- pushd "${T}" >/dev/null
-
- rm -f glibc-test*
- printf '%b' "$*" > glibc-test.c
-
- nonfatal emake glibc-test
- ret=$?
-
- popd >/dev/null
-
- CFLAGS=${save_cflags}
- return ${ret}
-}
-
-do_run_test() {
- local ret
-
- if [[ ${MERGE_TYPE} == "binary" ]] ; then
- # ignore build failures when installing a binary package #324685
- do_compile_test "" "$@" 2>/dev/null || return 0
- else
- if ! do_compile_test "" "$@" ; then
- ewarn "Simple build failed ... assuming this is desired #324685"
- return 0
- fi
- fi
-
- pushd "${T}" >/dev/null
-
- ./glibc-test
- ret=$?
- rm -f glibc-test*
-
- popd >/dev/null
-
- return ${ret}
-}
-
-setup_target_flags() {
- # This largely mucks with compiler flags. None of which should matter
- # when building up just the headers.
- just_headers && return 0
-
- case $(tc-arch) in
- x86)
- # -march needed for #185404 #199334
- # TODO: When creating the first glibc cross-compile, this test will
- # always fail as it does a full link which in turn requires glibc.
- # Probably also applies when changing multilib profile settings (e.g.
- # enabling x86 when the profile was amd64-only previously).
- # We could change main to _start and pass -nostdlib here so that we
- # only test the gcc code compilation. Or we could do a compile and
- # then look for the symbol via scanelf.
- if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
- local t=${CTARGET_OPT:-${CTARGET}}
- t=${t%%-*}
- filter-flags '-march=*'
- export CFLAGS="-march=${t} ${CFLAGS}"
- einfo "Auto adding -march=${t} to CFLAGS #185404"
- fi
- ;;
- amd64)
- # -march needed for #185404 #199334
- # TODO: See cross-compile issues listed above for x86.
- [[ ${ABI} == x86 ]] &&
- if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
- local t=${CTARGET_OPT:-${CTARGET}}
- t=${t%%-*}
- # Normally the target is x86_64-xxx, so turn that into the -march that
- # gcc actually accepts. #528708
- [[ ${t} == "x86_64" ]] && t="x86-64"
- filter-flags '-march=*'
- # ugly, ugly, ugly. ugly.
- CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
- export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
- einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
- fi
- ;;
- mips)
- # The mips abi cannot support the GNU style hashes. #233233
- filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
- ;;
- sparc)
- # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though.
- filter-flags "-fcall-used-g7"
- append-flags "-fcall-used-g6"
-
- local cpu
- case ${CTARGET} in
- sparc64-*)
- cpu="sparc64"
- case $(get-flag mcpu) in
- v9)
- # We need to force at least v9a because the base build doesn't
- # work with just v9.
- # https://sourceware.org/bugzilla/show_bug.cgi?id=19477
- append-flags "-Wa,-xarch=v9a"
- ;;
- esac
- ;;
- sparc-*)
- case $(get-flag mcpu) in
- v8|supersparc|hypersparc|leon|leon3)
- cpu="sparcv8"
- ;;
- *)
- cpu="sparcv9"
- ;;
- esac
- ;;
- esac
- [[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
- ;;
- esac
-}
-
-setup_flags() {
- # Make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-
- # Store our CFLAGS because it's changed depending on which CTARGET
- # we are building when pulling glibc on a multilib profile
- CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
- CFLAGS=${CFLAGS_BASE}
- CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
- CXXFLAGS=${CXXFLAGS_BASE}
- ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
- ASFLAGS=${ASFLAGS_BASE}
-
- # Allow users to explicitly avoid flag sanitization via
- # USE=custom-cflags.
- if ! use custom-cflags; then
- # Over-zealous CFLAGS can often cause problems. What may work for one
- # person may not work for another. To avoid a large influx of bugs
- # relating to failed builds, we strip most CFLAGS out to ensure as few
- # problems as possible.
- strip-flags
- # Lock glibc at -O2; we want to be conservative here.
- filter-flags '-O?'
- append-flags -O2
- fi
- strip-unsupported-flags
- filter-flags -m32 -m64 '-mabi=*'
-
- # glibc aborts if rpath is set by LDFLAGS
- filter-ldflags '-Wl,-rpath=*'
-
- # #492892
- filter-flags -frecord-gcc-switches
-
- unset CBUILD_OPT CTARGET_OPT
- if use multilib ; then
- CTARGET_OPT=$(get_abi_CTARGET)
- [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
- fi
-
- setup_target_flags
-
- if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
- CBUILD_OPT=${CTARGET_OPT}
- fi
-
- # glibc's headers disallow -O0 and fail at build time:
- # include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
- replace-flags -O0 -O1
-
- filter-flags '-fstack-protector*'
-}
-
-want_tls() {
- # Archs that can use TLS (Thread Local Storage)
- case $(tc-arch) in
- x86)
- # requires i486 or better #106556
- [[ ${CTARGET} == i[4567]86* ]] && return 0
- return 1
- ;;
- esac
- return 0
-}
-
-want__thread() {
- want_tls || return 1
-
- # For some reason --with-tls --with__thread is causing segfaults on sparc32.
- [[ ${PROFILE_ARCH} == "sparc" ]] && return 1
-
- [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
-
- # only test gcc -- can't test linking yet
- tc-has-tls -c ${CTARGET}
- WANT__THREAD=$?
-
- return ${WANT__THREAD}
-}
-
-use_multiarch() {
- # Allow user to disable runtime arch detection in multilib.
- use multiarch || return 1
- # Make sure binutils is new enough to support indirect functions,
- # #336792. This funky sed supports gold and bfd linkers.
- local bver nver
- bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
- case $(tc-arch ${CTARGET}) in
- amd64|x86) nver="2.20" ;;
- arm) nver="2.22" ;;
- hppa) nver="2.23" ;;
- ppc|ppc64) nver="2.20" ;;
- # ifunc support was added in 2.23, but glibc also needs
- # machinemode which is in 2.24.
- s390) nver="2.24" ;;
- sparc) nver="2.21" ;;
- *) return 1 ;;
- esac
- ver_test ${bver} -ge ${nver}
-}
-
-# Setup toolchain variables that had historically been defined in the
-# profiles for these archs.
-setup_env() {
- # silly users
- unset LD_RUN_PATH
- unset LD_ASSUME_KERNEL
-
- if is_crosscompile || tc-is-cross-compiler ; then
- multilib_env ${CTARGET_OPT:-${CTARGET}}
-
- if ! use multilib ; then
- MULTILIB_ABIS=${DEFAULT_ABI}
- else
- MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
- fi
-
- # If the user has CFLAGS_<CTARGET> in their make.conf, use that,
- # and fall back on CFLAGS.
- local VAR=CFLAGS_${CTARGET//[-.]/_}
- CFLAGS=${!VAR-${CFLAGS}}
- einfo " $(printf '%15s' 'Manual CFLAGS:') ${CFLAGS}"
- fi
-
- setup_flags
-
- export ABI=${ABI:-${DEFAULT_ABI:-default}}
-
- if just_headers ; then
- # Avoid mixing host's CC and target's CFLAGS_${ABI}:
- # At this bootstrap stage we have only binutils for
- # target but not compiler yet.
- einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
- return 0
- fi
- local VAR=CFLAGS_${ABI}
- # We need to export CFLAGS with abi information in them because glibc's
- # configure script checks CFLAGS for some targets (like mips). Keep
- # around the original clean value to avoid appending multiple ABIs on
- # top of each other.
- : ${__GLIBC_CC:=$(tc-getCC ${CTARGET})}
- export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
- einfo " $(printf '%15s' 'Manual CC:') ${CC}"
-}
-
-foreach_abi() {
- setup_env
-
- local ret=0
- local abilist=""
- if use multilib ; then
- abilist=$(get_install_abis)
- else
- abilist=${DEFAULT_ABI}
- fi
- local -x ABI
- for ABI in ${abilist:-default} ; do
- setup_env
- einfo "Running $1 for ABI ${ABI}"
- $1
- : $(( ret |= $? ))
- done
- return ${ret}
-}
-
-glibc_banner() {
- local b="Gentoo ${PVR}"
- [[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
- echo "${b}"
-}
-
-check_devpts() {
- # Make sure devpts is mounted correctly for use w/out setuid pt_chown.
-
- # If merely building the binary package, then there's nothing to verify.
- [[ ${MERGE_TYPE} == "buildonly" ]] && return
-
- # Only sanity check when installing the native glibc.
- [[ -n ${ROOT} ]] && return
-
- # If they're opting in to the old suid code, then no need to check.
- use suid && return
-
- if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
- eerror "In order to use glibc with USE=-suid, you must make sure that"
- eerror "you have devpts mounted at /dev/pts with the gid=5 option."
- eerror "Openrc should do this for you, so you should check /etc/fstab"
- eerror "and make sure you do not have any invalid settings there."
- die "mount & fix your /dev/pts settings"
- fi
-}
-
-# The following Kernel version handling functions are mostly copied from portage
-# source. It's better not to use linux-info.eclass here since a) it adds too
-# much magic, see bug 326693 for some of the arguments, and b) some of the
-# functions are just not provided.
-
-g_get_running_KV() {
- uname -r
- return $?
-}
-
-g_KV_major() {
- [[ -z $1 ]] && return 1
- local KV=$@
- echo "${KV%%.*}"
-}
-
-g_KV_minor() {
- [[ -z $1 ]] && return 1
- local KV=$@
- KV=${KV#*.}
- echo "${KV%%.*}"
-}
-
-g_KV_micro() {
- [[ -z $1 ]] && return 1
- local KV=$@
- KV=${KV#*.*.}
- echo "${KV%%[^[:digit:]]*}"
-}
-
-g_KV_to_int() {
- [[ -z $1 ]] && return 1
- local KV_MAJOR=$(g_KV_major "$1")
- local KV_MINOR=$(g_KV_minor "$1")
- local KV_MICRO=$(g_KV_micro "$1")
- local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
-
- # We make version 2.2.0 the minimum version we will handle as
- # a sanity check ... if its less, we fail ...
- if [[ ${KV_int} -ge 131584 ]] ; then
- echo "${KV_int}"
- return 0
- fi
- return 1
-}
-
-g_int_to_KV() {
- local version=$1 major minor micro
- major=$((version / 65536))
- minor=$(((version % 65536) / 256))
- micro=$((version % 256))
- echo ${major}.${minor}.${micro}
-}
-
-eend_KV() {
- [[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
- eend $?
-}
-
-get_kheader_version() {
- printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
- $(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
- tail -n 1
-}
-
-# We collect all sanity checks here. Consistency is not guranteed between
-# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
-# src_unpack.
-sanity_prechecks() {
- # Make sure devpts is mounted correctly for use w/out setuid pt_chown
- check_devpts
-
- # Prevent native builds from downgrading
- if [[ ${MERGE_TYPE} != "buildonly" ]] && \
- [[ -z ${ROOT} ]] && \
- [[ ${CBUILD} == ${CHOST} ]] && \
- [[ ${CHOST} == ${CTARGET} ]] ; then
-
- # The high rev # is to allow people to downgrade between -r#
- # versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
- # should be fine. Hopefully we never actually use a r# this
- # high.
- if has_version ">${CATEGORY}/${P}-r10000" ; then
- eerror "Sanity check to keep you from breaking your system:"
- eerror " Downgrading glibc is not supported and a sure way to destruction."
- [[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
- fi
-
- if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
- eerror "Your old kernel is broken. You need to update it to a newer"
- eerror "version as syscall(<bignum>) will break. See bug 279260."
- die "Old and broken kernel."
- fi
- fi
-
- # Users have had a chance to phase themselves, time to give em the boot
- if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
- eerror "You still haven't deleted ${EROOT}/etc/locales.build."
- eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
- die "Lazy upgrader detected"
- fi
-
- if [[ ${CTARGET} == i386-* ]] ; then
- eerror "i386 CHOSTs are no longer supported."
- eerror "Chances are you don't actually want/need i386."
- eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
- die "Please fix your CHOST"
- fi
-
- if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
- ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
- ewarn "This will result in a 50% performance penalty when running with a 32bit"
- ewarn "hypervisor, which is probably not what you want."
- fi
-
- # Check for sanity of /etc/nsswitch.conf
- if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
- local entry
- for entry in passwd group shadow; do
- if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
- eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
- eerror "Please make sure you have 'files' entries for"
- eerror "'passwd:', 'group:' and 'shadow:' databases."
- eerror "For more details see:"
- eerror " https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
- die "nsswitch.conf has no 'files' provider in '${entry}'."
- fi
- done
- fi
-
- # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
- # we test for...
- if ! is_crosscompile ; then
- if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
- ebegin "Checking that IA32 emulation is enabled in the running kernel"
- echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
- local STAT
- if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
- "${T}/check-ia32-emulation.elf32"
- STAT=$?
- else
- # Don't fail here to allow single->multi ABI switch
- # or recover from breakage like bug #646424
- ewarn "Failed to compile the ABI test. Broken host glibc?"
- STAT=0
- fi
- rm -f "${T}/check-ia32-emulation.elf32"
- eend $STAT
- [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
- fi
-
- fi
-
- # When we actually have to compile something...
- if ! just_headers ; then
- ebegin "Checking gcc for __thread support"
- if ! eend $(want__thread ; echo $?) ; then
- echo
- eerror "Could not find a gcc that supports the __thread directive!"
- eerror "Please update your binutils/gcc and try again."
- die "No __thread support in gcc!"
- fi
-
- if [[ ${CTARGET} == *-linux* ]] ; then
- local run_kv build_kv want_kv
-
- run_kv=$(g_get_running_KV)
- build_kv=$(g_int_to_KV $(get_kheader_version))
- want_kv=${MIN_KERN_VER}
-
- if ! is_crosscompile && ! tc-is-cross-compiler ; then
- # Building fails on an non-supporting kernel
- ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
- if ! eend_KV ${run_kv} ${want_kv} ; then
- echo
- eerror "You need a kernel of at least ${want_kv}!"
- die "Kernel version too low!"
- fi
- fi
-
- ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
- if ! eend_KV ${build_kv} ${want_kv} ; then
- echo
- eerror "You need linux-headers of at least ${want_kv}!"
- die "linux-headers version too low!"
- fi
- fi
- fi
-}
-
-#
-# the phases
-#
-
-# pkg_pretend
-
-pkg_pretend() {
- # All the checks...
- einfo "Checking general environment sanity."
- sanity_prechecks
-}
-
-pkg_setup() {
- # see bug 682570
- [[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
-}
-
-# src_unpack
-
-src_unpack() {
- # Consistency is not guaranteed between pkg_ and src_ ...
- sanity_prechecks
-
- use multilib && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
-
- setup_env
-
- if [[ -n ${EGIT_REPO_URI} ]] ; then
- git-r3_src_unpack
- else
- unpack ${P}.tar.xz
- fi
-
- cd "${WORKDIR}" || die
- unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
-}
-
-src_prepare() {
- if ! use vanilla ; then
- elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}"
- eapply "${WORKDIR}"/patches
- einfo "Done."
- fi
-
- default
-
- gnuconfig_update
-
- cd "${WORKDIR}"
- find . -name configure -exec touch {} +
-
- eprefixify extra/locale/locale-gen
-
- # Fix permissions on some of the scripts.
- chmod u+x "${S}"/scripts/*.sh
-
- cd "${S}"
-}
-
-glibc_do_configure() {
- # Glibc does not work with gold (for various reasons) #269274.
- tc-ld-disable-gold
-
- # CXX isnt handled by the multilib system, so if we dont unset here
- # we accumulate crap across abis
- unset CXX
-
- einfo "Configuring glibc for nptl"
-
- if use doc ; then
- export MAKEINFO=makeinfo
- else
- export MAKEINFO=/dev/null
- fi
-
- local v
- for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do
- einfo " $(printf '%15s' ${v}:) ${!v}"
- done
-
- # CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
- # To build .S (assembly) files with the same ABI-specific flags
- # upstream currently recommends adding CFLAGS to CC/CXX:
- # https://sourceware.org/PR23273
- # Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
- # and breaks multiarch support. See 659030#c3 for an example.
- # The glibc configure script doesn't properly use LDFLAGS all the time.
- export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
- einfo " $(printf '%15s' 'Manual CC:') ${CC}"
-
- # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
- export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
-
- if is_crosscompile; then
- # Assume worst-case bootstrap: glibc is buil first time
- # when ${CTARGET}-g++ is not available yet. We avoid
- # building auxiliary programs that require C++: bug #683074
- # It should not affect final result.
- export libc_cv_cxx_link_ok=no
- # The line above has the same effect. We set CXX explicitly
- # to make build logs less confusing.
- export CXX=
- fi
- einfo " $(printf '%15s' 'Manual CXX:') ${CXX}"
-
- echo
-
- local myconf=()
-
- case ${CTARGET} in
- m68k*)
- # setjmp() is not compatible with stack protection:
- # https://sourceware.org/PR24202
- myconf+=( --enable-stack-protector=no )
- ;;
- powerpc-*)
- # Currently gcc on powerpc32 generates invalid code for
- # __builtin_return_address(0) calls. Normally programs
- # don't do that but malloc hooks in glibc do:
- # https://gcc.gnu.org/PR81996
- # https://bugs.gentoo.org/629054
- myconf+=( --enable-stack-protector=no )
- ;;
- *)
- # Use '=strong' instead of '=all' to protect only functions
- # worth protecting from stack smashes.
- # '=all' is also known to have a problem in IFUNC resolution
- # tests: https://sourceware.org/PR25680, bug #712356.
- myconf+=( --enable-stack-protector=$(usex ssp strong no) )
- ;;
- esac
- myconf+=( --enable-stackguard-randomization )
-
- # Keep a whitelist of targets supporing IFUNC. glibc's ./configure
- # is not robust enough to detect proper support:
- # https://bugs.gentoo.org/641216
- # https://sourceware.org/PR22634#c0
- case $(tc-arch ${CTARGET}) in
- # Keep whitelist of targets where autodetection mostly works.
- amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
- # Blacklist everywhere else
- *) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
- esac
-
- # Enable Intel Control-flow Enforcement Technology on amd64 if requested
- case ${CTARGET} in
- x86_64-*) myconf+=( $(use_enable cet) ) ;;
- *) ;;
- esac
-
- [[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
-
- myconf+=( --enable-kernel=${MIN_KERN_VER} )
-
- # Since SELinux support is only required for nscd, only enable it if:
- # 1. USE selinux
- # 2. only for the primary ABI on multilib systems
- # 3. Not a crosscompile
- if ! is_crosscompile && use selinux ; then
- if use multilib ; then
- if is_final_abi ; then
- myconf+=( --with-selinux )
- else
- myconf+=( --without-selinux )
- fi
- else
- myconf+=( --with-selinux )
- fi
- else
- myconf+=( --without-selinux )
- fi
-
- # Force a few tests where we always know the answer but
- # configure is incapable of finding it.
- if is_crosscompile ; then
- export \
- libc_cv_c_cleanup=yes \
- libc_cv_forced_unwind=yes
- fi
-
- myconf+=(
- --without-cvs
- --disable-werror
- --enable-bind-now
- --build=${CBUILD_OPT:-${CBUILD}}
- --host=${CTARGET_OPT:-${CTARGET}}
- $(use_enable profile)
- $(use_with gd)
- --with-headers=$(build_eprefix)$(alt_build_headers)
- --prefix="$(host_eprefix)/usr"
- --sysconfdir="$(host_eprefix)/etc"
- --localstatedir="$(host_eprefix)/var"
- --libdir='$(prefix)'/$(get_libdir)
- --mandir='$(prefix)'/share/man
- --infodir='$(prefix)'/share/info
- --libexecdir='$(libdir)'/misc/glibc
- --with-bugurl=https://bugs.gentoo.org/
- --with-pkgversion="$(glibc_banner)"
- $(use_enable crypt)
- $(use_multiarch || echo --disable-multi-arch)
- $(use_enable systemtap)
- $(use_enable nscd)
- ${EXTRA_ECONF}
- )
-
- # We rely on sys-libs/timezone-data for timezone tools normally.
- myconf+=( $(use_enable vanilla timezone-tools) )
-
- # These libs don't have configure flags.
- ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
- ac_cv_lib_cap_cap_init=$(usex caps || echo no)
-
- # There is no configure option for this and we need to export it
- # since the glibc build will re-run configure on itself
- export libc_cv_rootsbindir="$(host_eprefix)/sbin"
- export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
-
- # We take care of patching our binutils to use both hash styles,
- # and many people like to force gnu hash style only, so disable
- # this overriding check. #347761
- export libc_cv_hashstyle=no
-
- local builddir=$(builddir nptl)
- mkdir -p "${builddir}"
- cd "${builddir}"
- set -- "${S}"/configure "${myconf[@]}"
- echo "$@"
- "$@" || die "failed to configure glibc"
-
- # ia64 static cross-compilers are a pita in so much that they
- # can't produce static ELFs (as the libgcc.a is broken). so
- # disable building of the programs for those targets if it
- # doesn't work.
- # XXX: We could turn this into a compiler test, but ia64 is
- # the only one that matters, so this should be fine for now.
- if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
- sed -i '1i+link-static = touch $@' config.make
- fi
-
- # If we're trying to migrate between ABI sets, we need
- # to lie and use a local copy of gcc. Like if the system
- # is built with MULTILIB_ABIS="amd64 x86" but we want to
- # add x32 to it, gcc/glibc don't yet support x32.
- #
- if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
- echo 'main(){}' > "${T}"/test.c
- if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
- sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
- fi
- fi
-}
-
-glibc_headers_configure() {
- export ABI=default
-
- local builddir=$(builddir "headers")
- mkdir -p "${builddir}"
- cd "${builddir}"
-
- # if we don't have a compiler yet, we can't really test it now ...
- # hopefully they don't affect header generation, so let's hope for
- # the best here ...
- local v vars=(
- ac_cv_header_cpuid_h=yes
- libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
- libc_cv_asm_cfi_directives=yes
- libc_cv_broken_visibility_attribute=no
- libc_cv_c_cleanup=yes
- libc_cv_compiler_powerpc64le_binary128_ok=yes
- libc_cv_forced_unwind=yes
- libc_cv_gcc___thread=yes
- libc_cv_mlong_double_128=yes
- libc_cv_mlong_double_128ibm=yes
- libc_cv_ppc_machine=yes
- libc_cv_ppc_rel16=yes
- libc_cv_predef_fortify_source=no
- libc_cv_target_power8_ok=yes
- libc_cv_visibility_attribute=yes
- libc_cv_z_combreloc=yes
- libc_cv_z_execstack=yes
- libc_cv_z_initfirst=yes
- libc_cv_z_nodelete=yes
- libc_cv_z_nodlopen=yes
- libc_cv_z_relro=yes
- libc_mips_abi=${ABI}
- libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
- # These libs don't have configure flags.
- ac_cv_lib_audit_audit_log_user_avc_message=no
- ac_cv_lib_cap_cap_init=no
- )
-
- einfo "Forcing cached settings:"
- for v in "${vars[@]}" ; do
- einfo " ${v}"
- export ${v}
- done
-
- local headers_only_arch_CPPFLAGS=()
-
- # Blow away some random CC settings that screw things up. #550192
- if [[ -d ${S}/sysdeps/mips ]]; then
- pushd "${S}"/sysdeps/mips >/dev/null
- sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
- sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
-
- # Force the mips ABI to the default. This is OK because the set of
- # installed headers in this phase is the same between the 3 ABIs.
- # If this ever changes, this hack will break, but that's unlikely
- # as glibc discourages that behavior.
- # https://crbug.com/647033
- sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
-
- popd >/dev/null
- fi
-
- case ${CTARGET} in
- riscv*)
- # RISC-V interrogates the compiler to determine which target to
- # build. If building the headers then we don't strictly need a
- # RISC-V compiler, so the built-in definitions that are provided
- # along with all RISC-V compiler might not exist. This causes
- # glibc's RISC-V preconfigure script to blow up. Since we're just
- # building the headers any value will actually work here, so just
- # pick the standard one (rv64g/lp64d) to make the build scripts
- # happy for now -- the headers are all the same anyway so it
- # doesn't matter.
- headers_only_arch_CPPFLAGS+=(
- -D__riscv_xlen=64
- -D__riscv_flen=64
- -D__riscv_float_abi_double=1
- -D__riscv_atomic=1
- ) ;;
- esac
-
- local myconf=()
- myconf+=(
- --disable-sanity-checks
- --enable-hacker-mode
- --without-cvs
- --disable-werror
- --enable-bind-now
- --build=${CBUILD_OPT:-${CBUILD}}
- --host=${CTARGET_OPT:-${CTARGET}}
- --with-headers=$(build_eprefix)$(alt_build_headers)
- --prefix="$(host_eprefix)/usr"
- ${EXTRA_ECONF}
- )
-
- # Nothing is compiled here which would affect the headers for the target.
- # So forcing CC/CFLAGS is sane.
- local headers_only_CC=$(tc-getBUILD_CC)
- local headers_only_CFLAGS="-O1 -pipe"
- local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
- local headers_only_LDFLAGS=""
- set -- "${S}"/configure "${myconf[@]}"
- echo \
- "CC=${headers_only_CC}" \
- "CFLAGS=${headers_only_CFLAGS}" \
- "CPPFLAGS=${headers_only_CPPFLAGS}" \
- "LDFLAGS=${headers_only_LDFLAGS}" \
- "$@"
- CC=${headers_only_CC} \
- CFLAGS=${headers_only_CFLAGS} \
- CPPFLAGS=${headers_only_CPPFLAGS} \
- LDFLAGS="" \
- "$@" || die "failed to configure glibc"
-}
-
-do_src_configure() {
- if just_headers ; then
- glibc_headers_configure
- else
- glibc_do_configure nptl
- fi
-}
-
-src_configure() {
- foreach_abi do_src_configure
-}
-
-do_src_compile() {
- emake -C "$(builddir nptl)"
-}
-
-src_compile() {
- if just_headers ; then
- return
- fi
-
- foreach_abi do_src_compile
-}
-
-glibc_src_test() {
- cd "$(builddir nptl)"
-
- local myxfailparams=""
- if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
- for myt in ${XFAIL_TEST_LIST[@]} ; do
- myxfailparams+="test-xfail-${myt}=yes "
- done
- fi
-
- emake ${myxfailparams} check
-}
-
-do_src_test() {
- local ret=0
-
- glibc_src_test
- : $(( ret |= $? ))
-
- return ${ret}
-}
-
-src_test() {
- if just_headers ; then
- return
- fi
-
- # Give tests more time to complete.
- export TIMEOUTFACTOR=5
-
- foreach_abi do_src_test || die "tests failed"
-}
-
-run_locale_gen() {
- # if the host locales.gen contains no entries, we'll install everything
- local root="$1"
- local inplace=""
-
- if [[ "${root}" == "--inplace-glibc" ]] ; then
- inplace="--inplace-glibc"
- root="$2"
- fi
-
- local locale_list="${root}/etc/locale.gen"
-
- pushd "${ED}"/$(get_libdir) >/dev/null
-
- if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
- [[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
- locale_list="${root}/usr/share/i18n/SUPPORTED"
- fi
-
- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
- --destdir "${root}"
-
- popd >/dev/null
-}
-
-glibc_do_src_install() {
- local builddir=$(builddir nptl)
- cd "${builddir}"
-
- emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
-
- # This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
- # which come without headers etc. Only needed for binary packages since the
- # external net-libs/libnsl has increased soversion. Keep only versioned libraries.
- find "${D}" -name "libnsl.a" -delete
- find "${D}" -name "libnsl.so" -delete
-
- # Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
- # to infer upstream version:
- # '#define VERSION "2.26.90"' -> '2.26.90'
- local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
-
- # Avoid stripping binaries not targeted by ${CHOST}. Or else
- # ${CHOST}-strip would break binaries build for ${CTARGET}.
- is_crosscompile && dostrip -x /
- # gdb thread introspection relies on local libpthreas symbols. stripping breaks it
- # See Note [Disable automatic stripping]
- dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
-
- if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
- # Move versioned .a file out of libdir to evade portage QA checks
- # instead of using gen_usr_ldscript(). We fix ldscript as:
- # "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
- sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
- dodir $(alt_usrlibdir)/${P}
- mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
- fi
-
- # We'll take care of the cache ourselves
- rm -f "${ED}"/etc/ld.so.cache
-
- # Everything past this point just needs to be done once ...
- is_final_abi || return 0
-
- # Make sure the non-native interp can be found on multilib systems even
- # if the main library set isn't installed into the right place. Maybe
- # we should query the active gcc for info instead of hardcoding it ?
- local i ldso_abi ldso_name
- local ldso_abi_list=(
- # x86
- amd64 /lib64/ld-linux-x86-64.so.2
- x32 /libx32/ld-linux-x32.so.2
- x86 /lib/ld-linux.so.2
- # mips
- o32 /lib/ld.so.1
- n32 /lib32/ld.so.1
- n64 /lib64/ld.so.1
- # powerpc
- ppc /lib/ld.so.1
- ppc64 /lib64/ld64.so.1
- # riscv
- lp64d /lib/ld-linux-riscv64-lp64d.so.1
- lp64 /lib/ld-linux-riscv64-lp64.so.1
- # s390
- s390 /lib/ld.so.1
- s390x /lib/ld64.so.1
- # sparc
- sparc32 /lib/ld-linux.so.2
- sparc64 /lib64/ld-linux.so.2
- )
- case $(tc-endian) in
- little)
- ldso_abi_list+=(
- # arm
- arm64 /lib/ld-linux-aarch64.so.1
- )
- ;;
- big)
- ldso_abi_list+=(
- # arm
- arm64 /lib/ld-linux-aarch64_be.so.1
- )
- ;;
- esac
- if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
- dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
- fi
- for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
- ldso_abi=${ldso_abi_list[i]}
- has ${ldso_abi} $(get_install_abis) || continue
-
- ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
- if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
- dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
- fi
- done
-
- # With devpts under Linux mounted properly, we do not need the pt_chown
- # binary to be setuid. This is because the default owners/perms will be
- # exactly what we want.
- if ! use suid ; then
- find "${ED}" -name pt_chown -exec chmod -s {} +
- fi
-
- #################################################################
- # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
- # Make sure we install some symlink hacks so that when we build
- # a 2nd stage cross-compiler, gcc finds the target system
- # headers correctly. See gcc/doc/gccinstall.info
- if is_crosscompile ; then
- # We need to make sure that /lib and /usr/lib always exists.
- # gcc likes to use relative paths to get to its multilibs like
- # /usr/lib/../lib64/. So while we don't install any files into
- # /usr/lib/, we do need it to exist.
- keepdir $(alt_prefix)/lib
- keepdir $(alt_prefix)/usr/lib
-
- dosym usr/include $(alt_prefix)/sys-include
- return 0
- fi
-
- # Files for Debian-style locale updating
- dodir /usr/share/i18n
- sed \
- -e "/^#/d" \
- -e "/SUPPORTED-LOCALES=/d" \
- -e "s: \\\\::g" -e "s:/: :g" \
- "${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
- || die "generating /usr/share/i18n/SUPPORTED failed"
- cd "${WORKDIR}"/extra/locale
- dosbin locale-gen
- doman *.[0-8]
- insinto /etc
- doins locale.gen
-
- # Make sure all the ABI's can find the locales and so we only
- # have to generate one set
- local a
- keepdir /usr/$(get_libdir)/locale
- for a in $(get_install_abis) ; do
- if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
- dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
- fi
- done
-
- # HACK: If we're building for riscv, we need to additionally make sure that
- # we can find the locale archive afterwards
- case ${CTARGET} in
- riscv*)
- if [[ ! -e ${ED}/usr/lib/locale ]] ; then
- dosym ../$(get_libdir)/locale /usr/lib/locale
- fi
- ;;
- *) ;;
- esac
-
- cd "${S}"
-
- # Install misc network config files
- insinto /etc
- doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf
- doins "${WORKDIR}"/extra/etc/*.conf
-
- if use nscd ; then
- doinitd "$(prefixify_ro "${WORKDIR}"/extra/etc/nscd)"
-
- local nscd_args=(
- -e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
- )
-
- sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
-
- systemd_dounit nscd/nscd.service
- systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
- else
- # Do this since extra/etc/*.conf above might have nscd.conf.
- rm -f "${ED}"/etc/nscd.conf
- fi
-
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
- doenvd "${T}"/00glibc
-
- for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
- [[ -s ${d} ]] && dodoc ${d}
- done
- dodoc -r ChangeLog.old
-
- # Prevent overwriting of the /etc/localtime symlink. We'll handle the
- # creation of the "factory" symlink in pkg_postinst().
- rm -f "${ED}"/etc/localtime
-
- # Generate all locales if this is a native build as locale generation
- if use compile-locales && ! is_crosscompile ; then
- run_locale_gen --inplace-glibc "${ED}/"
- sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
- fi
-}
-
-glibc_headers_install() {
- local builddir=$(builddir "headers")
- cd "${builddir}"
- emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
-
- insinto $(alt_headers)/gnu
- doins "${S}"/include/gnu/stubs.h
-
- # Make sure we install the sys-include symlink so that when
- # we build a 2nd stage cross-compiler, gcc finds the target
- # system headers correctly. See gcc/doc/gccinstall.info
- dosym usr/include $(alt_prefix)/sys-include
-}
-
-src_install() {
- if just_headers ; then
- export ABI=default
- glibc_headers_install
- return
- fi
-
- foreach_abi glibc_do_src_install
-
- if ! use static-libs ; then
- elog "Not installing static glibc libraries"
- find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
- fi
-}
-
-# Simple test to make sure our new glibc isn't completely broken.
-# Make sure we don't test with statically built binaries since
-# they will fail. Also, skip if this glibc is a cross compiler.
-#
-# If coreutils is built with USE=multicall, some of these files
-# will just be wrapper scripts, not actual ELFs we can test.
-glibc_sanity_check() {
- cd / #228809
-
- # We enter ${ED} so to avoid trouble if the path contains
- # special characters; for instance if the path contains the
- # colon character (:), then the linker will try to split it
- # and look for the libraries in an unexpected place. This can
- # lead to unsafe code execution if the generated prefix is
- # within a world-writable directory.
- # (e.g. /var/tmp/portage:${HOSTNAME})
- pushd "${ED}"/$(get_libdir) >/dev/null
-
- local x striptest
- for x in cal date env free ls true uname uptime ; do
- x=$(type -p ${x})
- [[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
- striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
- case ${striptest} in
- *"statically linked"*) continue;;
- *"ASCII text"*) continue;;
- esac
- # We need to clear the locale settings as the upgrade might want
- # incompatible locale data. This test is not for verifying that.
- LC_ALL=C \
- ./ld-*.so --library-path . ${x} > /dev/null \
- || die "simple run test (${x}) failed"
- done
-
- popd >/dev/null
-}
-
-pkg_preinst() {
- # nothing to do if just installing headers
- just_headers && return
-
- # prepare /etc/ld.so.conf.d/ for files
- mkdir -p "${EROOT}"/etc/ld.so.conf.d
-
- # Default /etc/hosts.conf:multi to on for systems with small dbs.
- if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
- sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
- einfo "Defaulting /etc/host.conf:multi to on"
- fi
-
- [[ -n ${ROOT} ]] && return 0
- [[ -d ${ED}/$(get_libdir) ]] || return 0
- [[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
-}
-
-pkg_postinst() {
- # nothing to do if just installing headers
- just_headers && return
-
- if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
- # Generate fastloading iconv module configuration file.
- "${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
- fi
-
- if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
- use compile-locales || run_locale_gen "${EROOT}/"
- fi
-
- # Check for sanity of /etc/nsswitch.conf, take 2
- if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
- local entry
- for entry in passwd group shadow; do
- if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
- ewarn ""
- ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
- ewarn "removed from glibc and is now provided by the package"
- ewarn " sys-auth/libnss-nis"
- ewarn "Install it now to keep your NIS setup working."
- ewarn ""
- fi
- done
- fi
-}
diff --git a/sys-libs/glibc/glibc-2.30-r8.ebuild b/sys-libs/glibc/glibc-2.30-r8.ebuild
index ca3472965c1e..2836d93f552e 100644
--- a/sys-libs/glibc/glibc-2.30-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r8.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
fi
diff --git a/sys-libs/glibc/glibc-2.31-r2.ebuild b/sys-libs/glibc/glibc-2.31-r2.ebuild
index db866fbf1a24..2945adf1290a 100644
--- a/sys-libs/glibc/glibc-2.31-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.31-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
# needs minimal testing
- #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"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
fi
@@ -29,7 +29,7 @@ RELEASE_VER=${PV}
GCC_BOOTSTRAP_VER=20180511
# Gentoo patchset
-PATCH_VER=3
+PATCH_VER=4
PATCH_DEV=dilfridge
SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
@@ -85,6 +85,8 @@ fi
# We need a new-enough binutils/gcc to match upstream baseline.
# Also we need to make sure our binutils/gcc supports TLS,
# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
BDEPEND="
${PYTHON_DEPS}
>=app-misc/pax-utils-0.1.10
@@ -101,6 +103,7 @@ COMMON_DEPEND="
suid? ( caps? ( sys-libs/libcap ) )
selinux? ( sys-libs/libselinux )
systemtap? ( dev-util/systemtap )
+ !<net-misc/openssh-8.1_p1-r2
"
DEPEND="${COMMON_DEPEND}
test? ( >=net-dns/libidn2-2.3.0 )
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index ca7219535589..dafe72da8ed7 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -84,6 +84,8 @@ fi
# We need a new-enough binutils/gcc to match upstream baseline.
# Also we need to make sure our binutils/gcc supports TLS,
# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
BDEPEND="
${PYTHON_DEPS}
>=app-misc/pax-utils-0.1.10
@@ -100,6 +102,7 @@ COMMON_DEPEND="
suid? ( caps? ( sys-libs/libcap ) )
selinux? ( sys-libs/libselinux )
systemtap? ( dev-util/systemtap )
+ !<net-misc/openssh-8.1_p1-r2
"
DEPEND="${COMMON_DEPEND}
test? ( >=net-dns/libidn2-2.3.0 )
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 44f978975020..78f6490f6690 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -6,5 +6,5 @@ AUX gpm.rc6-2 553 BLAKE2B 609a2fe28fc0539e50eed703e2ed6c5a37d98737add953fe4f7d7a
AUX gpm.service 218 BLAKE2B 728726976390bb394d479e424d5c1fafb9bc17d00e23a90218991527326c3fe88eb8d37b84707febbf28017ecaf5ec3559534e9d0571bfd100beec8c60ac25c0 SHA512 b3b258a2b0ed42256b16ae05e9c13baa3bca0d6d9d5d1ef489e2f8fbfc2a6a4d8f570a595f50f79fba9ad94ad3acbf0dfe098887f0ce799006916a08101f5bc2
DIST gpm-1.20.7-docs.patch.xz 41668 BLAKE2B cab4649d0eda83c37474b68ac141fab84cbfaac4e18f0f42ad7c0a90d14bc39697b17c450e8a8dc8b1c960f6d9e7ff344ec15791df240f61a27ccfcd7d0a9171 SHA512 6cdcad70d0a77a56cb507330ff8409155de11255b5e61fb92ee439c1e117932c346df475f4187abb0e348ee4c28fa235a9693883b1c36913e91404662df272f4
DIST gpm-1.20.7.tar.lzma 789691 BLAKE2B 5dbceedaa330d5f1ead8b2267fb5844cfd284627e085edd784a72365830a700f9a6a97f96afb4aa00a44ddbae735ef23be7eafc97a65f6250d72e15b359486c7 SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9
-EBUILD gpm-1.20.7-r2.ebuild 2277 BLAKE2B 2f464f388486ddd0fe9c1e9648024466cfc14d9cec8fbc06501e3bc65fa5e78506321ff6fe6ad060f2bc76d80da7893967ba87643d53fb780d215d5e11bda0f1 SHA512 8d2e932e64f8b14abda837f82744217e075ee5f72d62e43092cc2e120fb7fae598d671830b11300db04c1a64ea0a3211eace29e8d9130b508ab41231452a0924
+EBUILD gpm-1.20.7-r2.ebuild 2278 BLAKE2B a0ff6b3a2dae031f00dd42bf130c3a123c77354a7fe79aca5e61a08c4362e7120b548cdea1b1ae139c16c67b06cc774d64fcd89620d300b6c69fe13d3ff7e1f9 SHA512 a3bf25e877dea4e0564a97fd5f8afb921dac5aa24d9cea355265a7ad70ee0791275a065573b90069dffcc1849b779fc61772c13c884bd1587f330f9858ce8897
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index 0186f28ce85b..e94da64bea36 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="selinux static-libs"
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index c598473fbb9e..5314751b8495 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -3,6 +3,6 @@ DIST libblockdev-2.22.tar.gz 854888 BLAKE2B beb1ff0ac122eb12b2066d97c81a8c62a333
DIST libblockdev-2.23.tar.gz 856829 BLAKE2B 131bf429e530fc9dd44fade4f5bc937ec220365b1ee2ae46818a6fa3ec7591775fdc3ed531350cc2546f4151e41551dfd3e331b0a6d5777769a7b54c5c15ed42 SHA512 ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3
EBUILD libblockdev-2.20-r2.ebuild 2014 BLAKE2B 07fcb7f6852eb655275daa50d69607a05f91c51818cf7cdf14eedd78ee896a819ad98add227534847b2018e7903d4687d254be942234a5b27cda0ae84aa19909 SHA512 e82fa99136c0390ca347fde1939f39620ed9fc7a6ada8ed2197174631505b50e8da1df32096f7626e9a239fcc5b86dec0773e540654ad5c80bb4a713e38e8234
EBUILD libblockdev-2.22.ebuild 2516 BLAKE2B ad58734ac9bfee6cf0e8078eb36ee66b51744fd706dd14f248a576789c76b244ca0392772191f9d3af8d6fee164696cc76b7d93efee9d3b3d8625f2022e49adf SHA512 14b9ae846175817e5213018993f1d78c7ca0265394539b3e1baee5c8e9c1bf5c2609356d644a485964bfd1a59c04d0a22f569a87349e81be0430a9677279c85d
-EBUILD libblockdev-2.23.ebuild 2579 BLAKE2B 75623aaae988476aaa9e6d9a10bc0248b2e4b80684e89ec2da54213870f8ff90b0a08cf1cefb4eb4123f0b2db98878bca55a8b8171517a256680801b5b200d26 SHA512 39b5cae279c29e31532bc803a15afad11297b5d1862091687907524ec96c35ca2a59d4b7618e35b4db2637fda81fb67cfa01a16a4e70b04b97a125c9a38f4ab1
-EBUILD libblockdev-9999.ebuild 2579 BLAKE2B 75623aaae988476aaa9e6d9a10bc0248b2e4b80684e89ec2da54213870f8ff90b0a08cf1cefb4eb4123f0b2db98878bca55a8b8171517a256680801b5b200d26 SHA512 39b5cae279c29e31532bc803a15afad11297b5d1862091687907524ec96c35ca2a59d4b7618e35b4db2637fda81fb67cfa01a16a4e70b04b97a125c9a38f4ab1
+EBUILD libblockdev-2.23-r1.ebuild 2599 BLAKE2B 2db7daa281a94bfe24a322b493b7ada80ede81fb1970f8c8c550c77509cfbd6d498fd4770f4a8d10fc0ac8ba6ba56021094cd62817218d082abe3dec90a09304 SHA512 b14af9a77420373693bc44e21096097f8a40c2b049ac56cc248784a49b13c5a5418ab62ab2c069e146af2aa3c88fe039405d9cce03b2397029df0d8e3226547b
+EBUILD libblockdev-9999.ebuild 2606 BLAKE2B f4780c6c02ca95eca1a1b8968c0a28741f06e785e7c7f920d8d9b7dd27f29f1f932e07037db6873a872bba840b522d39e85c034a87929515744562892d236ccc SHA512 eb41e982a8e9607fbd0272aced19f3fecce0a35486cc841af45f4b000eadc1551d0a131d7ac1d480747b38ad0be67b23c216be9d959ad19bdc37721580ce2dc2
MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.23.ebuild b/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild
index 5b61abdcb972..c252b7d2104f 100644
--- a/sys-libs/libblockdev/libblockdev-2.23.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit python-single-r1 xdg-utils
DESCRIPTION="A library for manipulating block devices"
@@ -19,7 +19,7 @@ else
#MY_P="${PN}-${MY_PV}"
#SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
#S="${WORKDIR}/${MY_P}"
fi
LICENSE="LGPL-2+"
@@ -119,4 +119,5 @@ src_install() {
if ! use lvm; then
rm -f "${ED}"/usr/bin/lvm-cache-stats || die
fi
+ python_optimize #718576
}
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index 5b61abdcb972..1ea252a8b26c 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit python-single-r1 xdg-utils
DESCRIPTION="A library for manipulating block devices"
@@ -119,4 +119,5 @@ src_install() {
if ! use lvm; then
rm -f "${ED}"/usr/bin/lvm-cache-stats || die
fi
+ python_optimize #718576
}
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index 92631d2032d4..1d4af62ec976 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,3 +1,3 @@
DIST libcap-ng-0.7.10.tar.gz 450243 BLAKE2B 8eb21b0309e46b05fa42752b9c814d90bc1eda4852ac7a4975868c279764431a8d5eafc53e50998470f622e2a59e2b4c6c2ac1ac20525c6fcd0633b09b113012 SHA512 1b93c7f5c20ae5cc705fe5244af3e299454e988388cda95f006e248d97c0713e77da2a81c67ecf15755f3958df373fc6d1ca14197d6357ab1f2d8c3a0fd12def
-EBUILD libcap-ng-0.7.10.ebuild 2192 BLAKE2B 5f2a0a3cec61f7417b31fd4caeb0ea539cc6e6d22c48707b23e6382cb02b51343f0185dc1da6f8d3e83c6b93f00971ebcd574a4d753b06167ba8d56e33250b9e SHA512 e630b7bda11418125f58173835a2958ad582e49ce62baea9518911c87a204763b3a79f7ff241797da6454c942840d84c3856ec39518b273d58dc25122fe48e62
+EBUILD libcap-ng-0.7.10.ebuild 2191 BLAKE2B 76779d0489c6501a913a5319fd8a28628db2d081a8b1f61453ae6ac600b7e9efa1c36bd98893cd6a52e2ad4e735ae731d5ea230f36abcd8e5210341b92901a82 SHA512 1de671f3b2d169bb8bde780fd7cfffc426516f32aeee26abdfd22386b44c0e80b8c3e4ea2477dc1b7c118626d43f85830e67e2def0e76445b0532c54d62c6b17
MISC metadata.xml 673 BLAKE2B f4890411426cd85bc65373e34f5e1c2b5b294ee6774b8af47cb8effcb4d5730772fee52bcf0fdd477f56b412b1918214467cc0afc3f13b56098d45a98009ce4d SHA512 8f15beccf0bed144b7cceb7699e9e90e05bca2b0fa2bc198dc6cdc5af95f57c9fb07c9049d5b7229b2ec71b945cee3b20210874ebb030566caee850d50980d95
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
index 7f8aa862b22d..dda9a06b3dae 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index dddcba69d6c0..da94bc6b406f 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -9,7 +9,7 @@ DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219b
DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6
DIST libcap-2.32.tar.xz 99708 BLAKE2B cbd4676ca9ada4c4dd6dee5137c0bb16f23af5d9a224c81b476c19326f87352fb06e2e123c9431558cd22f91032064ed6de8407d5861728dd141be16957363db SHA512 e2325cf0a1d0509c49336f7e5760e5b339c889cdde8d6c359197aed711423f951ad390a2a3dd4943b03afe152ad8502ea1db9d7ef247148b93e93a3c4895a019
DIST libcap-2.33.tar.xz 111280 BLAKE2B 9a34b6e871c6175da5ef665ab7a5ed8b9889f598875f58a6e0b7aef9b6b2737f2a85bb0a6e259a730a3fcea3b8ebbec793b52ee5dec7d11fcf236dfb2148eb83 SHA512 bb5bdc1318b524ee607026038dff7c1c621f1710fa07f8c341b1f86761cb086d32b93d7a12dbe4256d4440ee984143db8659d2679330e221ce184d7048c142b4
-EBUILD libcap-2.26-r2.ebuild 2042 BLAKE2B b2878d1faa42790b6d7e8889376cfcce3247185948a064013d692fcfa3e46a19dc5d25c72a5e3c98944502a89d1df4935c6300df8d060083e30227df12b9eee6 SHA512 25b5e32a08968d1063e949fc8279843e274c0972620a4dd76212ef9692cdae0b6342dbfede3ac046f455d8cb1cc289988d4c20741dd4eb3b96ae2a01b0e741aa
+EBUILD libcap-2.26-r2.ebuild 2043 BLAKE2B 17ae356da940fbdcd890bf61bbfac9d9b40b5d5413fbadb026044b39c7477859293e408c66a6f23bb846745c0c3d804603b663804e3325bae66056973d640b9a SHA512 c6bc8bb3145cefd88c9f4f392dbecc8fd4e36bc0532db2a39c2af4d5664b6f0dbab3223d6260cf2323eecdb9c7e36aedee59b665bea1e2169d2eb68188330c17
EBUILD libcap-2.27.ebuild 2052 BLAKE2B 2e8a46c226457ee9108b3fcbca3c79eddc36cd5b6948bfee6e32f2b53937dfc255f66260e0d451a753bf2c7c983a88915b10f72c021d7a6f5729a8a8c5b970ee SHA512 dac16a76f827115256ecaa94e9fa8b8fa1621d87359108c156cb912608b6ad9401d0dd708bf8ac2963b9b88467048ad8c87857291aadabadccea250f3c3930fa
EBUILD libcap-2.32.ebuild 2124 BLAKE2B 4d3b4d37d4cd1f12852b0018c4c22d097b5993c629fedeb8f672accbe1279d4b09ba445b277f4ac23f552b8811254c5dc4f87ff3478dbbd61c44ba8e6942b352 SHA512 acebf6b1b85081125cfedee8b1f0ea4cefed5ef7abc52292758fcc7754fba05725ec3c7bc2167b39a1d88382a2ae13d0328f32c88914dfabb9ee15785d40b079
EBUILD libcap-2.33.ebuild 2124 BLAKE2B d99bda3c682d53c0027d4429ad50520a0c1b5555879a7883245c156f781079d4b74cefed3611e1e2db5d5980fded463b6f77b29b6bfb16c36c9312141bace95b SHA512 e2cdd6c6e65be570cf2800ac79e817e8cb14c9899ea89ff731cb55c4767cf7b56d73760ab16baf0f30eaa09cc326d93992c046da2e412222152dcd6e2f6f1795
diff --git a/sys-libs/libcap/libcap-2.26-r2.ebuild b/sys-libs/libcap/libcap-2.26-r2.ebuild
index 8b6cf21405a0..60c9f4d04b96 100644
--- a/sys-libs/libcap/libcap-2.26-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.26-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}
# it's available under either of the licenses
LICENSE="|| ( GPL-2 BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="pam static-libs"
# While the build system optionally uses gperf, we don't DEPEND on it because
diff --git a/sys-libs/libnih/Manifest b/sys-libs/libnih/Manifest
index 26d861528c35..68b556fea1ad 100644
--- a/sys-libs/libnih/Manifest
+++ b/sys-libs/libnih/Manifest
@@ -1,6 +1,8 @@
-AUX libnih-1.0.3-optional-dbus.patch 1162 BLAKE2B 5c9178bdd193a7d3c2eb2e068712a6dd7660c0d26f26eb4539ee4425d9a842e1070d5307d91c1f68d4f219eedc7edd2054d7e6b1477e344cdcf0ac30a94f6e88 SHA512 bd979f8e9d27d775e12b3a93082084b8837bc9eb4f48476c3356aa4b4f865eda517e6fcf90f5575686dbcdc0fef4a21c640e413d9d3611bb1f1077bfa9fd8c86
-AUX libnih-1.0.3-pkg-config.patch 2491 BLAKE2B 6308443ce8ee8c77564a0c9a64b6f0a31258db08faf926bda603faf372bd73b57b00a0b75111fc07bedce0ed40080cb66d9ababadb99f9d8c4d753bce48963a5 SHA512 b99d580f4487cf3d25fa37f3f7b62ce32d9df80c6c0b01ad04b6850215ec0cc24cfea48aaf8ff89afe28db239b5ed212f139e86353d9991152d488c6edce5017
-AUX libnih-1.0.3-signal-race.patch 2081 BLAKE2B c11b900289e5fbb53b3d7e7f6a90d302bbb06a7d041b1b9b502ff585e440697f77b2ae5e2eb7ae40ff3817a052bd34da02766efd1ea021ce3ad78c4542307edd SHA512 5367cb0c6382004cc2a829b9b71f0c02a09e4983940afac90c4c5c0bfbda53fb36a6cc7e38ede7a895ce28f99a4f69e89392ebaadefdc536eb7efa90c2426ff8
+AUX libnih-1.0.3-fno-common.patch 267 BLAKE2B 157f1c34239b90ff6a2ab76a0c29f8d8cc563979e4f42405c8bab7f78bb0352a3ec3fa4d02d7b1cb1bc07970f289be7f39ed095cc3b19c6a166a343de02eac64 SHA512 b0e08aca019b9e0c1e2954b67036dac8d07b347fcb33a17163706b788896c5e5d9f95f23f6ffbe5a061f2e0773ed9179f94a68e162386c39df9ceeb8c8c17508
+AUX libnih-1.0.3-optional-dbus.patch 1113 BLAKE2B b7c30e666fcb641edbb2168058d837f90e0cf0fc8e290ed91fbe2da7de15ab884c4b312aa8f8cffda878010da794d587a73fdc49954d0c551161184e22537c2c SHA512 c46e434a5e162fedbe06408680ab5d08e875ad35aaa058974724565c5b8f1719a56187fb78bbd0cc87729dcde05cfa571678297b8e5d9cfe7e1bb18a3ed78961
+AUX libnih-1.0.3-pkg-config.patch 393 BLAKE2B 77ed2af4429624e03e86f00cdb58c015f19c1acc690f2f76efbef4142c5a166be478860b14756dbe5ee99a73824d16d50505098c5d1aa5b89e4df9c99536c793 SHA512 c483a5032fdb727d6ae106e27b7c66b184b5aae19d7ed3ba5796533f444763facdacb5c0e08b2ac4e371056dab6ee0478d26fbc190ea149c9f976accaba1abb8
+AUX libnih-1.0.3-signal-race.patch 1432 BLAKE2B b08b7356d2fae755fbe45b2a45b4081c9e1b27ab5aa3a1f71a6945ced5048bc587883de5b9181887a8124f4fc025bcbea4e668ae0e93d5b97e56f67788dd42a8 SHA512 5bd1ff4d7774db62cb6f54721c3b30b5fba1f085a69b28da12f85f448efacb6efd0dd9b9b61801ceb3fc94ca1616fb898bdce33e873f9e57486e44f26c063ed5
DIST libnih-1.0.3.tar.gz 1187624 BLAKE2B f8f9fcdda86eabff39de0b0f92cd1f8c1c0eeb0c86ec4970e5bef1cc0dff0fda83db64975ece93d5d8ede5d0613d5f363dd7456c59fe966feb5e61e5b8913627 SHA512 fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4
EBUILD libnih-1.0.3-r3.ebuild 1499 BLAKE2B 81ebd631c031c5f18ca79c582cd582c21b5d605e65976c48f0a75623ed0469bee634387ef976f2c8910ac2365c9944cd9cbd960836704908a4af9c6e62fb113e SHA512 845a2a47d3e193f3c09e5c0486252da24c246dccd409b56d702725995ee1845e719c14fa3ecba6916d2f986aed9762e6f0776792d64206a68af1314a4885fc3d
+EBUILD libnih-1.0.3-r4.ebuild 1511 BLAKE2B eaf4188a00ecc6e4b43a37c448b48aaca019ea8c2bdaaf151957e06b32e086dfbe4464bb17af43c6c1e6c377b32c645bad710151b80ccd0893fe0a6beb315896 SHA512 a8fdf2aeb7be7ce0f43fb8b89ddc1edce7af4e217375f495ca908f520c8cfae352d54ea0e672ba6d99153af1a4167c8f9d4268dea097153c3b5ee0764e28da2d
MISC metadata.xml 241 BLAKE2B 02f7c7b912751df8725055416a093647e79dfdbf7f06c9f56246c67f6a1176997454dd3aaaa493ecf7d00d8ae295066e2861ac10bee860a94eef6085437561af SHA512 31e21c0bed310c4a025385f24c5b76f2e588999912fa548ca343947d95ad448b3a1232211cd4427607550c0f5de2e562e2b4e492415b6d207c954a516b811a84
diff --git a/sys-libs/libnih/files/libnih-1.0.3-fno-common.patch b/sys-libs/libnih/files/libnih-1.0.3-fno-common.patch
new file mode 100644
index 000000000000..2b3a9cef5b48
--- /dev/null
+++ b/sys-libs/libnih/files/libnih-1.0.3-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/nih-dbus-tool/output.h
++++ b/nih-dbus-tool/output.h
+@@ -27,7 +27,7 @@
+
+ NIH_BEGIN_EXTERN
+
+-char *output_package;
++extern char *output_package;
+
+ int output (const char *source_path, int source_fd,
+ const char *header_path, int header_fd,
diff --git a/sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch b/sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch
index afe43749b6b0..49ad68a07b5a 100644
--- a/sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch
+++ b/sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch
@@ -1,5 +1,5 @@
---- libnih-1.0.1/configure.ac
-+++ libnih-1.0.1/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -23,12 +23,21 @@
PKG_PROG_PKG_CONFIG([0.22])
@@ -25,8 +25,8 @@
# Checks for header files.
AC_CHECK_HEADERS([valgrind/valgrind.h])
---- libnih-1.0.1.orig/Makefile.am
-+++ libnih-1.0.1/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -1,6 +1,9 @@
## Process this file with automake to produce Makefile.in
diff --git a/sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch b/sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch
index 979e363f2157..6516de799432 100644
--- a/sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch
+++ b/sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch
@@ -1,14 +1,5 @@
-# Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: vapier@gentoo.org-20111019170935-fheqs03szv6mhh3o
-# target_branch: http://bazaar.launchpad.net/~scott/libnih/trunk/
-# testament_sha1: 84b368e08fdd9f8276611cdfe97d34f51cd90598
-# timestamp: 2011-10-19 13:13:52 -0400
-# base_revision_id: scott@netsplit.com-20110901184103-d2xbvc5hbt0vqxf0
-#
-# Begin patch
-=== modified file 'nih-dbus/Makefile.am'
---- nih-dbus/Makefile.am 2009-11-21 21:44:23 +0000
-+++ nih-dbus/Makefile.am 2011-10-19 17:09:35 +0000
+--- a/nih-dbus/Makefile.am
++++ b/nih-dbus/Makefile.am
@@ -49,7 +49,7 @@
test_dbus.h
@@ -19,9 +10,8 @@
-=== modified file 'nih/Makefile.am'
---- nih/Makefile.am 2009-11-21 21:44:23 +0000
-+++ nih/Makefile.am 2011-10-19 17:09:35 +0000
+--- a/nih/Makefile.am
++++ b/nih/Makefile.am
@@ -71,7 +71,7 @@
test_hash.h
@@ -32,25 +22,3 @@
-# Begin bundle
-IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWerAspcAAhZfgAAQVGf/93Mi
-DAC/7//wUASW8VttRtyKRaUhJU00ZTUab1GBT9JpNNqeiAADEEpDUwp5Gk9KeiZAANAAABIo0hE9
-GTTJJ5AMo8oB6IwmmMNDQAAAaAAAAAEkgQBGTCGmmoZQPSIxoCJYV1m4Z59VmltTEiVlNBLfEBWL
-DPUvZdcke3iHe+YuVhuGNtnl+0Xxmwcuy+RkTlRw9Ct83uYaZ7PH3vOd/AqYc6mhoKnwOCJD7ej5
-jS/rj7FmeOwxohzIMw9Ftarf11sHFhfFyWQEWL15gMctp9IL8d5sOYp0YoMOIw5htiyuYikcaPZ+
-xeB0ZI+IpppnCWQD3qlFKeI1NHACFmRBrQ2Sn1nmVurFZLNeqWK2Xy7eKAJK1SuguZhs8DekVjKE
-YGJwURdteHklA3WkfNMdKKNMQHQqnTtxAg1ShnXAzzkjnDtTSCwNhnuoY0WM1bLLCJlFM6NphCLS
-CGV+ZxUbN6YirSh9tVJWBzJKQaE5HEstAsAuqdVKlAlNKIrkYPSb3oy9WkKNsyyLYUiplUvi8C3i
-ioz+SscYWhwHzkxL/k0TPk8tL6l5FzzBa8FCKRWbDCTa0nbGzEhoJmaYEfwBog+pmXpsuVNUZmF4
-OreOMqF7JyNA1HJJ14+yxa6SRpJ51jBFyaNAojQK2ai7BtxEVZFoG3TYZiaTnR8LwZPDCtw7GqpA
-6mKFWiqtj/KxW+zQNmQbh9XE5eCCdFBTQzJmb7H3fDQpKW1njIoLHI+HeAXGDxYmu7HJ3DoZtH3Z
-7UfYYlEO8WoZpHZIMdDSCTWUE41kdp0nBWlshTuqcODflplwgnc03YlpZF9eBKQsUJi4gRvOhwmO
-XzuHW8qzc+JojHueBjZGJRiZQktKmJFoSD3k4+SOEue4uOh88jC0uRC8zDtbDCuz1fd6m5nsBrXh
-4KCGR5mWo4953Ie6CdWVops43mZdcboGGpUVirZZC+SPwwvwVSDuTAzASyFMevBBdbmdy3y0L0Y2
-oqRD3LY5+RqPM9R4/XEkdVuXmAxvF7GgrzRSIuDsTD2MANhmBxuF+EEbTKN/ciAzAUxnOdie1hol
-lqAkHxA44ja0WMKzYlmGU28kSdqB1i6h4nLevOVCnK+WtEKLpuOy6eZFThX5IsRrjenja/BSN2iu
-FFE+cHoYwJzGRI9yFKvpRUQ+H0qqaIoI5lP18lEqsPiBhRHMkpPIHqMuoiGiZyQxSXC0ynqSTYNX
-80VoGbTVLspApI9vo8XZBOScj6oHLR6qkjlnhkwwNQ8/wZdSfNBI0NSKLNasgKl6LF7FVbx4MCcj
-jYREWWzVEEVd81rloiAfu+h8H33/8DPhciqmx3QHdcdLEOKQ1mHIp8NQLYDAhQjJPmRA4hvGfSG+
-dwTBj1rKUFKGB7BYiKJ+C3dZ91NewHQ8kxHGlS0rSLioLvwrlwNSrRgtyZzWVFTWB8C7kinChIdW
-BZS4
diff --git a/sys-libs/libnih/files/libnih-1.0.3-signal-race.patch b/sys-libs/libnih/files/libnih-1.0.3-signal-race.patch
index 4cba5ae4ded3..364af7f5383e 100644
--- a/sys-libs/libnih/files/libnih-1.0.3-signal-race.patch
+++ b/sys-libs/libnih/files/libnih-1.0.3-signal-race.patch
@@ -1,21 +1,5 @@
-https://bugs.launchpad.net/libnih/+bug/518921
-
-fix race in signal processing leading to lost signals
-
-The current loop will walk all signals one by one and run the handler
-for it if any signals were pending. Then it clears the array. But if
-a signal comes in for an earlier checked signal, it will get clobbered
-when the final clear runs.
-
-Change the logic so that we only clear entries for signals whose handler
-we explicitly call. If a different signal comes in, we'll process it
-the next time around.
-
-This was discovered & triaged by Jeffy Chen from Rockchip.
-
-=== modified file 'nih/signal.c'
---- nih/signal.c 2009-06-23 09:29:37 +0000
-+++ nih/signal.c 2015-05-21 08:12:11 +0000
+--- a/nih/signal.c
++++ b/nih/signal.c
@@ -337,17 +337,37 @@
nih_signal_init ();
diff --git a/sys-libs/libnih/libnih-1.0.3-r4.ebuild b/sys-libs/libnih/libnih-1.0.3-r4.ebuild
new file mode 100644
index 000000000000..fae185404cc4
--- /dev/null
+++ b/sys-libs/libnih/libnih-1.0.3-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs multilib flag-o-matic usr-ldscript
+
+DESCRIPTION="Light-weight 'standard library' of C functions"
+HOMEPAGE="https://launchpad.net/libnih"
+SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+dbus nls static-libs +threads"
+
+# The configure phase will check for valgrind headers, and the tests will use
+# that header, but only to do dynamic valgrind detection. The tests aren't
+# run directly through valgrind, only by developers directly. So don't bother
+# depending on valgrind here. #559830
+RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch
+ "${FILESDIR}"/${PN}-1.0.3-pkg-config.patch
+ "${FILESDIR}"/${PN}-1.0.3-signal-race.patch
+ "${FILESDIR}"/${PN}-1.0.3-fno-common.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ append-lfs-flags
+ econf \
+ $(use_with dbus) \
+ $(use_enable nls) \
+ $(use_enable static-libs static) \
+ $(use_enable threads) \
+ $(use_enable threads threading)
+}
+
+src_install() {
+ default
+
+ # we need to be in / because upstart needs libnih
+ gen_usr_ldscript -a nih $(use dbus && echo nih-dbus)
+ use static-libs || rm "${ED}"/usr/$(get_libdir)/*.la
+}
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index 5a0b7336df83..82ef7e47abf7 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -1,3 +1,3 @@
DIST liburing-0.5.tar.bz2 75525 BLAKE2B 7b58a59212a6c3527c0adfc102add73dc875885bcdcd6ba9dcd64020d6c8f277b5cc0e1d33860aab0d9495f0409461278175aed7483aa9c44d3c7f78b1238920 SHA512 70202f25fad89787c5c0f0022dddebd3f5ff8eb572ec50c36cc3980f291b456de445c1cf411761be1438e22c69bdb446e1e5b3c10317ec00cb3412a63508faa4
-EBUILD liburing-0.5.ebuild 904 BLAKE2B 54c2a5af29599a0845e2bc9216991bd8a592029800f90c799d184555e9fbec4a3ce47bdcdf04b63866edbb8f51a79f677cb0c19cd85f3e33d9c0041b4fc098d9 SHA512 e3c81e34ce40b0b7c4b5cedadac8f6007bfbf892e0b2c7ccaaf3f6d07b659751c32e1031334159ec0b48fb816b82046b71bcbac453c0639898894e6a39ac9962
+EBUILD liburing-0.5.ebuild 923 BLAKE2B f34ad12554b5805ac72e12efb4cd758f990970537283d4e34fd88cdf3318dbbb7b089be4e70dd669f82166250b8143dc5c413a71ecdba8521f4bb6c3b08fd9da SHA512 620bc74f2d1f34886dd745f48763c829f8d4a10dae305d81b92a183bafef134db87b7bf2f5cb9f0d5194eaf44292907efa3995f733d729bc2450884e8f3de36b
MISC metadata.xml 330 BLAKE2B 9999abbe311550c99eac0de3e7942a37bab51413090b5ca192c0deeac61e3b0d3017a0c05650a433041e1589a6518539ea6686494cd9f57d787ab7519caa78fd SHA512 fe3f892ef7bea57e0c2889ef07f25a8f4230bd54484c73c8c00685a5a05d269271513b7235bf15dcb594b2e18e5e7d638d5d37c4b4563449dc6af1afbacec1c3
diff --git a/sys-libs/liburing/liburing-0.5.ebuild b/sys-libs/liburing/liburing-0.5.ebuild
index df14f2d99ec8..d331e71bb686 100644
--- a/sys-libs/liburing/liburing-0.5.ebuild
+++ b/sys-libs/liburing/liburing-0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86"
IUSE="static-libs"
src_prepare() {
diff --git a/sys-libs/ncurses-compat/Manifest b/sys-libs/ncurses-compat/Manifest
index f1004777315f..83c5f6f591a9 100644
--- a/sys-libs/ncurses-compat/Manifest
+++ b/sys-libs/ncurses-compat/Manifest
@@ -12,6 +12,6 @@ AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02
DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
DIST ncurses-6.1-20190609-patch.sh.bz2 602174 BLAKE2B 38b1cb1f376b8fdfddc7cf9ed8e10190dd50fc2315f11eaf3a14c0299167c0e6bbd82a3684fa83d6e8fa6d2f02ea14e88ea065f8bb886905d85788bde13731c0 SHA512 efd009f5087a7b16413b94ce37ad19da0df8974be579b742d57bc64e034792ccf03b9967593a0ac5c90522ccfde4b6d23ef763d6fbeb91a5f327f8d7a0970872
DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
-EBUILD ncurses-compat-5.9.ebuild 5311 BLAKE2B d8d219edb8e56683d49ee7e1a924568a6087e156589c48794c7aa5da0a1f27345b1191d3ca0aa694328e345b385dfaf4468cfe1598d2a71b9d6441ac1cd813fd SHA512 1042abb1f0c3a78dab37d0e79d0c681581411f8b3a75caf1fc81ab46e0f7cbb1360b825f582b424dc5097dc93002cc49360f1a45a9c885e41dfeac205da9177d
+EBUILD ncurses-compat-5.9.ebuild 5312 BLAKE2B a29e2ed14edcf1b32e8bec26c005f1b7b96836d93ea9ffb5daa49b8b147ad7c1e76e31633eb8016fa07d95ffa4ff00e8075d20c62cf1c449e156944b0c8478ab SHA512 b94046b43b3b333bb0811db83d2558bee1f772873b22037b99713ef78ed2345cf5f417a7e5acc352cd35f49350ebc7bc5327493d0f0f7a8fa5d2b81eca0ef2da
EBUILD ncurses-compat-6.1_p20190609.ebuild 6347 BLAKE2B dc3d9d21d249e82238ad26d4008148d8eb196df7b870812e94c8b37c4b1fa92c0a42e9582364b1082497b9a1b7cbc508bb2e06d752dcbadfc5b0d13ff7821d94 SHA512 70222053eee9773ce7e002dad3b48b215a3bda54ee4fc860d46b4236588306dbf09101ff48d639b5b61f9d4fbaf356d7263edb2fa373523e5c2848bf6a0d564f
MISC metadata.xml 553 BLAKE2B b4d08cf9605063f09966cab08e095e0ed0194e03d941aceab3c3990aac37e143a2d0b0f69488c621fe200195c639ff4f3fdbf7969869edc4e237d994b8802084 SHA512 96895eee198c9686f03715f854fceab32e726f2944c357fb9c59915756132d57a919e0e10bb8bd093315b0102831ddd6db32060723997bc9134bf6f3e34e84e9
diff --git a/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild b/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
index 19a583f4ab01..5288b2e397f5 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
LICENSE="MIT"
# The subslot reflects the SONAME.
SLOT="5/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="gpm tinfo unicode"
DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/newlib/Manifest b/sys-libs/newlib/Manifest
index c0629ed0abed..f238f05ee704 100644
--- a/sys-libs/newlib/Manifest
+++ b/sys-libs/newlib/Manifest
@@ -1,4 +1,6 @@
+DIST newlib-3.1.0.tar.gz 17958952 BLAKE2B 3a84ae81fc07e442a4ed3da7a78e7ede34cc7e24b5d1c66a12624ed808e5f85f134751fcea0e4ce9eb39df287a582821f751a8610a088c149895b5e38eb06989 SHA512 efc4c3ab7153387780d141386bca5d3e20c9d25ae3e6b87cf94c8df9d301ce5926dacdff9bd33aeb9781559d933c3d0ae77f4e5b46120d90792f75dbfde702c7
DIST newlib-3.3.0.tar.gz 18361083 BLAKE2B bdc81427955d0a2f550bf2973ca82c0b8b55aa170565cdf1cfe8ac926257fad6d3e860ce7b2e286949ab21be2677378b5b6d3c743c05fe8aa6df8a8c34a16945 SHA512 2f0c6666487520e1a0af0b6935431f85d2359e27ded0d01d02567d0d1c6479f2f0e6bbc60405e88e46b92c2a18780a01a60fc9281f7e311cfd40b8d5881d629c
-EBUILD newlib-3.3.0.ebuild 4224 BLAKE2B 4e3f5b528c084fb06dc62ba2ec578292651f453482d332536b3c3a6c45088199728c184b6ac9bcad414e85efdb6011c0ff77d1b7578eb61fb8ad947d8a7c3951 SHA512 757b96af5e3131dce540ffc4f428997fac806e87a3b5abedc057e84915c8f5ba436548f4900070941e125f8cfe2d5503412112e13e2d66ce38fd274d436f93eb
+EBUILD newlib-3.1.0.ebuild 4224 BLAKE2B 4e3f5b528c084fb06dc62ba2ec578292651f453482d332536b3c3a6c45088199728c184b6ac9bcad414e85efdb6011c0ff77d1b7578eb61fb8ad947d8a7c3951 SHA512 757b96af5e3131dce540ffc4f428997fac806e87a3b5abedc057e84915c8f5ba436548f4900070941e125f8cfe2d5503412112e13e2d66ce38fd274d436f93eb
+EBUILD newlib-3.3.0.ebuild 4350 BLAKE2B 1a6c3b3706123d41950f6fce3930412da06104f4e6e78d70523157664e9ffb1c8bb0f18b661548ac69b60e526ba308db0d2c72369d2d79167f69aec063603367 SHA512 b76c4a3672a0c3d0a712d3a2103018d733826eb31702713b6f19c290df4b67ecf63ab13f59d06e4402357b7b8e3de5d414e3597d57b74326f8e29fbfa1018a67
EBUILD newlib-9999.ebuild 4224 BLAKE2B 4e3f5b528c084fb06dc62ba2ec578292651f453482d332536b3c3a6c45088199728c184b6ac9bcad414e85efdb6011c0ff77d1b7578eb61fb8ad947d8a7c3951 SHA512 757b96af5e3131dce540ffc4f428997fac806e87a3b5abedc057e84915c8f5ba436548f4900070941e125f8cfe2d5503412112e13e2d66ce38fd274d436f93eb
MISC metadata.xml 413 BLAKE2B 03320244c40182ff9d503fd1d9c7c3847209eeb91081e7d4a3285ed43eba6a42e0f361f6b7601966df420dde2d4e93ca458816198c2f9ebaec82790359ce868b SHA512 37e46d117243b93e189177ada64acedc0d798dfe4859f29a7ef70b22fe44e6364a3445e345def7e48264cb2bf3047ac78637759bc04d9ed3d7ea339432adf7e4
diff --git a/sys-libs/newlib/newlib-3.1.0.ebuild b/sys-libs/newlib/newlib-3.1.0.ebuild
new file mode 100644
index 000000000000..db1a3fad9cfb
--- /dev/null
+++ b/sys-libs/newlib/newlib-3.1.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://sourceware.org/git/newlib-cygwin.git"
+ inherit git-r3
+else
+ SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
+ KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Newlib is a C library intended for use on embedded systems"
+HOMEPAGE="https://sourceware.org/newlib/"
+
+LICENSE="NEWLIB LIBGLOSS GPL-2"
+SLOT="0"
+IUSE="nls threads unicode headers-only nano"
+RESTRICT="strip"
+
+NEWLIBBUILD="${WORKDIR}/build"
+NEWLIBNANOBUILD="${WORKDIR}/build.nano"
+NEWLIBNANOTMPINSTALL="${WORKDIR}/nano_tmp_install"
+
+# Adding -U_FORTIFY_SOURCE to counter the effect of Gentoo's
+# auto-addition of _FORTIFY_SOURCE at gcc site: bug #656018#c4
+# Currently newlib can't be built itself when _FORTIFY_SOURCE
+# is set.
+CFLAGS_FULL="-ffunction-sections -fdata-sections -U_FORTIFY_SOURCE"
+CFLAGS_NANO="-Os -ffunction-sections -fdata-sections -U_FORTIFY_SOURCE"
+
+pkg_setup() {
+ # Reject newlib-on-glibc type installs
+ if [[ ${CTARGET} == ${CHOST} ]] ; then
+ case ${CHOST} in
+ *-newlib|*-elf) ;;
+ *) die "Use sys-devel/crossdev to build a newlib toolchain" ;;
+ esac
+ fi
+}
+
+src_configure() {
+ # we should fix this ...
+ unset LDFLAGS
+ CHOST=${CTARGET} strip-unsupported-flags
+ CCASFLAGS_ORIG="${CCASFLAGS}"
+ CFLAGS_ORIG="${CFLAGS}"
+
+ local myconf=(
+ # Disable legacy syscall stub code in newlib. These have been
+ # moved to libgloss for a long time now, so the code in newlib
+ # itself just gets in the way.
+ --disable-newlib-supplied-syscalls
+ )
+ [[ ${CTARGET} == "spu" ]] \
+ && myconf+=( --disable-newlib-multithread ) \
+ || myconf+=( $(use_enable threads newlib-multithread) )
+
+ mkdir -p "${NEWLIBBUILD}"
+ cd "${NEWLIBBUILD}"
+
+ export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}"
+ export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}"
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable unicode newlib-mb) \
+ $(use_enable nls) \
+ "${myconf[@]}"
+
+ # Build newlib-nano beside newlib (original)
+ # Based on https://tracker.debian.org/media/packages/n/newlib/rules-2.1.0%2Bgit20140818.1a8323b-2
+ if use nano ; then
+ mkdir -p "${NEWLIBNANOBUILD}" || die
+ cd "${NEWLIBNANOBUILD}" || die
+ export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}"
+ export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}"
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable unicode newlib-mb) \
+ $(use_enable nls) \
+ --enable-newlib-reent-small \
+ --disable-newlib-fvwrite-in-streamio \
+ --disable-newlib-fseek-optimization \
+ --disable-newlib-wide-orient \
+ --enable-newlib-nano-malloc \
+ --disable-newlib-unbuf-stream-opt \
+ --enable-lite-exit \
+ --enable-newlib-global-atexit \
+ --enable-newlib-nano-formatted-io \
+ ${myconf}
+ fi
+}
+
+src_compile() {
+ export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}"
+ export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}"
+ emake -C "${NEWLIBBUILD}"
+
+ if use nano ; then
+ export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}"
+ export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}"
+ emake -C "${NEWLIBNANOBUILD}"
+ fi
+}
+
+src_install() {
+ cd "${NEWLIBBUILD}" || die
+ emake -j1 DESTDIR="${D}" install
+
+ if use nano ; then
+ cd "${NEWLIBNANOBUILD}" || die
+ emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install
+ # Rename nano lib* files to lib*_nano and move to the real ${D}
+ local nanolibfiles=""
+ nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|rdimon\)\.a" -print)
+ for f in ${nanolibfiles}; do
+ local l="${f##${NEWLIBNANOTMPINSTALL}}"
+ mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die
+ done
+
+ # Move newlib-nano's version of newlib.h to newlib-nano/newlib.h
+ mkdir -p "${D}/usr/${CTARGET}/include/newlib-nano" || die
+ mv "${NEWLIBNANOTMPINSTALL}/usr/${CTARGET}/include/newlib.h" \
+ "${D}/usr/${CTARGET}/include/newlib-nano/newlib.h" || die
+ fi
+
+ # minor hack to keep things clean
+ rm -rf "${D}"/usr/share/info || die
+ rm -rf "${D}"/usr/info || die
+}
diff --git a/sys-libs/newlib/newlib-3.3.0.ebuild b/sys-libs/newlib/newlib-3.3.0.ebuild
index db1a3fad9cfb..95217157d87a 100644
--- a/sys-libs/newlib/newlib-3.3.0.ebuild
+++ b/sys-libs/newlib/newlib-3.3.0.ebuild
@@ -48,6 +48,13 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a newlib toolchain" ;;
esac
fi
+
+ case ${CTARGET} in
+ msp430*)
+ # bug #717610
+ die "gcc on ${CTARGET} needs older newlib. Use newlib-3.1.0."
+ ;;
+ esac
}
src_configure() {
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 4214ac13f2c1..ed1f3b52bcf7 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,6 +1,6 @@
AUX pam-remove-browsers.patch 985 BLAKE2B 3e258e00f7287436b1b6a97323764612a3098dc4effb12e62cd8d55151ace2b97b6ea7b67ae33613aa6b3cca318bfbfc310b48a99b0c81e1beaa9d16188e69eb SHA512 42d89d35fc754e51112040a5468067ee9f6a3a411e538cb634187e28975040c0b7ef48fab166ec6a20a849f6ed9d74a069355269cf708d9985ded6b87fe13ed1
DIST pam-1.3.1.tar.gz 749997 BLAKE2B 3b44c41daaa5810c53e3e2baeac1ab58463768fde433f874b9bd09c7c28cfd55e0f227c9a0c318e66444a3adb23c112a2db32d5c7211b07c84c2d4600a47ca5c SHA512 0c5019493b2ac42180ee9c4974a51329a2395a44f5f892c1ca567ec9b43cc3a9bce0212861d4dfb82eb236c5eaa682b27189ce672ed6cafa37d8801d059a944d
DIST pam-4dd9b97b762cc73816cb867d49c9d0d0b91d642c.tar.gz 765455 BLAKE2B 8a8543b51c9fa877cd48d483d9af489df00376f92f26fea648d38a0ce3168702888a662e5d3c7423cce8a5d56896e84e4c1829e56d08fca8c3ab878b20945a7d SHA512 bdb236a47a5810449fb96546ff89d70dec185a215b0d047178a12e40945fde4ffdb801dbbd87ff95eead1bb7acb4748333a2d3383881d5de0dbd89ec5ceddd3f
-EBUILD pam-1.3.1-r2.ebuild 3341 BLAKE2B e277625f69b0f4c6df5e715ecf25115103df1d80abaf9e4dac7a0102dff28a453e5eae0ec0073731c630ade867ac4b56411c800a0661167398c43249dd883361 SHA512 995b0d13c0262ed74a556ac228f1657f1c08b32892256eacb088fe801f6a871b74a9c06bb63a840626a48b1a8412a0100626ffda24397f9fbcb7824d22de8929
+EBUILD pam-1.3.1-r2.ebuild 3342 BLAKE2B a9c03e5ae1005b63f416b3778de5e6a4cfc02fde311aa3ff1bc41b459fd39d464afe43561934885abe1f19c1e98075bfc4071843d9ccb89026b376a52985a5be SHA512 1c7d78bc680eb1025b41b8e724b2e59eaceccccef6cbb57a6887a268a21e49a813f75e16f7d3f7a2b3f20b402453a0e9a42b99e8f7ee252c6af88601dc6bbb53
EBUILD pam-1.3.1_p20200128-r1.ebuild 3551 BLAKE2B aa6581a5d90745c4a195e2516c73cc9ef25b768bbb7cc3ff4dcb2e7a86276916a44276aa002fdc7f96524a63484d3feb5370bcaeb5823c399e5e26dffff94200 SHA512 5ee4e9449e15fd5d113299cee9bd19210e837f4a72e6c4b01c7bcf97d85ac3415813d2ded97711b11df1b437e7740dabc91d3cb5a0df74b586de95eb3716a89b
MISC metadata.xml 1086 BLAKE2B 39d2291ff9553394ce684a87a49a2c41b18689102d8cf352c905ce2ede28508501aa41a4a473d287c461b77e5732aa4ed0eaac94db94c851ed9491bffdac8acf SHA512 6743a2021ef7d7ab9fc547b270c17b205747a498e0e2bafc07ad171d52657a4aa3f84803c2b4e5c088b73b1732d600b5b2189c958d4b15fba8e081714790fc72
diff --git a/sys-libs/pam/pam-1.3.1-r2.ebuild b/sys-libs/pam/pam-1.3.1-r2.ebuild
index 669e205e8e8f..26873bc6edcf 100644
--- a/sys-libs/pam/pam-1.3.1-r2.ebuild
+++ b/sys-libs/pam/pam-1.3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="audit berkdb +cracklib debug nis +pie selinux static-libs"
BDEPEND="app-text/docbook-xml-dtd:4.1.2
diff --git a/sys-libs/pwdb/Manifest b/sys-libs/pwdb/Manifest
index 36f035b2e5df..198a728efbbd 100644
--- a/sys-libs/pwdb/Manifest
+++ b/sys-libs/pwdb/Manifest
@@ -1,5 +1,5 @@
AUX pwdb-0.62-build.patch 2920 BLAKE2B e0d7362fd82f3c053a25c16d7f07aff8200a2904411a3b9a5c8921551320924aa8be41820bbb81a952ce46aed3c756d7a2b28e38c669585e1e55c415c0388e64 SHA512 fb6b1bb322daf4a343b31fd8cadb1c546682421775670a361721272ea5811cb87b8215aa1c7bad624334da826ddab4776a4809fce0613346a4560ffce8af3bba
AUX pwdb-0.62-selinux.patch 10371 BLAKE2B bb6acd534be858c85b237d18a5e805d812db97178d9d79b3b84c5b724981aa102fe7eb58fa661719185b0b957a58c0929996a9b7aa025d49560cafe8631de70d SHA512 63cb33af31179183c32f738c90ac2144e8d8092034faa5bcd0c5420832e51018e7e9ffcea59c8354ee0ae598e53dbd120cd9338ab80b0e5df6cc1c53eb75b818
DIST pwdb-0.62.tar.gz 133183 BLAKE2B f9b75e9875c8de1050d8eafa8b0c0c58b8c415c9b67683d1928100ce4f192f1b1cea3033264b6c31edd0709094c034ae3790ceaf0143d6b52ce2647a3ad62992 SHA512 baba1f42125a4773f2e645129be79e0e5fbd0b0da7c6624f4b1d13e59cb65f5807bd22997aa1ba360c7627f2aff93c9949b2bb5fbd27d74b516853bcbca96ef4
-EBUILD pwdb-0.62-r1.ebuild 1395 BLAKE2B c2aa20ac6454280509d76fa7581ae118ffea95ad7188bba98c1fadcb8566b76c49a3c9527aa9773307e663443e84c22687e95f67983b2222c2ada3f56840401e SHA512 011de590238c3c1c8faad74efd92a53923ff4efcad91c740b87c1634d7bba45fc254e6303093130f06c60164be52005104271e92c758e980c69d9dd0b5aa0c8c
+EBUILD pwdb-0.62-r1.ebuild 1396 BLAKE2B 3eda03fce4908b19ef0d5d2f2d90fe6bf924fa0fe2053514d318d1e412ec47db9db17acef591184f7f6b3b5e8a628a8568c68179d723b227a0654a6cc3083b04 SHA512 30e98f5df108aa882769804b71dd038084cb2a3ee8117eb15cb2c7587f200e6a5196c65bb6bbabbb10733ea739ad31e36f976c04a93f7f4cd82f978eeb86df4d
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/pwdb/pwdb-0.62-r1.ebuild b/sys-libs/pwdb/pwdb-0.62-r1.ebuild
index 72d4097d1748..5207813c4ea4 100644
--- a/sys-libs/pwdb/pwdb-0.62-r1.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="selinux"
RESTRICT="test" #122603
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index d01ee610e781..33136741ff38 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -26,8 +26,8 @@ DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a7657
DIST readline80-002 1401 BLAKE2B a2f511272f6d651208469998330059d6bae17bb8b704b64468685bb0368b76df1ca5b1dcd8e5cb0019e80932130c8a92fd1a305679bf79f0b801532a94c4b4ae SHA512 a941d142a59fe592cc45c1cf4d416e2fc0ab543dd6a0496fb8b2ec6f651cedd6fb9e0c105f14880700b69b2d6912653b3f66371e45cbe4adc0cc9554801afd3c
DIST readline80-003 2158 BLAKE2B d8910aef1b796a59500b255df8db71ad1738dd164fd69827759eade74b6d9806ecd364839cfa904fc2f2d48352342155f670e5ec43aac0693f36820fb7139a4d SHA512 85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca
DIST readline80-004 1275 BLAKE2B ac260bab163f17ccc783e0c2a21351b05e9e86ad973383d228d10ec749f265df8588c38946c9da15e987192b50f1bcb81141c2f4e171f65455f58521e864a534 SHA512 301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461
-EBUILD readline-6.3_p8-r3.ebuild 4381 BLAKE2B d13d4b6b67a8d56f4ca807241adc3160cbe269919477f88443e826abe3fa2de0b69c9392d021d8dc1171edaf4b8f0e62010774d4b93b8db0f18ed8a93bae448a SHA512 2a01c6145ff82941734d4ffc0c1a138b922d171ed8452711ab12f939cd9ea85f574baf50749d8824695a2a2b031a719c1a5953cbf7131ea07352346cd9cf2043
-EBUILD readline-7.0_p5-r1.ebuild 4872 BLAKE2B f3409c9e1094982fbe624bf061fb6eabc9af983c5be416e8d3cb31d1120734d759a0a786c111c38b505458a2f7e941fa4caa0eb831f9186bb78066ae166265cf SHA512 ed43d334b15d58901132dab01b9d398122030ab6438fb24758b274059f5793a545224713c66d778ffeefaa2c31d25fcbcb3213df81f7315654de409e76fcd3b2
+EBUILD readline-6.3_p8-r3.ebuild 4382 BLAKE2B 40f4d50108b38fea8c04c4d21d7f2d0166c903e4094b55a1878c230e8aa2dbe53c482e6ac0bd7173444aabf05e384b322852f06b8959b281c5cda7e561692540 SHA512 756f195d204a9ff3bc942ded6767db0afe8fb4186ffb86b66d8ac77262cc32834a34877a05d6903ae5da399562c596e3eab7641fb950bb7a97bd87261ce534d7
+EBUILD readline-7.0_p5-r1.ebuild 4873 BLAKE2B 3906ef2e23648e451512d7a9b7020b1185f098ca6e6f0d99a8939bc768f73fc90b3db227f861d3816102fe2cb4f950b456004ed333b325dda872a6cf88f148b0 SHA512 9c72e370630bb34d98c65bcdf8a4e9d5b064ac9237c67eda268f41d1ef2c3f0a5b8109b746b987cded1fc6807ac3c025a4b124bfe9910a01f07da5d12b8106a8
EBUILD readline-8.0_p1-r1.ebuild 4852 BLAKE2B d7030926a429ed544cc522a1a6d7dfe3f478bb0b2a7839afd88921f40d44e9e608b9ba07663366f11f70c7a8f5b778f3ae4049bfc43b498c290475387e306a71 SHA512 5b2afd0c8cfe07af987fca735186d04abb6d5780d74e5448ac17dec67e1ecc23b865c6e9e88e873a505e8d940eeb242f76ae5a64bde0e4c8f0af89316ea9e085
EBUILD readline-8.0_p4.ebuild 4852 BLAKE2B d7030926a429ed544cc522a1a6d7dfe3f478bb0b2a7839afd88921f40d44e9e608b9ba07663366f11f70c7a8f5b778f3ae4049bfc43b498c290475387e306a71 SHA512 5b2afd0c8cfe07af987fca735186d04abb6d5780d74e5448ac17dec67e1ecc23b865c6e9e88e873a505e8d940eeb242f76ae5a64bde0e4c8f0af89316ea9e085
MISC metadata.xml 472 BLAKE2B 8d3717ac6980105677b10449a1aabca9f9347066f73802241b904101172690bb789b8071f3670dd91ad2af0223c7bc5fb4ed594dc8af3aff20b17bdd681f7630 SHA512 f19a6f0d6aed18903778adc5ad45fdae39c4388e4f09e7cb8a110b798e8cc7ab1739ff813a227ad08ef1166309e1ead57c200b7fe42499a06db97af9f4bce173
diff --git a/sys-libs/readline/readline-6.3_p8-r3.ebuild b/sys-libs/readline/readline-6.3_p8-r3.ebuild
index 9828d52fc3f6..009f74e037f7 100644
--- a/sys-libs/readline/readline-6.3_p8-r3.ebuild
+++ b/sys-libs/readline/readline-6.3_p8-r3.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs utils"
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/readline/readline-7.0_p5-r1.ebuild b/sys-libs/readline/readline-7.0_p5-r1.ebuild
index 0701ebdb1ff1..00c928489ece 100644
--- a/sys-libs/readline/readline-7.0_p5-r1.ebuild
+++ b/sys-libs/readline/readline-7.0_p5-r1.ebuild
@@ -41,7 +41,7 @@ esac
LICENSE="GPL-3"
SLOT="0/7" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs +unicode utils"
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 81fad05a32a3..05ad930cab78 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,4 +1,4 @@
DIST tzcode2019c.tar.gz 253560 BLAKE2B 62552e7e78ebb50c111f9a99119843fe9b5dad9e1abb5ba0f1cf0a931cf00fc49684a6b378f5ea4cb31aca8af5b0c3b697b87048ef36a445536ec2fc5b943440 SHA512 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b
DIST tzdata2019c.tar.gz 392087 BLAKE2B d7a21e57391d321b5c84e1ba2286ff0dd154c435d40015d999c8c6f2f1bea3c13d832c0752af313c9aa4dafe6a261e1e92bfd79523448fcd585188a53454e31a SHA512 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565
-EBUILD timezone-data-2019c.ebuild 5133 BLAKE2B 5c297ba9cf5ab354ccf28eb4cf75085d538a21053993145517adf50cf9a0d07b9f9a8a471f6c69cfce7f15de741ffec4de362c341a1273f7ab2b5b1d25de360d SHA512 c4a86bcd39f7adef16b1aff4db434370e83957df7c028305dd684e225eff140421c6d621980ac96e67b0c68cbff039f27e770acba83aa197b040499d33a1d0bb
+EBUILD timezone-data-2019c.ebuild 5134 BLAKE2B bbefd7a68861d2fc2fc2ba573ac0e6546f90c6a3021cce3f86f291ccaf9fce16f0a6a87684046304c8a05931c80d80440807414ca9ff5d553bac2e8261bf6330 SHA512 d110ec4f2eff01b16633a71ab246ab6ff71bb9881676b946643e5cbc7232fa9a6ae15be9f947a07243e47de72451546ccf62e8ddb0c06c316e0c9194a209262d
MISC metadata.xml 658 BLAKE2B 29b5600fabd796a8f9d284fbff175493a1527e57de2f81934483cadc7a3eb33800cca9d48f0002d8b426383bad1689f1259ea7a9c93fda3fd23deb13ba6d43ce SHA512 c7cf8a401e69d9550a94f8f0649b1096949264434285e085379f92cb6a2d72948a7f771803c665ca166db64e98ddac3aa24834edbb174c0305a1db90bc448d3a
diff --git a/sys-libs/timezone-data/timezone-data-2019c.ebuild b/sys-libs/timezone-data/timezone-data-2019c.ebuild
index f4d210567795..e508d234d92f 100644
--- a/sys-libs/timezone-data/timezone-data-2019c.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2019c.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
LICENSE="BSD public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="nls leaps-timezone elibc_FreeBSD"
DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index b602b92c4e38..9fe205b0f60e 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -1,10 +1,10 @@
AUX uclibc-compat-r1.patch 814 BLAKE2B 75fe9c5321171f3e378200e1c4d11792b3ea047fb4e62460cfd03db1fc761a7e711565ba97afd507a5996d3adbe83e08152a28464310098599867bcc642c1c53 SHA512 35eedbf33282285ae362a6e1b71f91a19ded8b18792f706b3d7e9c68221a61db238d84772a793cf086001272eda1b227043b90e8ef31c27796ffe837ccad11d0
AUX uclibc-ng-1.0.30-fix-ld.so.cache.patch 1515 BLAKE2B 20f317c623cf66f8351915636d5f01bee669db9ec83824ac5b95792c82c60e3c9ce8926cec48a0d93482b6d8ef8f42dce4e8338807bba2a88ac7654615ab50b2 SHA512 96a4b8621b17e93d4d7c019244b0e4854f8c496b43db617f238a087f7db1380b7968d7143fa6516b014fa20c113e6d59686a605914bb29be1680132ee6f0fc84
DIST uClibc-ng-1.0.30.tar.bz2 2302796 BLAKE2B 21888dfe5a68f83b7ba56bb557ecc5aa19fd75cedc82f2ed48073f47655888719feb27943e0309f8101a24fd2fd9165af31d5679f21c00b12f27ebfccf354bac SHA512 ddd1d91dcfdf7be8471afecf13196563ad348c41e2fa8b63ae50b83f103cf8ed8d9f003b51a54a58db2935b84692b7c011a4779582f30610ede44cb583aae742
-DIST uClibc-ng-1.0.31.tar.bz2 2351728 BLAKE2B e2cad8500fdafdd98db11cbc756f3277845fedf545598c9861b1d1ef51b3a24744afe635d6894929eb537891323b0627577c2a5e5dbe1ff0ae588c5aa53a1219 SHA512 489e5f5e8952ebfad1d8a5528a04420d9d2e58fa5092029ccdae91d81dfcf8b3e00092453432da94c76fc18cab542192040bfb271e367fa42ca4926f4b45c372
DIST uClibc-ng-1.0.32.tar.bz2 2352471 BLAKE2B 887b67f7f03fc8610d8236a18f90584720a78bfc3a036cd6616453bea6e31140f5fd1dfd1d207cc5100854bf3e0c5cc1ca38fe6c31cf97b631892767ae23ec27 SHA512 1de5d4e99b94eeeada4233c53a95ea1b9e704ce1d4aa19ca9b17535c0328b2372ed93d24591c6ea5bfbc0b950aa575c18dcf6950fb04342924bb2b5f9ee235e8
+DIST uClibc-ng-1.0.33.tar.bz2 2531571 BLAKE2B abc4f0eb5585a1c29b2fbf2edae4387c12ba00298f2a6ef43e7a3e5df6d8fcd537e73fef4af3d15acc53930e6499e7ba7c60992b337c409b656951d032ccf7be SHA512 379f2ebc0f5e2abb60bbfc17a4ce65da09555d6177b634688f6cd4d3f4bdd44fade8120429c81364eb94feda68baed9e7846f4162367bffa6eedf44744ebb33c
EBUILD uclibc-ng-1.0.30-r1.ebuild 10333 BLAKE2B ffa5feeb97445afc2e383dedcc1bc9a323c555f6e6804bc5a36fc94fffd61ae1924de915dd502c0201bf05c458a8ccdb855cfd823392bdf9414fcb168834c035 SHA512 f58101bbdc06e4c8f1174bd03eec3cb0618f348960f4e9c920d9e5a96a48b57077248e47899b31280f23aedb0a359400a89faabff9371bdb07a9987b1e1fd659
-EBUILD uclibc-ng-1.0.31.ebuild 10267 BLAKE2B 025e6c32ea7b912e023c5aea52bf25cfab558490203faef255a9df706db8a1b77c011a6e953936523239fae4916beb163185a5069509252db9d7201e1548e6d5 SHA512 702bb92fef6d0cd575aca7368a87ad3d529a191384686a2201aede6303af5d1472efa2a19d03693c6111ecf65bfc4d20d61447f17648c07aee77368d0447fd34
EBUILD uclibc-ng-1.0.32.ebuild 10283 BLAKE2B c62bcdc2976c3856b1588521df51b4cc73aecb4f7d071345fa73e4eae56590affdfe2bb6a6dfbb5502c737f96e91629e52150684a9287c4bd0d6f53ab1af2c7c SHA512 21140aa3c9f86262f6a5a7d3c44115fd1ab515966c27d54edb2db535cdd82bd1b7cb4ff2555261082d2a66f7466b257851bede3a2b36cd6da4adfd69e2244b0e
+EBUILD uclibc-ng-1.0.33.ebuild 10290 BLAKE2B 63ddacde22ec6e60279750af73c265591c74a3b317ff45c4e0ca775ba43c4a7e57d76c8f0ef7c05ffa89f09ccecef9aa8531f57106811e2f82f4c7ac5e8febc2 SHA512 5ecc9d58896f3e65cc74c22a4eb330f708cdd3637d8b4c622c3d5e8393f55a2c0363bcc8089b40134afc62a341cc5a748236b7a1dddd7750b206c55214b25bb5
EBUILD uclibc-ng-9999.ebuild 10291 BLAKE2B eb05c3ddf01a6654dde891395cf530662f6310ad1d20743f27a63f8c019a06ab06d84a7cb7e4a961de4575a574b9bc74779b96d292d73d31a5b9e07ef9c47a63 SHA512 19254a93c71a4d5bc3eea3f3d49b0f507fa28770c8e88265a461f3826f09f2e58318500c75e9d6a8f4dcd4d171ceb0c1edd2a9cf892cd768c93a726f60e3b0e5
MISC metadata.xml 790 BLAKE2B b48396e1f8dca79f2b9e452982007573959e89ab8467e2c0d65863a0c00dee140f9a7a5a4f02c916da76018dacdcd9993434c30ba0a511888248f83a9c063e7f SHA512 a8e955511974be64f2360c16a883eec4b9450eebb393bee5f97b50e233275de1cce62e2ef3b9945174a9dca19a7f30aaab6e90c5c28f283c378709eb3fab3ac4
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.33.ebuild
index 48fcf29fa83f..6f884b80c8ca 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.33.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit flag-o-matic multilib savedconfig toolchain-funcs versionator
+inherit flag-o-matic multilib savedconfig toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng"
@@ -18,7 +18,7 @@ HOMEPAGE="https://uclibc-ng.org/"
if [[ ${PV} != "9999" ]] ; then
PATCH_VER=""
SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
- KEYWORDS="-* amd64 ~mips ppc x86"
+ KEYWORDS="-* amd64 ~arm ~mips ~ppc ~x86"
fi
LICENSE="LGPL-2"
@@ -257,22 +257,24 @@ src_prepare() {
# Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
# If we really want the ABI bump, we'll have to hack the gcc
# spec file and change the '*link:' rule.
- version=( $(get_version_components) )
- if [[ -z ${version[1]} ]]; then
+ version_0=$(ver_cut 1)
+ version_1=$(ver_cut 2)
+ version_2=$(ver_cut 3)
+ if [[ -z ${version_1} ]]; then
subversion=0
extraversion=0
else
- subversion=${version[1]}
- if [[ -z ${version[2]} ]]; then
+ subversion=${version_1}
+ if [[ -z ${version_2} ]]; then
extraversion=0
else
- extraversion=.${version[2]}
+ extraversion=.${version_2}
fi
fi
sed -i \
-e "/^MAJOR_VERSION/s|:=.*|:= 0|" \
- -e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \
+ -e "/^MINOR_VERSION/s|:=.*|:= ${version_0}|" \
-e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \
-e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \
Rules.mak || die
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 9b0ddb2859ef..132a2bd0fd20 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,5 +1,5 @@
AUX zlib-1.2.11-fix-deflateParams-usage.patch 2937 BLAKE2B 42fcb91b99b004921dce12b4e71c12c62e80d50243a1cec97522dbaa1cf5fb09cf701e9f988bddd0470c3dafe743d42e60b9ac6903afb2185859d62b1fdf78bc SHA512 9b949d894be2bbb60d687820e79d7a02e733e8426e6602482f3a3902fca3571bbfba38ddd84a88f5a093fdb25ac90e4076905d19b86ab70ebce6e250fd118286
AUX zlib-1.2.11-minizip-drop-crypt-header.patch 997 BLAKE2B a964dfb26d05045507cb2ebf1154b890782d9952288627dd5093eeeaed9265a6041922e9fef378333ad3b9ac2333d692b06db1d6425df25d6062b9fc42ec8c50 SHA512 158c4b711e8afc248cbd55f2057dede18540ad35ec1a47d0cfb0fe9bf10b1507bb1b4525badcc0a8b6505062d838ee4fb2d4ebfbf9c9d1694336a704bc0b690e
DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
-EBUILD zlib-1.2.11-r2.ebuild 3100 BLAKE2B 140c847a7d29f548c1e3a9dddf996b1f38abacbfe2fc2164bef6eafb330e24a513ac811113502682166f0a74068b948071d564a669675932535894bc54f9ce78 SHA512 9c15e71fcbf91deeef10f81bca6666cca82551190de1e496f541eb97639d2befdc863a39d84cb2ca78f5a0b883c02e5de4b7d7b4f9ec16c6c460b40589458821
+EBUILD zlib-1.2.11-r2.ebuild 3101 BLAKE2B 90e53e105aa8ac4c209c781db0dfb2173e1c51a70f52fd14cefa7e57fba3b2983e693c8b26261e9e05b448db20c677375b1845017fc7985f39a8e7d752deecbc SHA512 e5c4cdae891e4a9febcfcf9c826c79b288bef48599d1d065990077c0970d7a4d449b6a5d8fe19915396810ea45406a757b478e4845205a5a4c3dd1c9b3e7ac32
MISC metadata.xml 432 BLAKE2B 80b2aa4dbc687fa23b3e64f12af789d2b1f308ccba611de152efde3008a5b6f66ee56121c2c4846a482e426c78e5f921ee7cf9b196c28504ee0de420725a6239 SHA512 947d4b2035ab49c42f6141f14553f1e8f4796b4ddc24c6a4f071ac2300eb120648dd03eef49773295d3e3f30cd9d3cbb391bde798dacf1187b46ff75abd59420
diff --git a/sys-libs/zlib/zlib-1.2.11-r2.ebuild b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
index 8d4c0f48f9d1..b43e10d36094 100644
--- a/sys-libs/zlib/zlib-1.2.11-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="minizip static-libs"
DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"