gentoo resync : 25.03.2022

4 files changed, 48 insertions, 55 deletions

diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index ff1a75d16cfb..321ce4cd2ca8 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,9 +1,8 @@
+AUX asio-1.22.1-cpp20ex.patch 664 BLAKE2B bef8ef8e761832f1268f3dfca4fb666fd2a3e70a6cd69c1aa9ed0c0a78d6ba0b9d10f08028285925a1aaa5a1fbb80cf4f402b0ad185a89b473328e3654346c0a SHA512 4f7edcc30206c1d9048352e11a28e31fa24c19419560fbeb4456f9481ac0b7c22dcf09a27e446b4eea656126a7322b9e00ba0175c581fe0b4dd9ed61955e7a36
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
-DIST asio-1.19.2.tar.bz2 1842597 BLAKE2B b2236c33432984ab660eba4c93be32374bb49f688a1e6a0711d7bac322cc4a7f817db209278f216468c6a72b9d3dd564cf298e1f49f8098c3fd9aec7acd66eb7 SHA512 07f9c29d8f02090b4d4b6a1867bcc07a8e9f3388556dff787ca3ba143022eeb63bfac0b5bc264076fed4db3b2e5ec6b7ff0ebefde40ba4753c832032a72d54cc
-DIST asio-1.20.0.tar.bz2 1845826 BLAKE2B a768dc0b9ae380bef07d674507f7571d0bc47e182cdde10b24cee246814874dd7739c523b071dfede61a12059f52e04d7bbd309a03d93070bc1dd4640c253c19 SHA512 6421960abd2cf0c205cc50e86adfe492bca2870b486328b4825dc0cefc9c40cdc085516d474c23e15a73f4c108c0e69add5fab6dbe594a1e53636c5c3027e4c5
 DIST asio-1.21.0.tar.bz2 1967398 BLAKE2B 95e0ba44910e7450e614011b487acac0cd292302c0f502ec678639b70af7e6f9b86ee2c50c7f7e3e3437ce4474323e44b5e371c08f3a9ed464ffb3f428de728b SHA512 62252b2d3ca4fb99579c5fe57bf64b700792198dd7fa45acb4af7f64e83494bade1885b848f9e364f4c42d9db025841324cbd9a0fd3fe45526e7e4be6f60f8c0
+DIST asio-1.22.1.tar.bz2 3085878 BLAKE2B 07326a2273d5b8c0aef8402c92a6a88abbcb961d2a029596d58735d6626279e6d4d591371cc368a41fac1d0161b8786174ba71153e73aac38fa81a83f5f5be86 SHA512 be4a066d9f73662f68a771f63a59fc2e16e8ee1ae1ca6c581e09922514029e58c479edfc0517ee6b29a1fd377d202a2a6eb80d9d17f6e957233c11331f04a479
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
-EBUILD asio-1.19.2.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
-EBUILD asio-1.20.0.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
 EBUILD asio-1.21.0.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
+EBUILD asio-1.22.1.ebuild 1187 BLAKE2B afd85ce684e834dd8a0e02c7e5551af496e3da72b9f3c658ed9a543b1fe518b91647b3e4467a5c117f6a9a8eea141009b296d4026feb458164425de13834837d SHA512 ee2dcdf16fac6d3a9615a0c8f4f6ece8c855d7277bc039710e11165478e06fefe0204b53efa652645c7edd996da9e948d68dcef459d1caa96c41c7ce8e0cac29
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.20.0.ebuild b/dev-cpp/asio/asio-1.20.0.ebuild
deleted file mode 100644
index 0e025f305eee..000000000000
--- a/dev-cpp/asio/asio-1.20.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/boost
-		dev-libs/openssl
-	)
-"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-cpp/asio/asio-1.19.2.ebuild b/dev-cpp/asio/asio-1.22.1.ebuild
index 0e025f305eee..1917fccbef79 100644
--- a/dev-cpp/asio/asio-1.19.2.ebuild
+++ b/dev-cpp/asio/asio-1.22.1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="Asynchronous Network Library"
 HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
@@ -20,9 +22,15 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-cpp20ex.patch"
+)
+
 src_prepare() {
 	default
 
+	eautoreconf
+
 	if ! use test; then
 		# Don't build nor install any examples or unittests
 		# since we don't have a script to run them
@@ -45,5 +53,11 @@ src_install() {
 		emake clean
 		dodoc -r src/examples
 		docompress -x /usr/share/doc/${PF}/examples
+
+		# Make links to the example .cpp files work
+		# https://bugs.gentoo.org/828648
+		if use doc; then
+			dosym ../examples /usr/share/doc/${PF}/src/examples
+		fi
 	fi
 }
diff --git a/dev-cpp/asio/files/asio-1.22.1-cpp20ex.patch b/dev-cpp/asio/files/asio-1.22.1-cpp20ex.patch
new file mode 100644
index 000000000000..55de22b8a136
--- /dev/null
+++ b/dev-cpp/asio/files/asio-1.22.1-cpp20ex.patch
@@ -0,0 +1,29 @@
+The cpp20 dir doesn't exist
+https://github.com/chriskohlhoff/asio/issues/1026
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,7 +15,6 @@ EXAMPLES_CPP17 = examples/cpp17
+ endif
+ 
+ if HAVE_CXX20
+-EXAMPLES_CPP20 = examples/cpp20
+ endif
+ 
+ SUBDIRS = \
+@@ -23,7 +22,6 @@ SUBDIRS = \
+ 	$(EXAMPLES_CPP11) \
+ 	$(EXAMPLES_CPP14) \
+ 	$(EXAMPLES_CPP17) \
+-	$(EXAMPLES_CPP20) \
+ 	tests
+ 
+ DIST_SUBDIRS = examples/cpp03 examples/cpp11 examples/cpp14 examples/cpp17 tests
+--- a/configure.ac
++++ b/configure.ac
+@@ -241,4 +241,4 @@ AC_OUTPUT([
+   src/examples/cpp11/Makefile
+   src/examples/cpp14/Makefile
+   src/examples/cpp17/Makefile
+-  src/examples/cpp20/Makefile])
++  ])