gentoo resync : 25.11.2020

9 files changed, 39 insertions, 194 deletions

diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index ecf3c3aa8463..03df9d839fc6 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -1,12 +1,4 @@
-DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883
-DIST http-parser-2.9.1.tar.gz 51300 BLAKE2B f99c3e6a764ea0870359b43aac7f31691faef9cc6be3fb99426a3c1e3f24ae50689dfd8e46fa52a22d713780476130ee6fae6294b83cc3526bb5131cf16b98f2 SHA512 110a1861666cdd45857c3ab0e9bf8a3eb9d98f86fe001f7c620009e13186377de805d295f7751921cd5c9d4c2781807b3ae00f939af04d7365a3a45aa20b5052
-DIST http-parser-2.9.2.tar.gz 51298 BLAKE2B 5d37ea197acbac468de03081010fb3b755a093085e56c9fa5a3d4dbd70dd2903335a8113ec21664ca54a74aac4cbbb1cc64b861d021df944790453c2de9baaab SHA512 fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023
-DIST http-parser-2.9.3.tar.gz 51973 BLAKE2B c46160e811874f3d4d2a7390e3b64520c7c01d51f74fb608ca8972ffe264cc389b744c1b6d8b5b6a7c9d7816eb95c179a9c210ba1a122ac4fa95996308d667af SHA512 d200c52f594192ba80a8d5b59d414404843f8601dac647f29c27845db75ac1f015789031e30e91aaab5b553af1ee6af50b90f9342a444c10c1027e10fdb9a31b
+AUX http-parser-2.9.4-non-x86-test.patch 645 BLAKE2B c96cb4bbdd4560b738012b0c6a4e527a5d7b1e7253ec69ee65710b2afcd4162680b6835c20144e5baeed8e9dce253a60dbb240943adad91ec5b642cd981e7538 SHA512 4bd68020912ed43e07f2abaf7425e57ab855a3d04086a4b06d3bdb8fb4a30887a6094d0aebbf2fcd67757eda7c9dc2ae0a1c4e9cbcd2242f50fc4f0b38b764c0
 DIST http-parser-2.9.4.tar.gz 52056 BLAKE2B 988ebc3f3e1a7d53ed4147dac2e09c4d6021bb1a287990d83130c24e9fee01a3123b4c5ad9e1b86c0f123248484dae272010aa1f3ebd3bd4574d8407ede94e62 SHA512 b45df7b94d1c51079d44687d0a7f901f44faae51df4e84c7e3fe38f130c2d809d0e7c2a146c57b3723e60732aededc246bf44eadb10a95b710963d641f9fe7cd
-EBUILD http-parser-2.8.1.ebuild 1009 BLAKE2B dab1aeac7fc07cabadc19ae29050975d5f7712b260f314e06115f9367287edd0a8b524706a6817ea0a90d2a29fa8bb2d5d132dedf21b1d7476a8635e963346bf SHA512 b764290864401b181216c761847f54903671c19f2ebbe45de9d736e2c8fb02758054364970f9b1f913081004495087049c282130679536b785a877951a036688
-EBUILD http-parser-2.9.1.ebuild 1014 BLAKE2B 0e49d3893d32f53525a8e568706d57d1e65e32220cbaca91c52283e724b52f149fbe2263fb428431c9c1da61463899dba1e3454cbb47ab6803d14ac033e2dde4 SHA512 c85c7b57215496c937724f84f317ba21189aa04a9f41cbeeed5917fbb4ef9db3f77d34ea3f628166a023d3b1dbb453e2c4783b764c02e7f43b4b7532d7d5a410
-EBUILD http-parser-2.9.2.ebuild 1010 BLAKE2B 07e668e94ac5b440db9d267c10ca3bbea73d268f4be2793d18db3cfbbe6f948a00c196ddc01874549c3a23a9d6adc90b6f1a1c396a3d4fecf5c02aacf9d0ffd7 SHA512 0787e74dcc693f419a75fc1336155ebfd5abbb0aa5bf05ccdde1b60e8f4dcd80834d6e28e2637f6fb6f775fc963f1224dbd7ad79647e76d7c90071725e47a74b
-EBUILD http-parser-2.9.3.ebuild 1010 BLAKE2B 07e668e94ac5b440db9d267c10ca3bbea73d268f4be2793d18db3cfbbe6f948a00c196ddc01874549c3a23a9d6adc90b6f1a1c396a3d4fecf5c02aacf9d0ffd7 SHA512 0787e74dcc693f419a75fc1336155ebfd5abbb0aa5bf05ccdde1b60e8f4dcd80834d6e28e2637f6fb6f775fc963f1224dbd7ad79647e76d7c90071725e47a74b
-EBUILD http-parser-2.9.4.ebuild 1014 BLAKE2B 0e49d3893d32f53525a8e568706d57d1e65e32220cbaca91c52283e724b52f149fbe2263fb428431c9c1da61463899dba1e3454cbb47ab6803d14ac033e2dde4 SHA512 c85c7b57215496c937724f84f317ba21189aa04a9f41cbeeed5917fbb4ef9db3f77d34ea3f628166a023d3b1dbb453e2c4783b764c02e7f43b4b7532d7d5a410
-EBUILD http-parser-99999.ebuild 874 BLAKE2B 642dd498c67d2ebb02bddb1997f4cd20d372e235174e99d79280e0b258311052a067d226ce79be6052cf6ef943d8f853f2aef149c4a557e767f1719b46cdf9ff SHA512 4729203fefec280b07472592ebebb64ffbadfda3a4691383e3da1de68c65d94237c593a9b39f4626b4ac99ec0daadbac2a8ba07aacb098e465a86476de64591c
-MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
+EBUILD http-parser-2.9.4-r1.ebuild 1066 BLAKE2B b8a511af70cd8cbf8367064302b71d5111686519281403224891e6a75e6e2fd9a9ce9a2b9fe681453a2990cf248bfc9f0b328edaca4a1116aff3f85a58df5c17 SHA512 38ef55c46b2aeec84f833b3c9dc19841c7da9834a2b99f65a58fc5abdc4c076f3f713ae269ccb67a073f59bc5f13eefb76b5158029f60a817a0e367e0b911e65
+MISC metadata.xml 330 BLAKE2B 1d7919a30fc6b050a0e9a94bcbf905e2734b3a80d567771a541e438b7bda2b004cd0d0a621992d526390b89730f86dd2a2cb70e948243753c0b575d0af3edaee SHA512 8c36c72f77c03b3aaafbeb0f389a4897137d7dfe449fec5108db4ad02e65cfd93dd66a6ebc007edde1f79f983658c3d6d08444da8e0556e31661e3633789eba0
diff --git a/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch b/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch
new file mode 100644
index 000000000000..8bcbbf3589a4
--- /dev/null
+++ b/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch
@@ -0,0 +1,20 @@
+diff --git a/test.c b/test.c
+index 53a3163..49c4b7a 100644
+--- a/test.c
++++ b/test.c
+@@ -4343,7 +4343,13 @@ main (void)
+   printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version);
+ 
+   printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser));
+-  assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *));
++
++#if defined(__i386__) || defined(__x86_64__)
++  /* Should be 32 on both 32 bits and 64 bits x86 because of struct padding,
++   * see https://github.com/nodejs/http-parser/issues/507.
++   */
++  assert(sizeof(http_parser) == 24 + sizeof(void*));
++#endif
+ 
+   //// API
+   test_preserve_data();
+
diff --git a/net-libs/http-parser/http-parser-2.9.1.ebuild b/net-libs/http-parser/http-parser-2.9.1.ebuild
deleted file mode 100644
index 28a3330d367a..000000000000
--- a/net-libs/http-parser/http-parser-2.9.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="HTTP request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2.9.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	tc-export CC AR
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/http-parser-2.9.2.ebuild b/net-libs/http-parser/http-parser-2.9.2.ebuild
deleted file mode 100644
index fbfc696edd30..000000000000
--- a/net-libs/http-parser/http-parser-2.9.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="HTTP request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2.9.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	tc-export CC AR
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/http-parser-2.9.3.ebuild b/net-libs/http-parser/http-parser-2.9.3.ebuild
deleted file mode 100644
index fbfc696edd30..000000000000
--- a/net-libs/http-parser/http-parser-2.9.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="HTTP request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2.9.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	tc-export CC AR
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/http-parser-2.8.1.ebuild b/net-libs/http-parser/http-parser-2.9.4-r1.ebuild
index 1d64d816e0bd..34d63a7745e6 100644
--- a/net-libs/http-parser/http-parser-2.8.1.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.4-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="HTTP request/response parser for C"
@@ -10,9 +9,14 @@ HOMEPAGE="https://github.com/nodejs/http-parser"
 SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/2.8.0"
+# 2.9.4 restored ABI compatibility with 2.9.0 but since we failed
+# to set subslot in 2.9.3, we want to provoke another rebuild
+SLOT="0/2.9.4"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-non-x86-test.patch
+)
 
 src_prepare() {
 	default
@@ -22,7 +26,6 @@ src_prepare() {
 
 multilib_src_compile() {
 	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
 }
 
 multilib_src_test() {
@@ -31,5 +34,4 @@ multilib_src_test() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
 }
diff --git a/net-libs/http-parser/http-parser-2.9.4.ebuild b/net-libs/http-parser/http-parser-2.9.4.ebuild
deleted file mode 100644
index 28a3330d367a..000000000000
--- a/net-libs/http-parser/http-parser-2.9.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="HTTP request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2.9.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	tc-export CC AR
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/http-parser-99999.ebuild b/net-libs/http-parser/http-parser-99999.ebuild
deleted file mode 100644
index 7c1256025252..000000000000
--- a/net-libs/http-parser/http-parser-99999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit git-r3 toolchain-funcs multilib-minimal
-
-DESCRIPTION="HTTP request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-EGIT_REPO_URI="https://github.com/nodejs/http-parser"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	tc-export CC AR
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/metadata.xml b/net-libs/http-parser/metadata.xml
index 390b89b4f048..d170ad69fce1 100644
--- a/net-libs/http-parser/metadata.xml
+++ b/net-libs/http-parser/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
-<upstream>
-<remote-id type="github">nodejs/http-parser</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nodejs/http-parser</remote-id>
+	</upstream>
 </pkgmetadata>