gentoo resync : 23.09.2020

4 files changed, 53 insertions, 6 deletions

diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 48b79968a9b1..05eba456d42d 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,6 +1,8 @@
 AUX libstrophe-0.9.2-libressl.patch 843 BLAKE2B f979127225535d271dafdb379d9e07bdfd06cd5684c07fe2a8a466698109dd68c0626615d20636d230858e5a2868dd450b5fabcbb4482e6814a2b3d032bd89f8 SHA512 6a6321955805eb1b80a7dc6baa528a9594f2d37a640e4166839fa9db9d0e2113a64dd33f08682c03a1a840836c76a4e62e384c9cfdd798442ee024ff88c1d8e6
+DIST libstrophe-0.10.0.tar.gz 520645 BLAKE2B 85998ffa7d2051bf3372842a0bc6d5404932c41853609943ae0420760e0434a74b711bd5f23657f061f1227647247b1989833c54c11a88490fe7617459687818 SHA512 9d2e8f95ab5f9611529e18b0130322a196d4b59aae69c931a6d7dc462d4a6a4fa395d6fbca56d9f329fc943e3de005b570ea34629a504175f3f2ec91f85bf40a
 DIST libstrophe-0.9.2.tar.gz 500459 BLAKE2B 0b1f6f1daac1215bcdcbde0e54264b98f5a863de339500826f625f8c5e8143ce7200fb251d04248715e9a8b6621a4360e7ca2780bf4684d916ec13361b5f6fcc SHA512 a0129c49ca574afaefa77c412143571af2eb1100c7d737d497b65d44680d35e2404ee2d4d4e1378b06ac1bcc5c587f505f79fea9251af1cbb36afd990d48570d
 DIST libstrophe-0.9.3.tar.gz 502449 BLAKE2B 662b0c329b0bf7d7f34fc80bf0608b921fa1ad54c8277e88f23f3ed17d0892dc7e3d9bcaaa9707306801e9254bba4a127390025ab95e1d9d850c299a7b26d980 SHA512 9c8ba980f532c5576c2c5a9e3cdca9f833ec78debcb06b17e2f534de0e710ec416b997b0498be77a89fa7f57187456edb1d602993c695a5e738718ea593697a5
-EBUILD libstrophe-0.9.2.ebuild 982 BLAKE2B d5069f4bd65399c4fb4bfeb3a393cdde866bb1220b90bef7e8049a2a18222eba8f5cee1188e2272a3d868adbc73cb9f5ab11e60f275fe89bafeb748403c74df8 SHA512 fa67f32a81ac19b5a00cc51c53eda54851125831206adbbb2ce9ca8a6ee8c92b12afe70b54aad4a4fb444783df00a66c7a65e01fde1a1f510a64bf65651039bb
-EBUILD libstrophe-0.9.3.ebuild 924 BLAKE2B d6b237fec388f2987de089ff5bf74f36fee76a76dc0387b21e9f771dea7e55c0e0dbb3193224fbae83c308e65c2432c181ca7e4603b465de65eae29cf98ff5e1 SHA512 8ed6bf67e275b2af4b151c3a3fd0a3732d44cacdd4a827173ff0b0d475e8eca7438c1e125820710bd94b90093674e1cba6c7e5ff477c4cb26c7d27b07c2bdce8
+EBUILD libstrophe-0.10.0.ebuild 939 BLAKE2B bf7d1b2bc28e0b84526a24b40421da03a4c1cf3a9921404dcf7c2944b7d29bf4d8956786f69d698fa85cccb7e7651418f63d76acc67d0464de662dbcaa0a271e SHA512 4bb5bced839555972d3b6cc73cb18eec6e1a86e3464e9c21a840c7f66e50c206e96511bc8db746e87998c8add26b707c44dfec896107c81504c8529ea8af5838
+EBUILD libstrophe-0.9.2.ebuild 997 BLAKE2B cccba2a7f657e6a37789e4f914e40c73205feb81929b0c6ee67dbe2c3009dacf2bd436dcfd0991726ed0e3fa687af65fd4af6f15718cc91c6e4ebe288ddbcd03 SHA512 a7bc876d1788aa24210548f8c92dd26648841db64eb672123d2684769110715dbc1b3c1b6601a34e1688bb83f0fd8b32287d19333c1018f275a5b50a458b4bf2
+EBUILD libstrophe-0.9.3.ebuild 939 BLAKE2B bf7d1b2bc28e0b84526a24b40421da03a4c1cf3a9921404dcf7c2944b7d29bf4d8956786f69d698fa85cccb7e7651418f63d76acc67d0464de662dbcaa0a271e SHA512 4bb5bced839555972d3b6cc73cb18eec6e1a86e3464e9c21a840c7f66e50c206e96511bc8db746e87998c8add26b707c44dfec896107c81504c8529ea8af5838
 MISC metadata.xml 591 BLAKE2B 0706dfaeb6ebcf44525e7ecfe772c8496020da59ed5b3024775e41a79ec0ac5861d118e136d45187f819e70ac7e2bf360bf210d159167aeb1eccaa75747353fd SHA512 d05b0612eae08214749144fdca408ae9b630cd9763762fec74b46639d7faed460c2c4cc07e278453c637376e78aa50eafdf137a6143f7ded355358ffb292fd60
diff --git a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
new file mode 100644
index 000000000000..be09401f2e96
--- /dev/null
+++ b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
+HOMEPAGE="http://strophe.im/libstrophe/"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz"
+LICENSE="|| ( MIT GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc expat libressl"
+
+RDEPEND="
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+	# shellcheck disable=SC2207
+	local myeconf=(
+		--enable-tls
+		$(use_with !expat libxml2)
+	)
+	econf "${myeconf[@]}"
+}
+src_compile() {
+	default
+	if use doc; then
+		doxygen || die
+		HTML_DOCS=( docs/html/* )
+	fi
+}
+
+src_install() {
+	default
+	use doc && dodoc -r examples
+	find "${D}" -name '*.la' -o -name '*.a' -delete || die
+}
diff --git a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild b/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
index f95cbfb67f5e..e370927cb139 100644
--- a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,5 +42,5 @@ src_compile() {
 src_install() {
 	default
 	use doc && dodoc -r examples
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -o -name '*.a' -delete || die
 }
diff --git a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
index 5323315dc71e..be09401f2e96 100644
--- a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,5 +41,5 @@ src_compile() {
 src_install() {
 	default
 	use doc && dodoc -r examples
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -o -name '*.a' -delete || die
 }