gentoo auto-resync : 16:01:2025 - 06:41:40

6 files changed, 5 insertions, 272 deletions

diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index d0213fd11328..bff4250f8aac 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,11 +1,3 @@
-AUX libstrophe-0.12.3-allow-tests-when-static.patch 1581 BLAKE2B 64b11197dab020f6a853caf33371084647aa28fe775912924e64caf87f3f1469396b8e8bca12eb929fa5c549e7a7dd578a28bc1ef8d9f5176a7ffba7eb78b737 SHA512 d1b63e850206b5757261a0cbd53ff8b7400d660cbea054d6d69b1ce47918bf9d4dc356e5a53a6eb917a7a45322a80dfadc69099f13002d3b22f6adcc09946156
-DIST libstrophe-0.12.2.tar.xz 400092 BLAKE2B 28b655e4bf3a279f837fd26e7c7ba34cd32053ad16be660c04d1c07b5335d805e9745cd24af584ed62f8ae44caebd8bda48473872163c122ecbcd57f042fc3db SHA512 1026f57b107a0ff8f088a5c7f1d88b3b5a35d0e6bfefb4f6eb56de37fe9fd2f554f547663a41353b7c6b01a2aa47f6cab4a9f7a7c87ba8c0c7708d7b2b4c2086
-DIST libstrophe-0.12.3.tar.xz 399056 BLAKE2B 9e7e344d46c78393ee2386a842895e29c417eeffbf41bd2e1c775f16bd40cb2387b59e56955a5331242af74932f61abb8afec2bda49c97063689b976b4892a52 SHA512 fa0fcb91c47197391f3b7f186b49ca4921f1937e2d1c9d25afdb73ee766bbeae5efbdeddde9cb6361eb58997c2fb136e2c1ed73a62f8c5618805a9555c473e0b
-DIST libstrophe-0.13.0.tar.xz 405368 BLAKE2B 8fb29b5f396a75620df6948b1ef109f846832f7781a527221d6781b350b522ac314cd5d44558757787659476481f66d4dcaa9ccea68dfa56fd907578eb74f78a SHA512 b7c3c728af986a6a3a7b9efcdc107f96f857ee3397cc5c2569fa033be47960cc0045a2d6c1b20524b1e1483d0d7234a3987490c0e0ebfea1371013d28de60384
 DIST libstrophe-0.13.1.tar.xz 405676 BLAKE2B b5ee084899c01d600c23e8d54e600bf72c2a92147e739d3b286c034ea3badf5e924b11a08c8c84f1453e88df40d494549286897ac3e90fb9af18b29da9754e07 SHA512 e150567db75ce615d7946471d15f968f8825ae75aa349a3c3be4e960eaea0b4960ac4c2da9aec40e984678361d89db3055062aa523ef485e9ea58a761bbcceed
-DIST libstrophe-fix-configure-bashisms.patch 1274 BLAKE2B d9308e2687eab255f94ac2b0e030f4d0424e56c3d129f544eb75fb25addf57485de0e210afe12bad29d3b92db6bf4e7400c4152707f6316921a1f2d4aa1b9367 SHA512 a2fdea484ba4e5bce4982ae5d5699df6bf2169027e7f62865baa7a7049a264d16a9dcda05826bbd942a1cc256e8559c6dfb6883913edf7f4711f5ce2601b83c5
-EBUILD libstrophe-0.12.2.ebuild 1517 BLAKE2B 3e564de5c6a2f0844cdc0d187f1d19cbdf07388c47a03d8667a99bafa3d98ae4bbe0fde1da616cd8a8899e61319a593db5c660fe42bb278b3af10c1ee3016e58 SHA512 85a83364483812155a30159006034aeec8f8467596ca07bee80793e74ec14b7754cf0d951ff58a7595aa42bf8de67307dcae66010a912f4f567e45fbc619907f
-EBUILD libstrophe-0.12.3.ebuild 1274 BLAKE2B 628aee471a1cda01f4e4c25952314f9edd448a6eb3bd704ff681c1dc2f7c1069830b3ae43bbfa76640a407d10b1d3a4cbe12f5a74e61971d90ae059353436bb5 SHA512 9c8622feed00cab264c55b4eff01df0647f28da8171b94e85ad93f6f79cf92b89baf60c658b60d5c161c7094e91c4b64ac48d0fc688b841da38a86299c1e4dc5
-EBUILD libstrophe-0.13.0.ebuild 1204 BLAKE2B 07bb05027b1038a918a48884edd06828568798a276d2b676de68d1c828689d7b68bc207b678bb9098393822f1524094b9fb07b26736f537d9ffca740b0222d68 SHA512 405412641bd71432040bead433200f319e7adc94be5b69e9039cb98b16659c1b0052dce912a1a1be312605fc1fa23a15185b27147ea59ecc03750043813552b3
-EBUILD libstrophe-0.13.1.ebuild 1203 BLAKE2B bd861fbd2743c81726866383e608cf3dd935699e1b03a0139b6f976362e06ca07ab8634840ac9767f47479084c8d9df02ca722c4db830371fcdb78c0a425783a SHA512 7c9df260694c8b77d28de2b27865d81009ad39e278cb500228eacf755ee6d646b9deef8b8fa2128506355bf0d5a103bb20da1d5d5824dd75c57954585ffb2f68
+EBUILD libstrophe-0.13.1.ebuild 1125 BLAKE2B dc1f627c81c7eef0c6d1e79dfd9608363e640c4535b63127e00e45bdb349ccfd99d06cbf38bf1320557cc13b8ba123ff69c9579117058d82e332f3188c3a83e3 SHA512 6a807501c98d55067833c0b33c83d849010834a222333f88ffdf97c137199b2413b55a10d2497e9c92dec18de8716159fbf0c8386b0da4119a3a0f72c02407b3
 MISC metadata.xml 711 BLAKE2B 0fc95d72ff0d9dbf1765e8b2ddf7182d6543cecdd275798e79ad8bdf8bc494234f6fcd8acc76c6d3e87f6f4159d4b0ea0e70706932628173b1b75bed6c788701 SHA512 d8eb8fcbadee45ff2d411d766e3fba2afb18b2516eb4172ff2b072ef9b5469d7a92c32a4b70e989fd0b56eeaaad39d5f187748f7aedc6dca32493b1f2d0ca817
diff --git a/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch b/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch
deleted file mode 100644
index b351bb0137c7..000000000000
--- a/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9eba8e873847b6ed6e4aa8e9e887d45c2351f6ed Mon Sep 17 00:00:00 2001
-From: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
-Date: Wed, 9 Aug 2023 13:34:18 +0200
-Subject: [PATCH] Allow running tests when static library is disabled
-
-We then only run a subset of the tests, but still better than failing to
-build.
-
-Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -175,23 +175,29 @@ endif
- 
- 
- ## Tests
--TESTS = \
-+STATIC_TESTS = \
- 	tests/check_parser \
-+	tests/test_hash \
-+	tests/test_jid \
-+	tests/test_ctx \
-+	tests/test_send_queue \
-+	tests/test_string \
-+	tests/test_resolver
-+
-+TESTS = \
- 	tests/test_sha1 \
- 	tests/test_sha256 \
- 	tests/test_sha512 \
- 	tests/test_md5 \
- 	tests/test_rand \
- 	tests/test_scram \
--	tests/test_ctx \
- 	tests/test_base64 \
--	tests/test_hash \
--	tests/test_jid \
--	tests/test_send_queue \
- 	tests/test_snprintf \
--	tests/test_string \
--	tests/test_stanza \
--	tests/test_resolver
-+	tests/test_stanza
-+
-+if !DISABLE_STATIC
-+TESTS += $(STATIC_TESTS)
-+endif
- 
- if !DISABLE_TLS
- TESTS += tests/test_xmppaddr
---- a/configure.ac
-+++ b/configure.ac
-@@ -256,6 +256,7 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
- 
- AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2])
- AM_CONDITIONAL([DISABLE_TLS], [test x$enable_tls = xno])
-+AM_CONDITIONAL([DISABLE_STATIC], [test x$enable_static = xno])
- AM_CONDITIONAL([NEED_SNPRINTF], [test x$have_snprintf = xno])
- AM_CONDITIONAL([TLS_WITH_GNUTLS], [test x$with_gnutls = xyes])
- AM_CONDITIONAL([TLS_WITH_SCHANNEL], [test x$with_schannel = xyes])
diff --git a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
deleted file mode 100644
index 304dae8e12ed..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
-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"
-KEYWORDS="amd64 ~arm64"
-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-text/doxygen )
-"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
-	# https://github.com/strophe/libstrophe/pull/218
-	"${DISTDIR}/${PN}-fix-configure-bashisms.patch"
-)
-
-src_prepare() {
-	default
-
-	# Needed for bashisms patch which touches configure
-	eautoreconf
-}
-
-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.3.ebuild b/dev-libs/libstrophe/libstrophe-0.12.3.ebuild
deleted file mode 100644
index f195859a711c..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.12.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
-HOMEPAGE="https://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 ~arm64"
-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-text/doxygen )
-"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.12.3-allow-tests-when-static.patch"
-)
-
-src_prepare() {
-	default
-
-	# tests patch touches Makefile.am, need to regenerate to avoid maintainer mode
-	eautoreconf
-}
-
-src_configure() {
-	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.13.0.ebuild b/dev-libs/libstrophe/libstrophe-0.13.0.ebuild
deleted file mode 100644
index c1a86333b67e..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.13.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
-HOMEPAGE="https://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 ~arm64"
-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-text/doxygen )
-"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	default
-
-	# tests patch touches Makefile.am, need to regenerate to avoid maintainer mode
-	eautoreconf
-}
-
-src_configure() {
-	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.13.1.ebuild b/dev-libs/libstrophe/libstrophe-0.13.1.ebuild
index 23a0f02893f7..9de62974e612 100644
--- a/dev-libs/libstrophe/libstrophe-0.13.1.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools
+inherit flag-o-matic
 
 DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
 HOMEPAGE="https://strophe.im/libstrophe/"
@@ -30,14 +30,9 @@ BDEPEND="
 
 DOCS=( ChangeLog )
 
-src_prepare() {
-	default
-
-	# tests patch touches Makefile.am, need to regenerate to avoid maintainer mode
-	eautoreconf
-}
-
 src_configure() {
+	# bug #944913
+	append-cflags -std=gnu17
 	local myeconf=(
 		--enable-tls
 		$(use_with !expat libxml2)