7 files changed, 15 insertions, 108 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d33cbbfe120b..4c07f3c01c84 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 9a78c23bf8e8..4622c4ab00ef 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,7 +1,4 @@
-DIST libstrophe-0.12.0.tar.xz 397120 BLAKE2B 6ac32e317e14a8641b1d092026772264682b7b0980158757a82036f3db2643a6429e5553d9173b578111d5b8b503e9a98a4e140f98f8ac03866758624a1cec67 SHA512 dd0fc54840bb5626859f91c7bbe5204ea89332856392a5a33c50cf7f66c8aaa7b0d7c24bd737e8473d63f2c9d7683a75dcb9465a19634d14e54c9f8f20580884
-DIST libstrophe-0.12.1.tar.xz 398492 BLAKE2B 9f0e06952603d51a0697366a83d6fa80af09161858d87bee8cfd95786944a58ad1551155b8b7a982646f775a695432822f33b36c6e52161db145dca98050689e SHA512 54e255f756a6705dc554ce75dd6b4ea889822774ca38042548480ea026a7f4d411b4ba30f3aaf88776a0d8437f51eb07fb3675ddbfb0afd661d5f965b280dd52
 DIST libstrophe-0.12.2.tar.xz 400092 BLAKE2B 28b655e4bf3a279f837fd26e7c7ba34cd32053ad16be660c04d1c07b5335d805e9745cd24af584ed62f8ae44caebd8bda48473872163c122ecbcd57f042fc3db SHA512 1026f57b107a0ff8f088a5c7f1d88b3b5a35d0e6bfefb4f6eb56de37fe9fd2f554f547663a41353b7c6b01a2aa47f6cab4a9f7a7c87ba8c0c7708d7b2b4c2086
-EBUILD libstrophe-0.12.0.ebuild 1098 BLAKE2B 26ddb67d356153b17703001dde23cb867421a8d0aece702c614c3109a2e0ad67b56faf83d5cb81c2d44964d077a79319a365915aa9aae967914bdba0b906d91c SHA512 7870002f1358c72bf8404f897398eced26ae070a496bd341d3b9185d377d375f254a49df5009b8f35d27880f11f761d6abd4c0fa1bdf61b33cc87faa8e9802b3
-EBUILD libstrophe-0.12.1.ebuild 1077 BLAKE2B 2101b4722ecb56a4b44c996ea117101ac2bb5210b5e9c2985f5e4313786529167e6d18f08af512970548c0f5abdb06f023a8ed9d0f57f4f412fe5c4a01138648 SHA512 d393ebdac2d807007ae611cc00f459409cec134f1b870b5c2de06d7302eb8f5ac2f85b4ecee9e4d34631c4ffa0ab256782a91b3af099d29963280b8854d4d6ee
-EBUILD libstrophe-0.12.2.ebuild 1077 BLAKE2B 2101b4722ecb56a4b44c996ea117101ac2bb5210b5e9c2985f5e4313786529167e6d18f08af512970548c0f5abdb06f023a8ed9d0f57f4f412fe5c4a01138648 SHA512 d393ebdac2d807007ae611cc00f459409cec134f1b870b5c2de06d7302eb8f5ac2f85b4ecee9e4d34631c4ffa0ab256782a91b3af099d29963280b8854d4d6ee
+DIST libstrophe-fix-configure-bashisms.patch 1274 BLAKE2B d9308e2687eab255f94ac2b0e030f4d0424e56c3d129f544eb75fb25addf57485de0e210afe12bad29d3b92db6bf4e7400c4152707f6316921a1f2d4aa1b9367 SHA512 a2fdea484ba4e5bce4982ae5d5699df6bf2169027e7f62865baa7a7049a264d16a9dcda05826bbd942a1cc256e8559c6dfb6883913edf7f4711f5ce2601b83c5
+EBUILD libstrophe-0.12.2.ebuild 1393 BLAKE2B 4172bfc99fce467e1bb3a4296d2b713ee323d9331de41006492456b8831ffb78951b342f2025d34ae203c5f015a19847796ccdc61960ebb5a3f34299f55b1fd0 SHA512 308ab3faf01452dcb2a47ecd6f2a360502b1301c0c15a258d5904cac8e1d84eb900625a4b03a39d87852bf42962076fe3a2d8a7d7aaac8a96adaf6f115a9b78d
 MISC metadata.xml 711 BLAKE2B 0fc95d72ff0d9dbf1765e8b2ddf7182d6543cecdd275798e79ad8bdf8bc494234f6fcd8acc76c6d3e87f6f4159d4b0ea0e70706932628173b1b75bed6c788701 SHA512 d8eb8fcbadee45ff2d411d766e3fba2afb18b2516eb4172ff2b072ef9b5469d7a92c32a4b70e989fd0b56eeaaad39d5f187748f7aedc6dca32493b1f2d0ca817
diff --git a/dev-libs/libstrophe/libstrophe-0.12.0.ebuild b/dev-libs/libstrophe/libstrophe-0.12.0.ebuild
deleted file mode 100644
index e883a03f6c63..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.12.0.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 )"
-# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
-SLOT="0/0.1"
-KEYWORDS="amd64"
-IUSE="doc expat gnutls"
-
-RDEPEND="
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2:2 )
-	gnutls? ( net-libs/gnutls:0= )
-	!gnutls? ( dev-libs/openssl:0= )
-	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)
-		$(use_with gnutls)
-	)
-	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
-}
diff --git a/dev-libs/libstrophe/libstrophe-0.12.1.ebuild b/dev-libs/libstrophe/libstrophe-0.12.1.ebuild
deleted file mode 100644
index a491acaf81f5..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.12.1.ebuild
+++ /dev/null
@@ -1,49 +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 )"
-# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
-SLOT="0/0.1"
-KEYWORDS="amd64"
-IUSE="doc expat gnutls"
-
-RDEPEND="
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2:2 )
-	gnutls? ( net-libs/gnutls:0= )
-	!gnutls? ( 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)
-		$(use_with gnutls)
-	)
-	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
-}
diff --git a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
index a491acaf81f5..920bc564ac78 100644
--- a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
@@ -3,8 +3,12 @@
 
 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"
+HOMEPAGE="https://strophe.im/libstrophe/"
+# 2nd SRC is a backport of the /bin/sh -> dash fix, #877049, #879533
+SRC_URI="
+	https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz
+	https://github.com/strophe/libstrophe/commit/7352bd5cdbacf98771fdc0d32a606c4b6718077c.patch -> ${PN}-fix-configure-bashisms.patch
+"
 LICENSE="|| ( MIT GPL-3 )"
 # Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
 SLOT="0/0.1"
@@ -25,6 +29,11 @@ BDEPEND="
 
 DOCS=( ChangeLog )
 
+PATCHES=(
+	# https://github.com/strophe/libstrophe/pull/218
+	"${DISTDIR}/${PN}-fix-configure-bashisms.patch"
+)
+
 src_configure() {
 	# shellcheck disable=SC2207
 	local myeconf=(
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index dea78596068a..75bb10bbdc87 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -12,7 +12,7 @@ DIST protobuf-3.19.6.tar.gz 5299501 BLAKE2B 3121f76b95f83c5309ce49ce296b738eff7b
 DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0
 DIST protobuf-3.20.3.tar.gz 5374320 BLAKE2B fb51f2a0ecf5b83235f5252051f8192ae377bb7a5e030c3f3e9435ccde25919c059830cf476e840fa6c970928a32c0075e213c9d5d4d9e3d3b24732c39a9fbfa SHA512 01d6703bdbe769a1200ee6e4ebcdcb99688ec21f576988c60d82ec36e0822820fb245fcb4ca53293143d53e666d748b5a0c6937bc659fb3cdc4cd9b05ed12a1c
 EBUILD protobuf-21.8.ebuild 4124 BLAKE2B ae66579a111e158ecb2d37f8190943c33e3f29eeb2a1806915423d88229b9f388b10a0d4baf055948344c89bfb16a7bc62f37d9acf96841d1372a18d2e95d994 SHA512 e70c0f5aecce8d0220d3a1d538c23ecbeef78539dc36f8f7f4e5a74e55b1e221a3366ed2ecad8cb300ed56a0bcf849c8eb9a5d85e386d6c1fc2e12a6db482c7f
-EBUILD protobuf-21.9.ebuild 4122 BLAKE2B b35bfac3914677ee42232896bd515d4135d8dd41f6c8659725a25b474317aa898d2fc2f3d7b49e1bc68f5945f51cbfc55349a9cdb96f0f82ada653c2fa425940 SHA512 fe4a08d39aeef4c4dfbeae97d7a3b0c3ce92a039a2c97b50f275ca0a8f16bbc87c9329db49f26965d39d635f2033bbf2998c4970d17df6c0fbdd6df403a374ab
+EBUILD protobuf-21.9.ebuild 4121 BLAKE2B b4e80da8219abc2292dc06ff28684b4d80bf5a854d0c6898d1347e394861376372b18c5d76bea1b208220c15095e2dd7267474f61568015e8e2ad13513645dfd SHA512 1bdbad32dc3d46d7c240e8722689a872a9ec2281e406cac0dacef976dbae2206d690dc05ef3b280bcb4ac45254d2f9a2223d9087ceed0e544dc5e4db8360d183
 EBUILD protobuf-3.19.3.ebuild 4138 BLAKE2B b37b99abbd41acfb2299e1a054d3c36547bdd63542ecc76d03d69344d7e89a03870eda97bba1ae6ae3284c33abdfca6930e74b6ab7109d93cd588c522d6d52f6 SHA512 2eadab6fd0f4b30338a294b69c866ff945e98f05549403484700b2e44314433736a682ab033bc4c2eb0a802934cba92567e6c9bad4d30d79a67d671f88e04591
 EBUILD protobuf-3.19.6.ebuild 4331 BLAKE2B 0672fb5ecbd4080811f6c51f18accbaa1665d2e63ba5e9d6d422531638ac17ac475ff094cb59313c8c6ea0bf232b071b875091e15e033284e9f74f35fcaf194d SHA512 7ac1389f1895200c9c6d5067b03bbd95ee428ce6cbcee334eb23ec81102b9e0c24b548b755e5c26c5afbf72603e92600ab8118504f8e9127b288d33cc0b308fe
 EBUILD protobuf-3.20.1-r1.ebuild 3930 BLAKE2B 3ac2d80c6391f9147445a23fa39576ed5158bfde601f4a38f80784c9a29523c0749ec8572bd1910412bbae402237539f5ba3fa4fe5a16b188d9fbceb0babc3dc SHA512 3dfff6e4a92afb0707398ab58f00051269cbb8c70ac73ef1bfe532baa0ae59ea47fec2131f797f7fe4750929b966c2878676c235339762d8c447cdfd4bfa1c47
diff --git a/dev-libs/protobuf/protobuf-21.9.ebuild b/dev-libs/protobuf/protobuf-21.9.ebuild
index 748fff0f4b97..f1957a711595 100644
--- a/dev-libs/protobuf/protobuf-21.9.ebuild
+++ b/dev-libs/protobuf/protobuf-21.9.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"