gentoo auto-resync : 11:05:2024 - 00:01:22

3 files changed, 25 insertions, 46 deletions

diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 28755c0bd736..7e36a280e6c8 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -5,13 +5,14 @@ AUX xmlsec-1.3.3-slibtool.patch 1701 BLAKE2B 5743f768e6863b39019de22d4463a776176
 AUX xmlsec-1.3.3-typo-fix.patch 927 BLAKE2B c2977900f849b96fe517d73c18f9cc4f5cb99fd2e4d5a8a985622602eaa0bf9f3dca11c7909324499b3ef5a77967ededb9e20ada84fb0d7cad25384a9da51828 SHA512 b2db0e08ffd3aebefd260d60559932eda3d9d14b9498bdb8aca7a2f14c0c2b1fa29124818e2a24b35095daa63b1422db59dcf31ed599fc57e5569926aac1bfc4
 DIST xmlsec1-1.2.37.tar.gz 2009175 BLAKE2B 19f43ba6bf6eb49428b9c5563baecbab21476f326cceee13785ae16769afa258f100732831c0f3f7d160543bd075cdcfdc5cbf11b7406637ee6c2f0e27c07f30 SHA512 99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900
 DIST xmlsec1-1.2.38.tar.gz 2036578 BLAKE2B 03f7e1b5e659793bf1984c5a59582d9459089ce913620d5cc1e5a5d0eb65557580cd23fa190db277298fd7cc55bd41563b93cf61a37c8b7521a4690cd2ca3489 SHA512 724089777caae95db27e67f24381c066eaae23a9d64819a18bb04837c1ab1b380d19be2c7ee25659ca481d9eab96fcbe8027a430a0ac1630ad3b073cddd20fac
+DIST xmlsec1-1.2.39.tar.gz 2036905 BLAKE2B c1844f2068f6afe8dff3bf3fcf45a7180f09cae3418812b49b5c86b5387c795900a9ebd2077691d51d778c081f4282a54fdc11e7a54e6b8d969ef2871c2f5bb8 SHA512 bc8457bca8ada87c12d3be685bf8ad805f102b4ac1265e257ba12137e0430783973f27d22bfcb7559be5e89cb4c01b3556488fa641fc7c9d8f403972fdc8f2f7
 DIST xmlsec1-1.3.1.tar.gz 2432943 BLAKE2B 1dafdffd959579add5c579e3fa9c9f9ddc73ce4aadc6fc2139506e6e64ffcd1bbe7298786e414900eb9f33f93b0a47da64e686c499e48d4c80d81b256db6692e SHA512 7f30c15c3edcafe70fa5febaa0ba39f73f8d30525ee102b5961a658dd2842fbc58e63f7595f15b150d71bf735bfa7688c3694a191b0d475776ca26902d90d25f
-DIST xmlsec1-1.3.2.tar.gz 2437263 BLAKE2B d11953c6e2a263a6742ef62309c2f29e2ba5761d58bee5f8cc761965d0e16fea148811ac3d8036d271400840a62ff2a7fff947bb5331170d3bcc598c558b2a95 SHA512 328f3d27cc1dadee27e5ee4649f6c5a094203cc27f42f1fe98fd429f7dd5630eaadff0e8bf14616016fc3530482ed8bcee4870289a41a083f6dd9bd603782a92
 DIST xmlsec1-1.3.3.tar.gz 2435741 BLAKE2B 1b0e44a8a5185d67b8f97ec72cd8e215fe79a988eb7ade0d2890be662b693d511857b24670ec692f9452bf95ad8c53ff80c250ecbcd167742477a83e0b72fda0 SHA512 1535b6f878259914ab9574892d05c927fbcd548986cf7bcf91e435acb2cb74eb11e58163f797038ee13a11444882814b2b4318cd677053fbe52557a2e4acf68a
+DIST xmlsec1-1.3.4.tar.gz 2435656 BLAKE2B b398f970e5b201971419b537125e9a7430c8d7c1c57e193b2592ee3f01ce797993607a210e87ad44e99bc0ef49ac4c350492268a3ac3bedbb81d937d99837468 SHA512 959a97ed7d7cbdc3e5ef037b2cb4f05bda299274c09ed3dfe24f7203d97e3dfc13bf480e15a2d15bcc7893569d341204884de58cc9b462b6c29306b67672e9c7
 EBUILD xmlsec-1.2.37.ebuild 1463 BLAKE2B d7cd33b3533395b59f4971deae688336fc4b8f52b5e948d7064cb19d7bbd043c7c8d3b48f5b499e51ebc529982b34b1d12a148fd35cfa700270334d7fa555124 SHA512 e92545fd5b5bb5977757cf18c8726a9335403cdc83d2367337e95ed305871cc6279568c1abce800738eefb60a7b84e4f508536c44a5a6426d6268950db223437
 EBUILD xmlsec-1.2.38.ebuild 1548 BLAKE2B ced553e3a63148facdefbccd9a244fbc5c3342081648557a874a8c7760d330bf7a8e984a47a3b1667c017da18df20e1742abddeb2f9c4466b2873516ad6de401 SHA512 1698b2e89e4b7dc7b10395f011dc00a0b28397338b2fe058e48fba799f145a472a15050321507ae698931fd7674d8379a63d7e50fd8903a48a9e1fef69e266bb
+EBUILD xmlsec-1.2.39.ebuild 1548 BLAKE2B 60df66b3e901d1422e6e7fb9edb40367b297635c576086e631a2ba866e4a45266940f7e3e8b0ae6fa7f7f26c7e245cd2eaf60ed6f5f2cde205b567b6b003a131 SHA512 2abd604284d2d43bf1245a7ec87a8c574db8e5f5062be966802ee6d6c8559bdae1fefa129d06a39116d068342d34f669732b6f101987648f5e4ab78be5f1a3ae
 EBUILD xmlsec-1.3.1.ebuild 1841 BLAKE2B a17f66590d0baeb5aef4720bfe471dcd75029dfad7351c8da72189ead891d935d483c9afaff56aa8033d564153607a83c5021345c35626d6531cf52d71614e13 SHA512 94aa75a798e39439cf1ec8855b558fb401177334722f1d1be6f9d5697cf0ee022406b766b2ce4cf3ca1d15137567b42fb066001e8903afbf13fcd20af63960f2
-EBUILD xmlsec-1.3.2.ebuild 1893 BLAKE2B 4019fc33a7723d0a2f613987d0e7791cee4583af315a6cbcf29c443e2f36f948db21d71b8abe26d2446c40ede58469b08899cb40bd525a229a3a28c3459e3b7b SHA512 182096086837b06fc573a04400084002ce22ae7acf5293b2c4e7b25b5c9195e4bf420aa45c163f9bcba90cee32b1642fa8f226c263eebf14f8d9d8da7fcf0b6a
 EBUILD xmlsec-1.3.3-r1.ebuild 1927 BLAKE2B e129e6dc436a88e1e834b5df5287c92c76a6484befd803835bfa6ccd51a1a35d4b12b31e864452881335c9060be18bc5187bc1b1b1d024bb599e76e95b8f9541 SHA512 06747ca8c74531aadf39edca8b82c9d1d59237da36a20740099c5260c78bfdc4fe60080b9f0aa9427d1695967b5dc49f17fb74c828d279cacaa8605dbd0d4782
-EBUILD xmlsec-1.3.3.ebuild 1847 BLAKE2B 68b191e403e720c06201e9ca5b16f77cf370a2682ee6dbc6c46d8b639850a5ba8f9dea4c73f70fdb0d4f89b6baef7572d9c418a37c007fe07252267595d6cd58 SHA512 41584b573692b82bff86b64e44bd3d3b6bd72f12739d8711660f790641f9860acf52323fddc50a1fcf823b2ad1bc2c8f3e75c39d9176049a799862e5b4a81a5e
+EBUILD xmlsec-1.3.4.ebuild 1847 BLAKE2B 68b191e403e720c06201e9ca5b16f77cf370a2682ee6dbc6c46d8b639850a5ba8f9dea4c73f70fdb0d4f89b6baef7572d9c418a37c007fe07252267595d6cd58 SHA512 41584b573692b82bff86b64e44bd3d3b6bd72f12739d8711660f790641f9860acf52323fddc50a1fcf823b2ad1bc2c8f3e75c39d9176049a799862e5b4a81a5e
 MISC metadata.xml 558 BLAKE2B e4517ffa3f034420139ee0fbb8ed51a3cb319b1400e52d6a1d2d3b5363aa64831fd9cc93f49ab25d36a5fcae63115d0ffd152540f176c25dc49f77fbf4dd6c9d SHA512 6aab5452478ba1f71018274b75761c3467868f271b3cf256d05645407fa9c3cc64823384094c8e9024f936dfdaea5be2b8e91573e9addb07c5dab5f142c6a70d
diff --git a/dev-libs/xmlsec/xmlsec-1.3.2.ebuild b/dev-libs/xmlsec/xmlsec-1.2.39.ebuild
index a64cafb9198d..5fcdd6b380de 100644
--- a/dev-libs/xmlsec/xmlsec-1.3.2.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.39.ebuild
@@ -3,34 +3,34 @@
 
 EAPI=8
 
-inherit autotools
-
 DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
 HOMEPAGE="https://www.aleksey.com/xmlsec"
 SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="MIT"
-# Upstream consider major version bumps to be changes in either X or Y in X.Y.Z
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
-IUSE="doc gcrypt gnutls http nss +openssl static-libs test"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc gcrypt gnutls nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
-	|| ( gnutls nss openssl )
+	|| ( gcrypt gnutls nss openssl )
+	gnutls? ( gcrypt )
 "
 
 RDEPEND="
-	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxml2-2.7.4[ftp(+)]
 	>=dev-libs/libxslt-1.0.20
 	dev-libs/libltdl
 	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:= )
-	gnutls? ( >=net-libs/gnutls-3.6.13:= )
+	gnutls? ( >=net-libs/gnutls-2.8.0:= )
 	nss? (
 		>=dev-libs/nspr-4.4.1
 		>=dev-libs/nss-3.9
 	)
-	openssl? ( dev-libs/openssl:= )
+	openssl? (
+		dev-libs/openssl:=
+	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -43,43 +43,21 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-optimisation.patch
-	"${FILESDIR}"/${P}-libxml2-2.12.0-includes.patch
+	"${FILESDIR}"/${PN}-1.2.37-libressl.patch # bug #903001
 )
 
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
 src_configure() {
-	local myeconfargs=(
-		$(use_enable doc docs)
-		$(use_enable static-libs static)
-		$(use_with gcrypt)
-		$(use_with gnutls)
-		$(use_with nss nspr)
-		$(use_with nss)
-		$(use_with openssl)
-
-		--disable-werror
-		--enable-mans
-		--enable-pkgconfig
-
-		--enable-concatkdf
-		--enable-pbkdf2
-		--enable-ec
-		--enable-dh
-		--enable-sha3
-
-		--enable-files
-		$(use_enable http)
-		--disable-ftp
-	)
-
 	# Bash because of bug #721128
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		$(use_enable doc docs) \
+		$(use_enable static-libs static) \
+		$(use_with gcrypt) \
+		$(use_with gnutls) \
+		$(use_with nss nspr) \
+		$(use_with nss) \
+		$(use_with openssl) \
+		--enable-mans \
+		--enable-pkgconfig
 }
 
 src_test() {
diff --git a/dev-libs/xmlsec/xmlsec-1.3.3.ebuild b/dev-libs/xmlsec/xmlsec-1.3.4.ebuild
index f0324bc08612..f0324bc08612 100644
--- a/dev-libs/xmlsec/xmlsec-1.3.3.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.3.4.ebuild