gentoo auto-resync : 19:08:2023 - 09:38:07

5 files changed, 3 insertions, 12 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 521ed3ac49ac..b5a66eeec571 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libnvme/Manifest b/sys-libs/libnvme/Manifest
index 8b78fe4c2393..70f08db9403b 100644
--- a/sys-libs/libnvme/Manifest
+++ b/sys-libs/libnvme/Manifest
@@ -6,5 +6,5 @@ DIST libnvme-1.5.tar.gz 566715 BLAKE2B 2111a6929bc17949f03c39fdb247420bba371641b
 EBUILD libnvme-1.2-r1.ebuild 1192 BLAKE2B dd05f5d1fba9e50117b24d66fea37d05d1a9d1f900206e419f3f3ce76e3f0868639aa2aadf597507767f726fa5c59376e9d51d6bcd1067d62e24b12069e1baae SHA512 b56d7690c6b71d75b27436d36a0f47dee76b8c3951374aaf58cf4794b687b6fa02b2dbe5936c8fa76390a65c1463842ad2290d4fb4b37f3601644705c3d49971
 EBUILD libnvme-1.3-r1.ebuild 1351 BLAKE2B 571a22422960fd0a7f5c2a0e16e367cb5b9ad9fcd543698b7aa4f320d24c5bb7cb4918bd858d9ebd144e24ec15e4c4db0a546aa773bb4ed023539314b01da3ed SHA512 223e511a5699cdef31b1a22d7bdd1bf757442b652f3dcead4a08e481524f963eb243f70cafa732165783bb32a7ad2d33baf1f379e9c18252f338943c472096dc
 EBUILD libnvme-1.4.ebuild 1393 BLAKE2B 4d67d8f1c72859697e1983a609f3b55aaa62c4cd7bb8428318ae46a137fbddcb5afb46646d0b297807faea32e66fa545cff2d0d229f3b4de61b8480f1891a436 SHA512 01d338434a5bddaa21ca9d69ec362152252359660a0eb8ca16ae27b0f96389ae15c2cc78ba3eb1780deb9092e5d5fb514bafe74ab7122efe2a441fa1ad4a8877
-EBUILD libnvme-1.5.ebuild 1403 BLAKE2B a85508e1e533e588b77714a970cf84618b4f089b0719e01724e0377ca601caa1b5c59ae933f1e1a6ba90731dabdd3f5ad913dc46d3752ab0634c1045e68d82b4 SHA512 dffc8653367599375322d90974fb31b48e7664b40c356186f764c7944b586884f78d6f59f79703f4eceba903a59f8616823489dc88ee0e2386ddcfe618d98275
+EBUILD libnvme-1.5.ebuild 1402 BLAKE2B 7b08c5c7e0761e4dd5e4dc97f7a6a866d1ac65987dea4bf17184082ec5d48329d34ece03b7dce4f8838151c1b217682a82b1c0a1783bae4f4498e1c69db9b99d SHA512 c5b5e955d70f42f03abfa76834b77a7da2490c2d316fa62d072efa2a929ba1b4bdf401b4d640c76dcffb9d044c8d465967838be7054645c9cdfb92b9d4bc0a52
 MISC metadata.xml 585 BLAKE2B 6163419190adb903fdbdef99ad53f8b14ffbc08ac3c8b56f820049468010af2a58ac204ded1b53c767759e9ac864bf85dbc3b723cd7113cb919194dd9ceaaac3 SHA512 2f5268b41676d2a61d5415de3ec62149cda53613970a1af6aface937cc635d26866c88205a6d9fcf7efd7df0c7f45308ecf5b29b6cea937966b765a222edb8f7
diff --git a/sys-libs/libnvme/libnvme-1.5.ebuild b/sys-libs/libnvme/libnvme-1.5.ebuild
index 8939d9860409..71461287e8c2 100644
--- a/sys-libs/libnvme/libnvme-1.5.ebuild
+++ b/sys-libs/libnvme/libnvme-1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="dbus +json keyutils python ssl +uuid"
 
 REQUIRED_USE="
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index ad3788856d79..284dec52b69c 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -7,5 +7,5 @@ DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B 29206175f06b4e36960fc6b9403101f55c1f5b76
 DIST zlib-1.3.tar.xz 1295740 BLAKE2B 5fe0f32339267348a313f23a21e9588bdb180b7415be303c85f5f169444d019e5f176ef7322f6e64297c360acc2a6041c50e2f66d1860e5c392d8970990f176a SHA512 3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2
 DIST zlib-1.3.tar.xz.asc 235 BLAKE2B 5fe6ce952699a19e848d0a6e6c3622f934340068fdcd29afb35c74f3c8ae66d04de644800d10b38c743bb2f4852ba28f1a97313cb0e6e6f9b804cbca5289ebbb SHA512 8f3ce5c21938d6abc7e121d2939648a0ce2dc01a8ab4eb001d44eb159935dd0b4f5b5e371b3ecfc0ceb23689e2cefe002065968908503cde15b1bba08aff9db6
 EBUILD zlib-1.2.13-r1.ebuild 4678 BLAKE2B 9498146403a409cdf259955307713c952a3633cb25f429a0547f58396dc3d535267b15d15426a0ef798c42406c60e0afce1318bbab31743fa633a2ffc47e53a5 SHA512 02d899d6b9f62af3f820cd13df634687a2358270b48e74f091343ec3181554b4c41e0a910e8fafc3d2d826db8f0a3d5becf7854eab92d75528211f5859fbc1bf
-EBUILD zlib-1.3.ebuild 4798 BLAKE2B 8599b2345505370b8f12736e3d0613aabdecd50689158297453879598c65d540257ad9af10357c2f1b6139349eb8d276375b9d342fe427cfc79343a956d0a648 SHA512 c82cf61ec2af38875bef66704add68a11ad036a1bc41c48b1a1e6a5307c0c011fa343a023b42e67287a387a4c67ee736128195d7f85154fa67840f5ff93cd47d
+EBUILD zlib-1.3-r1.ebuild 4557 BLAKE2B c85ccc6bcb312f3285af230e5fd2546f4d511908f05b44a55d6e32d88cd05e900457ec18d62809a5c6224fc848afdbeec04a966f62186cb431a0de9db54d0ac2 SHA512 e61720d294e1dde5593f111ac5c0fd593292710b7b4aee37f160f5024e596c1ee79d8f628f45281437792aaefcd2742bd8119bd2873c6a1aabdd4b47c5d0e3e4
 MISC metadata.xml 494 BLAKE2B a4a57a4153aefc189e407bcb8ce84f7c94581cc66967f69097087da7e6ff48d2de683b919fb00445d095c47ef39d31e01590f8c989ce0e5e01474e73ee2a0565 SHA512 a7e0160c127b3c2a6afe99e95992d9dbd017061303759c299ec38800efd6a9e11a35ae850c23c77c09c8833cd9d61ac1267f6becadf9c22437ee35e4304400c9
diff --git a/sys-libs/zlib/zlib-1.3.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild
index 6dbffd69d64f..e20d5e67354b 100644
--- a/sys-libs/zlib/zlib-1.3.ebuild
+++ b/sys-libs/zlib/zlib-1.3-r1.ebuild
@@ -130,12 +130,6 @@ multilib_src_compile() {
 	use minizip && emake -C contrib/minizip
 }
 
-sed_macros() {
-	# Clean up namespace a little, bug #383179
-	# We do it here so we only have to tweak 2 files
-	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
-}
-
 multilib_src_install() {
 	case ${CHOST} in
 		*-mingw*|mingw*)
@@ -158,11 +152,8 @@ multilib_src_install() {
 			;;
 	esac
 
-	sed_macros "${ED}"/usr/include/*.h
-
 	if use minizip ; then
 		emake -C contrib/minizip install DESTDIR="${D}"
-		sed_macros "${ED}"/usr/include/minizip/*.h
 
 		# This might not exist if slibtool is used.
 		# bug #816756