gentoo resync : 25.08.2020

4 files changed, 63 insertions, 6 deletions

diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index c648e582f714..5944e6c5d155 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,7 +1,9 @@
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
-DIST asio-1.14.0.tar.bz2 1473195 BLAKE2B e28960d585a1a84c6be7d6205be310bd2baab36e93630b9f5f4fba593377e57d6baf1c60e2503c46cd00ae73b20b622215358cae2068e86b62dac7e782210ecb SHA512 84855a06a3facc41e3c1c61be443d8b73a01afcb9bc3f1f444f0f3fd901ea1d5c932266ed94a031a0abd83171d5a6b83b6ab850e44aa31d175081a7e07b4793a
 DIST asio-1.16.1.tar.bz2 1493978 BLAKE2B 810fd735a0cbea8e07bfe30cbf02d44469c3c7eebed3822766c0a658fe8972681232afe4a6124537886fafd0769eecc40b8eabbcaa2771b84b93cda56329394d SHA512 e8cab449887e3e362f9d3c2aa1b1bbb2f81954aeaf2cd12cefe7f848cdc30e1a576130b49f551efd49611b9d4941e724baea42739c043e158626f3c982b75311
+DIST asio-1.17.0.tar.bz2 1694631 BLAKE2B 0463355eef1714604290be43247139ea0220c5614c3c280ccf6049b64a2bb920c9eb885cf5f00c7e007caf3b049fe5cd6589dad0cb23cda4994fd31c7ecd8102 SHA512 5978cbf452aff07d6d19a2e641824628f409ab74e2e1a964776dae4c586386149acea56e4c8aa1075b247d2ce566daad640c3bbd15e211df1f73fc7b02964353
+DIST asio-1.18.0.tar.bz2 1724947 BLAKE2B 6772a70c035e7df08484703b6f2fa294b6a1ade4b1e661481df0e790fe4a36d74f0f4b14023c7505fc599c4eefb3e3baf392fd7897c10c07707a0474870a6557 SHA512 4b21b72463951ffc5ef72636858955ae5af5ce0dec4c835fccf3c7e8ccfa10bd97530bfc2ec9c3f601374da8300ac2e61418845d3331c980fa9876057bbbb1e0
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
-EBUILD asio-1.14.0.ebuild 980 BLAKE2B 93c1570ab4c7d9a7ebe0eab38c7e59cbe8f0f253f893ee61fce4687b58a180249e196e16131d94d4eb609dc691f3bb2471f938ffc397c0ef6297851096601022 SHA512 e0d83ec9c30147dadad5cf11c151efe4bfde83980c655067639943d19a6d6ab94cd8ca0b8d80d560d348341c9e83fd9d569425e8ecb7b5e9b4a364a80e9cc25f
-EBUILD asio-1.16.1.ebuild 985 BLAKE2B cda24973c883e3a98eae64aa40ccf35bea72e7faec4ee4f53cc58a64ae1a45a424627cc372b0195bb0ff5f5ffb6215b86a1046dad726ae771887a7cd23214931 SHA512 acea4016bcf4d4eb3ff1176c9dbcd1ca09aae430b191a5eaa28c311e3a9670de066604a7e3b603613a47a3b37570be334193fee40a96c77a4ac619314f6931d3
+EBUILD asio-1.16.1.ebuild 980 BLAKE2B 93c1570ab4c7d9a7ebe0eab38c7e59cbe8f0f253f893ee61fce4687b58a180249e196e16131d94d4eb609dc691f3bb2471f938ffc397c0ef6297851096601022 SHA512 e0d83ec9c30147dadad5cf11c151efe4bfde83980c655067639943d19a6d6ab94cd8ca0b8d80d560d348341c9e83fd9d569425e8ecb7b5e9b4a364a80e9cc25f
+EBUILD asio-1.17.0.ebuild 1186 BLAKE2B 03c9aa5d6c9b915d6b0d5cdebce002241767748a4cfe02b3faa3ead0191060afe862d3a0661898b6bf67e9452bfb5f5cddddde3470f0f0ae12216be2f6b914a5 SHA512 0108d11c3b48e1c792a8243e05942ae15ebe0788859db7af71d717372c12406fb52fc79429697ab2cc34c77024b7ac951a20a16dcae621f64f95cb1665bf2992
+EBUILD asio-1.18.0.ebuild 1187 BLAKE2B bd32997c2ee92bcb2854e5f6491467017b129d75bd2fc166caffbffd0494821eb083009fc89b090eaaf8c88971cc16b838fdc221b4bfa8c2731c30c99b98c21e SHA512 16dccbbfe6f1b40aa626465d8a3cb4c15dfbc34a638d727852c723ec8f31c398b02fa0041bea0617799023397954518099d152265033110faaadc7193b98cb18
 MISC metadata.xml 456 BLAKE2B b92702f7cd621e3bb4191c6dedc380e21d934e7299202b572c68e9bb029fb0abd1b834bc053b18ddd6293d65d522ade938791fdc6a885a85aab63e3b90f0adf8 SHA512 451257fa1e2f3ccab92aea2e81984de91ffe61e61ba57d56fe86d06a09dbcdb6491e13b2e7e3dc02c0cd924b19bde0000772100eaef8929b1a3779d174e918cf
diff --git a/dev-cpp/asio/asio-1.16.1.ebuild b/dev-cpp/asio/asio-1.16.1.ebuild
index d14123c94662..9af756e04a9c 100644
--- a/dev-cpp/asio/asio-1.16.1.ebuild
+++ b/dev-cpp/asio/asio-1.16.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/asio/asio-1.14.0.ebuild b/dev-cpp/asio/asio-1.17.0.ebuild
index 9af756e04a9c..bdbca15bc10d 100644
--- a/dev-cpp/asio/asio-1.14.0.ebuild
+++ b/dev-cpp/asio/asio-1.17.0.ebuild
@@ -4,14 +4,17 @@
 EAPI=7
 
 DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com"
+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 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
+# test searches for libssl during ./configure, and REQUIRED_USE is easier than
+# patching configure to not search for it with USE=-ssl
+REQUIRED_USE="test? ( ssl )"
 
 RDEPEND="dev-libs/boost
 	ssl? (
diff --git a/dev-cpp/asio/asio-1.18.0.ebuild b/dev-cpp/asio/asio-1.18.0.ebuild
new file mode 100644
index 000000000000..1a7e5378adbc
--- /dev/null
+++ b/dev-cpp/asio/asio-1.18.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~sparc ~x86"
+IUSE="doc examples libressl ssl test"
+RESTRICT="!test? ( test )"
+# test searches for libssl during ./configure, and REQUIRED_USE is easier than
+# patching configure to not search for it with USE=-ssl
+REQUIRED_USE="test? ( ssl )"
+
+RDEPEND="dev-libs/boost
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+
+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
+}