gentoo resync : 12.05.2022

7 files changed, 19 insertions, 164 deletions

diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index a939b4911b1b..ab50ab81d9ef 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,11 +1,5 @@
 DIST libstrophe-0.10.0.tar.xz 357896 BLAKE2B b457c1556b7bd8012fd0b0badb962c0002ca38884e246911b25c8e01fa785a08c316a18c84e8f9e124ebeed636c586097a2dacf56c7c94062ac262e44f9473d0 SHA512 cffd71f3c83f53a4f0681916249842cc17e11fc28afa940e29a786ee02c5294a11115c115b12d200e185a62520623c68e1d4514ab374423e13e26b9438d80ea8
-DIST libstrophe-0.10.1.tar.xz 357960 BLAKE2B 5fe0652073736620394d09d3095877cdddc8e0b4d7ec07ce323714e3604280166c8ad0a3953d804fb592dbb0885afb476ee185f68e12468dde4d74e35b23220e SHA512 a81398065988ac5468f4e0bc1ce1a864f3ce97d0696de8170185113eecbd582dbf30c9ae4dbbcc9ac472c5b62b8e9530f7bc88ef2a582640279f2f777d6bc833
 DIST libstrophe-0.11.0.tar.xz 370740 BLAKE2B 19f240383e81ea2733505b8361ba061ba69b09227eddfb958aa3027d7c3aca2f1739977e003b980ecf5501fde5ffa2bdb0a0618aff70637b11f94dbd70fce3a4 SHA512 3fd3fc395d1c86787cccf9dfb54805a56d650687db17ee28107f4fd610aa250c40cd6052d5c8c48110d69a8bceddb913570efca24874733d3e9a016dd90df65c
-DIST libstrophe-0.9.2.tar.xz 343820 BLAKE2B 0c2ead2b70d0e171dcdd475d05413d2b85142f3916b3cb1610a929cdc1bed8c86b587e7a0103d80c2ea9d3ebced7d39e23537a3ce913c309c70961f2d9703fd2 SHA512 bc4e63cec45007e44e1d3732a41d71973a4410bd697ddfececeb761b6e4665e563813a27e6b8550b6ab55db31b872772bf4b94a652579e63356948f9300a211d
-DIST libstrophe-0.9.3.tar.xz 345232 BLAKE2B 045f2f60b92b4a5435cdd0d1210f39bd507113fae486f67e1ce36511b8cfbb38a63e22f79ffc968242d7c424995d344ce8f636a4b738f3bc3d3582a6d61cba08 SHA512 a1ccaecfa471f3edf7843676e87f0300871cd18a14ceb930276513a2db0c04c2daf76a0f136b2e633770865f3bc43abfb07b8c5e56586d11cf90fce7d80a4ec4
-EBUILD libstrophe-0.10.0.ebuild 1031 BLAKE2B ce23a45158b60eea0eb871d385068ee46a2b98a53c26d8112d68da6a9f671e9c2c46ee1872d4740fba554443919426d10e423801d96a8dc0284ae7e2801d5135 SHA512 6b77e7f6469107bbd0421582aa15ac9e80f9ed9f4a107edc26d3edff4c17675fefdb01306014559f243f5887b8ce58f5d252011c7e13eb0895d18413f7a0b0f3
-EBUILD libstrophe-0.10.1.ebuild 1032 BLAKE2B 918cfcc17ffbdcc00f3d35988d18a58798be04303e7ee0a498dc6ea1b157a0f87b9e66c456159b2a633cb21b71799b7153f75d9ea2abc6b921457248dbac0c29 SHA512 9e9d00deeb89f7558d5fd5f20bcfd101e7ad7334f6337740e638b8f87fbef8cd3f410fa6746914c127b2a7773b234e120e5742449955c4bdc794cce1ec19646f
-EBUILD libstrophe-0.11.0.ebuild 1126 BLAKE2B 293a2cf7750e6d4317f6d4c1829776d6f0dc86dfde5a83b9ecffb202215948107b69ac0fd17d8f6f8d44a9829e50e7d9ed2d8e1cc5e7a46b339897d9a15465ab SHA512 86d44f69dbe511b7518c448471b22b8e82151a13906e368f04e8557cbc1f31046f3cd030cfd1f12b094ff5a12e70e3400e8e87fe9da34910a91fa00f7c7de82d
-EBUILD libstrophe-0.9.2.ebuild 1032 BLAKE2B 918cfcc17ffbdcc00f3d35988d18a58798be04303e7ee0a498dc6ea1b157a0f87b9e66c456159b2a633cb21b71799b7153f75d9ea2abc6b921457248dbac0c29 SHA512 9e9d00deeb89f7558d5fd5f20bcfd101e7ad7334f6337740e638b8f87fbef8cd3f410fa6746914c127b2a7773b234e120e5742449955c4bdc794cce1ec19646f
-EBUILD libstrophe-0.9.3.ebuild 1032 BLAKE2B 918cfcc17ffbdcc00f3d35988d18a58798be04303e7ee0a498dc6ea1b157a0f87b9e66c456159b2a633cb21b71799b7153f75d9ea2abc6b921457248dbac0c29 SHA512 9e9d00deeb89f7558d5fd5f20bcfd101e7ad7334f6337740e638b8f87fbef8cd3f410fa6746914c127b2a7773b234e120e5742449955c4bdc794cce1ec19646f
-MISC metadata.xml 508 BLAKE2B 91087d88baffbbcab4ae6465948eaa9d8e37f1c099b8039f8ef9dc05255d688d893001b3f8912c1157c53aab2264b4d60b8a38082dd5354d5983feaa1d639912 SHA512 9f39bf674714f1a2ac85ef8a2355fc0304eef3364ea0f2d971c0cd96e5cecda87c08b4ed27defbbb45b9742fe79c43c370a893b171fafab26207f008acea0368
+EBUILD libstrophe-0.10.0.ebuild 1075 BLAKE2B 3ba6a3d507a6a998c600ff123f048fdfa79437e61a066dcf230d17e02249de3bd2fc48c3658da22a61e17612935b4234f4454210a2e906deaf3fb1e1b8e37a15 SHA512 096b4f57042534578644aeb8ded64e52a9b5222090769ea3bca1fd2f8640973ef46f3ae2261d1711ed43d1083b60f9f5716dc1300e856bc859013459c0b7ae85
+EBUILD libstrophe-0.11.0.ebuild 1170 BLAKE2B 3da8cf1e5e704aff564ced499db59b235bfafd06d56ba12aa5b7dff674cc36abf4f6d6762738bce0736aa870ad504a89d1fa2dee1123124d0a2fca33a5ff6583 SHA512 30fe9329a8b1ed51446a1d786144e46b5867bc6970c2627ecc85f3b3e6e9ad625f3d317e64fbef21f39eb63e5670f012f81508cb0510e053c0404ba36589a426
+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
index f21e11c5814d..bf0d452cd737 100644
--- a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
@@ -15,7 +15,9 @@ RDEPEND="
 	!expat? ( dev-libs/libxml2:2 )
 	dev-libs/openssl:0=
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
@@ -40,7 +42,7 @@ src_compile() {
 src_install() {
 	default
 	use doc && dodoc -r examples
-	find "${D}" -name '*.la' -o -name '*.a' -delete || die
+	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
diff --git a/dev-libs/libstrophe/libstrophe-0.10.1.ebuild b/dev-libs/libstrophe/libstrophe-0.10.1.ebuild
deleted file mode 100644
index 884905d63baa..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.10.1.ebuild
+++ /dev/null
@@ -1,50 +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}
-	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
-}
-
-# 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.11.0.ebuild
index 89ea2f1a6f63..66203627f86d 100644
--- a/dev-libs/libstrophe/libstrophe-0.11.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.11.0.ebuild
@@ -17,7 +17,9 @@ RDEPEND="
 	!gnutls? ( dev-libs/openssl:0= )
 	dev-libs/openssl:0=
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
@@ -43,7 +45,7 @@ src_compile() {
 src_install() {
 	default
 	use doc && dodoc -r examples
-	find "${D}" -name '*.la' -o -name '*.a' -delete || die
+	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
diff --git a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild b/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
deleted file mode 100644
index 884905d63baa..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
+++ /dev/null
@@ -1,50 +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}
-	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
-}
-
-# 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.9.3.ebuild b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
deleted file mode 100644
index 884905d63baa..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
+++ /dev/null
@@ -1,50 +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}
-	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
-}
-
-# 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/metadata.xml b/dev-libs/libstrophe/metadata.xml
index 73fde1e3319e..b3da340e2c2a 100644
--- a/dev-libs/libstrophe/metadata.xml
+++ b/dev-libs/libstrophe/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>nex+b-g-o@nexadn.de</email>
+		<name>Adrian Schollmeyer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">strophe/libstrophe</remote-id>
 		<bugs-to>https://github.com/strophe/libstrophe/issues</bugs-to>