gentoo resync : 29.12.2022

3 files changed, 5 insertions, 58 deletions

diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index ab50ab81d9ef..59ab6009b2d3 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,5 +1,3 @@
-DIST libstrophe-0.10.0.tar.xz 357896 BLAKE2B b457c1556b7bd8012fd0b0badb962c0002ca38884e246911b25c8e01fa785a08c316a18c84e8f9e124ebeed636c586097a2dacf56c7c94062ac262e44f9473d0 SHA512 cffd71f3c83f53a4f0681916249842cc17e11fc28afa940e29a786ee02c5294a11115c115b12d200e185a62520623c68e1d4514ab374423e13e26b9438d80ea8
-DIST libstrophe-0.11.0.tar.xz 370740 BLAKE2B 19f240383e81ea2733505b8361ba061ba69b09227eddfb958aa3027d7c3aca2f1739977e003b980ecf5501fde5ffa2bdb0a0618aff70637b11f94dbd70fce3a4 SHA512 3fd3fc395d1c86787cccf9dfb54805a56d650687db17ee28107f4fd610aa250c40cd6052d5c8c48110d69a8bceddb913570efca24874733d3e9a016dd90df65c
-EBUILD libstrophe-0.10.0.ebuild 1075 BLAKE2B 3ba6a3d507a6a998c600ff123f048fdfa79437e61a066dcf230d17e02249de3bd2fc48c3658da22a61e17612935b4234f4454210a2e906deaf3fb1e1b8e37a15 SHA512 096b4f57042534578644aeb8ded64e52a9b5222090769ea3bca1fd2f8640973ef46f3ae2261d1711ed43d1083b60f9f5716dc1300e856bc859013459c0b7ae85
-EBUILD libstrophe-0.11.0.ebuild 1170 BLAKE2B 3da8cf1e5e704aff564ced499db59b235bfafd06d56ba12aa5b7dff674cc36abf4f6d6762738bce0736aa870ad504a89d1fa2dee1123124d0a2fca33a5ff6583 SHA512 30fe9329a8b1ed51446a1d786144e46b5867bc6970c2627ecc85f3b3e6e9ad625f3d317e64fbef21f39eb63e5670f012f81508cb0510e053c0404ba36589a426
+DIST libstrophe-0.12.0.tar.xz 397120 BLAKE2B 6ac32e317e14a8641b1d092026772264682b7b0980158757a82036f3db2643a6429e5553d9173b578111d5b8b503e9a98a4e140f98f8ac03866758624a1cec67 SHA512 dd0fc54840bb5626859f91c7bbe5204ea89332856392a5a33c50cf7f66c8aaa7b0d7c24bd737e8473d63f2c9d7683a75dcb9465a19634d14e54c9f8f20580884
+EBUILD libstrophe-0.12.0.ebuild 1251 BLAKE2B 98d7083591a20d015b84e5b27a8f338a8ac0c4e10f2fee56f4da13f84f40c965c69851473abf0b3341f4004254ff4fa2c1c539086ef098d12e364a11e623a4ad SHA512 cbbdcfc9e5fe30ba3374e85460d206c754278552b1bb50eb087d60a3541b0043ff77ef8751828c995afdef804bc339ff71b97ffa0b87314a5138ccb3df074571
 MISC metadata.xml 711 BLAKE2B 0fc95d72ff0d9dbf1765e8b2ddf7182d6543cecdd275798e79ad8bdf8bc494234f6fcd8acc76c6d3e87f6f4159d4b0ea0e70706932628173b1b75bed6c788701 SHA512 d8eb8fcbadee45ff2d411d766e3fba2afb18b2516eb4172ff2b072ef9b5469d7a92c32a4b70e989fd0b56eeaaad39d5f187748f7aedc6dca32493b1f2d0ca817
diff --git a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
deleted file mode 100644
index bf0d452cd737..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 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.xz"
-LICENSE="|| ( MIT GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc expat"
-
-RDEPEND="
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2:2 )
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	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}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
-}
-
-# Explicit src_test is there to document that the test suite is integrated and
-# is expected to pass. Please do not remove.
-src_test() {
-	emake check
-}
diff --git a/dev-libs/libstrophe/libstrophe-0.11.0.ebuild b/dev-libs/libstrophe/libstrophe-0.12.0.ebuild
index 66203627f86d..fb98239a890e 100644
--- a/dev-libs/libstrophe/libstrophe-0.11.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.12.0.ebuild
@@ -6,8 +6,9 @@ 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.xz"
 LICENSE="|| ( MIT GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64"
+# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
+SLOT="0/0.1"
+KEYWORDS="amd64"
 IUSE="doc expat gnutls"
 
 RDEPEND="