summaryrefslogtreecommitdiff
path: root/dev-libs/xmlsec
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-10-06 04:27:04 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-10-06 04:27:04 +0100
commitd6106fb0c1ab8f79024ab6a9ac2062ddc85d4e07 (patch)
treef3a4ad4dcf443e9351fa5dec88afeeec86c9b642 /dev-libs/xmlsec
parentf3f72d0d5f1ae9ee74acaa63ccb7a247468e73bf (diff)
gentoo auto-resync : 06:10:2024 - 04:27:04
Diffstat (limited to 'dev-libs/xmlsec')
-rw-r--r--dev-libs/xmlsec/Manifest15
-rw-r--r--dev-libs/xmlsec/files/xmlsec-1.2.37-libressl.patch40
-rw-r--r--dev-libs/xmlsec/files/xmlsec-1.3.3-slibtool.patch48
-rw-r--r--dev-libs/xmlsec/files/xmlsec-1.3.3-typo-fix.patch25
-rw-r--r--dev-libs/xmlsec/xmlsec-1.2.37.ebuild62
-rw-r--r--dev-libs/xmlsec/xmlsec-1.2.38.ebuild72
-rw-r--r--dev-libs/xmlsec/xmlsec-1.2.39.ebuild72
-rw-r--r--dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild95
-rw-r--r--dev-libs/xmlsec/xmlsec-1.3.5.ebuild (renamed from dev-libs/xmlsec/xmlsec-1.3.1.ebuild)4
9 files changed, 4 insertions, 429 deletions
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 5c689a69f24f..49672d58a5ec 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,17 +1,6 @@
-AUX xmlsec-1.2.37-libressl.patch 1614 BLAKE2B 5b9c2731018d3b371867d30318d55e5f48e4e91359e80abffac212abb35fa274ec35ed9510eb3c01422d8142698669a115f85e9776af8424458de41c66c93b13 SHA512 423997e32223fc45467f9857e709b5707c64aba01ac892253e0be588d767fbfd7c2205a312600910d9cb734b4945e36048292ad59d40de4d43d98af9abe8b1b9
AUX xmlsec-1.3.0-optimisation.patch 583 BLAKE2B 9035391762150ffa82eef10bc1ba1bde08b04e9e968bf850673dae3e27650e85516e1da4dc3385cd7aafde4cab6270a84e5205a149bcb19dbbdca5ffae678ac8 SHA512 fac70c0e0761d1d8016fb597ed4c139628bfab9d3600eeff17c16b9414732076bea65bee5c778481ecf944053319e030dfb4a455c6d51ba3e758007c36f72323
-AUX xmlsec-1.3.3-slibtool.patch 1701 BLAKE2B 5743f768e6863b39019de22d4463a77617623b233b7e8604b71962c8d72153b8dd4014756375730a049f49751b4fa75cae78a81c04d8cdb5ce77ce08d49c0617 SHA512 da6cdabc6615bad7a49bf9f5ed9a281059ba02c6ea1bdc572cf6fbcb936f0dbca3438e955dcbba75b28c305d0fd110e1ccce3b271693b4063673b7a24c76222e
-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.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.3-r1.ebuild 1927 BLAKE2B e129e6dc436a88e1e834b5df5287c92c76a6484befd803835bfa6ccd51a1a35d4b12b31e864452881335c9060be18bc5187bc1b1b1d024bb599e76e95b8f9541 SHA512 06747ca8c74531aadf39edca8b82c9d1d59237da36a20740099c5260c78bfdc4fe60080b9f0aa9427d1695967b5dc49f17fb74c828d279cacaa8605dbd0d4782
+DIST xmlsec1-1.3.5.tar.gz 2451506 BLAKE2B 4a265793a7499c4f6421c6d60552bd2ea18f06e3c28435520188c0a7c36a4de8aa40f20658949b93d826a8f6fb20bd8f2be1a78e6d103ae573e6353a2a5380a7 SHA512 69e9f18e2bc6b1b9acaf475a534a666965a561eec6a5a152185d264a4110d97d233af302153577a414e232a8880c6afc66b563118d889e670204d93819fcfdb5
EBUILD xmlsec-1.3.4.ebuild 1841 BLAKE2B efe8cd0a6364a0f54744ab187a73ba9edc689be9f1ca54fbc4801607509ed0429a705cde6d72043ecff058912abf826bad3f8fc8848e9a0ae5508bf7ff6fcd7f SHA512 a43c353359853cf8240760f351bc55cedfe4450b3dcfad4deb418b60d330893ec9d17f695475d870353d35166b203ebe7b7c59339f711c743a84023f667fe675
+EBUILD xmlsec-1.3.5.ebuild 1847 BLAKE2B 68b191e403e720c06201e9ca5b16f77cf370a2682ee6dbc6c46d8b639850a5ba8f9dea4c73f70fdb0d4f89b6baef7572d9c418a37c007fe07252267595d6cd58 SHA512 41584b573692b82bff86b64e44bd3d3b6bd72f12739d8711660f790641f9860acf52323fddc50a1fcf823b2ad1bc2c8f3e75c39d9176049a799862e5b4a81a5e
MISC metadata.xml 558 BLAKE2B e4517ffa3f034420139ee0fbb8ed51a3cb319b1400e52d6a1d2d3b5363aa64831fd9cc93f49ab25d36a5fcae63115d0ffd152540f176c25dc49f77fbf4dd6c9d SHA512 6aab5452478ba1f71018274b75761c3467868f271b3cf256d05645407fa9c3cc64823384094c8e9024f936dfdaea5be2b8e91573e9addb07c5dab5f142c6a70d
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.37-libressl.patch b/dev-libs/xmlsec/files/xmlsec-1.2.37-libressl.patch
deleted file mode 100644
index acdb535ba552..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.2.37-libressl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/lsh123/xmlsec/pull/456
-https://github.com/lsh123/xmlsec/commit/c5469cfc8443c57a25a8783f0bd669f71e29bb04
-https://github.com/lsh123/xmlsec/pull/654
-https://github.com/lsh123/xmlsec/commit/dfdf981f3522e4059170b504fb6fd40b37c9d70f
-
-From c5469cfc8443c57a25a8783f0bd669f71e29bb04 Mon Sep 17 00:00:00 2001
-From: lsh123 <aleksey@aleksey.com>
-Date: Mon, 12 Dec 2022 10:34:56 -0500
-Subject: [PATCH] fix libressl (#456)
-
----
- src/openssl/openssl_compat.h | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-From d113d1e6355c4841fd03c6aa797d33bde1d064f3 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 29 May 2023 07:46:58 -0700
-Subject: [PATCH] openssl_compat.h: Update LibreSSL UI_null() compat
-
-LibreSSL added UI_null() in 3.7.1.
----
- src/openssl/openssl_compat.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/openssl/openssl_compat.h
-+++ b/src/openssl/openssl_compat.h
-@@ -123,6 +123,13 @@ static inline int xmlSecOpenSSLCompatRand(unsigned char *buf, xmlSecSize size) {
- * LibreSSL 2.7 compatibility (implements most of OpenSSL 1.1 API)
- *
- *****************************************************************************/
-+#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x3070200fL)
-+
-+/* Needed for Engine initialization */
-+#define UI_null() NULL
-+
-+#endif /* defined(LIBRESSL_VERSION_NUMBER) */
-+
- #if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x30500000L) && defined(XMLSEC_OPENSSL_API_110)
- /* EVP_CIPHER_CTX stuff */
- #define EVP_CIPHER_CTX_encrypting(x) ((x)->encrypt)
diff --git a/dev-libs/xmlsec/files/xmlsec-1.3.3-slibtool.patch b/dev-libs/xmlsec/files/xmlsec-1.3.3-slibtool.patch
deleted file mode 100644
index ed4c9e0397b7..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.3.3-slibtool.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/lsh123/xmlsec/pull/756
-https://github.com/lsh123/xmlsec/commit/de5251a8064231fbe6b9bccc669228cab4ab4ec7
-
-From de5251a8064231fbe6b9bccc669228cab4ab4ec7 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Tue, 30 Jan 2024 18:57:19 -0800
-Subject: [PATCH] configure.ac: fix the build with slibtool (#756)
-
-When building with LibreSSL or BoringSSL the build will try to link the
-$OPENSSL_LIBS with -Wl,-Bstatic, but this will fail when using slibtool
-if only dynamic libssl and libcrypto libraries are installed.
-
- ld: cannot find -lssl: No such file or directory
- ld: cannot find -lcrypto: No such file or directory
-
-With GNU libtool it will "helpfully" rearrange the linker output to
-obscure the issue.
-
- -lssl -lcrypto -lxslt -lxml2 ../.libs/libxmlsec1.so -g -O2 -O -Wl,-Bstatic -Wl,-Bdynamic
-
-While with slibtool it will do as instructed and produce a build
-failure.
-
- -Wl,-Bstatic -lssl -lcrypto -Wl,-Bdynamic -lxslt
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ce8a278c..25e70b24 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -806,7 +806,6 @@ if test "z$OPENSSL_FOUND" = "zyes" ; then
- #endif
- ],[
- OPENSSL_VERSION="LibreSSL >= 3.5"
-- OPENSSL_LIBS="-Wl,-Bstatic $OPENSSL_LIBS -Wl,-Bdynamic"
- enable_dh=no
- ],[
- OPENSSL_VERSION=""
-@@ -824,7 +823,6 @@ if test "z$OPENSSL_FOUND" = "zyes" ; then
- #endif
- ],[
- OPENSSL_VERSION="BoringSSL >= 1.1.1"
-- OPENSSL_LIBS="-Wl,-Bstatic $OPENSSL_LIBS -Wl,-Bdynamic"
- enable_ripemd160=no
- enable_dsa=no
- enable_dh=no
diff --git a/dev-libs/xmlsec/files/xmlsec-1.3.3-typo-fix.patch b/dev-libs/xmlsec/files/xmlsec-1.3.3-typo-fix.patch
deleted file mode 100644
index db3eae6c484a..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.3.3-typo-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/lsh123/xmlsec/commit/8262167fbc56bce353949b9b18e01af7f7331e76
-
-From 8262167fbc56bce353949b9b18e01af7f7331e76 Mon Sep 17 00:00:00 2001
-From: Antoine Martin <dev@ayakael.net>
-Date: Sun, 14 Jan 2024 09:13:11 -0500
-Subject: [PATCH] Fix typo with xmlSecKeyDataEcGetKlass in app.h include (#755)
-
----
- include/xmlsec/app.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/xmlsec/app.h b/include/xmlsec/app.h
-index 4fe2a744..324561b9 100644
---- a/include/xmlsec/app.h
-+++ b/include/xmlsec/app.h
-@@ -85,7 +85,7 @@ XMLSEC_EXPORT xmlSecKeyDataId xmlSecKeyDataDsaGetKlass(void);
- *
- * The EC key klass.
- */
--#define xmlSecKeyDataEcId xmlSecKeyDataEcetKlass()
-+#define xmlSecKeyDataEcId xmlSecKeyDataEcGetKlass()
- XMLSEC_EXPORT xmlSecKeyDataId xmlSecKeyDataEcGetKlass(void);
- /**
- * xmlSecKeyDataGost2001Id:
-
diff --git a/dev-libs/xmlsec/xmlsec-1.2.37.ebuild b/dev-libs/xmlsec/xmlsec-1.2.37.ebuild
deleted file mode 100644
index 65dfdf2c4a43..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.37.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-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="|| ( gcrypt gnutls nss openssl )
- gnutls? ( gcrypt )"
-
-RDEPEND=">=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-2.8.0:= )
- nss? (
- >=dev-libs/nspr-4.4.1
- >=dev-libs/nss-3.9
- )
- openssl? (
- dev-libs/openssl:=
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- test? (
- nss? (
- >=dev-libs/nss-3.9[utils]
- )
- )"
-
-src_configure() {
- # Bash because of bug #721128
- 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() {
- # See https://github.com/lsh123/xmlsec/issues/280 for TZ=UTC
- TZ=UTC SHELL="${BROOT}"/bin/bash emake TMPFOLDER="${T}" check
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.38.ebuild b/dev-libs/xmlsec/xmlsec-1.2.38.ebuild
deleted file mode 100644
index 7db6d5418226..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.38.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-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="
- || ( gcrypt gnutls nss openssl )
- gnutls? ( gcrypt )
-"
-
-RDEPEND="
- >=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-2.8.0:= )
- nss? (
- >=dev-libs/nspr-4.4.1
- >=dev-libs/nss-3.9
- )
- openssl? (
- dev-libs/openssl:=
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- test? (
- nss? (
- >=dev-libs/nss-3.9[utils]
- )
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.37-libressl.patch # bug #903001
-)
-
-src_configure() {
- # Bash because of bug #721128
- 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() {
- # See https://github.com/lsh123/xmlsec/issues/280 for TZ=UTC
- TZ=UTC SHELL="${BROOT}"/bin/bash emake TMPFOLDER="${T}" check
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.39.ebuild b/dev-libs/xmlsec/xmlsec-1.2.39.ebuild
deleted file mode 100644
index 5fcdd6b380de..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.39.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-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="
- || ( gcrypt gnutls nss openssl )
- gnutls? ( gcrypt )
-"
-
-RDEPEND="
- >=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-2.8.0:= )
- nss? (
- >=dev-libs/nspr-4.4.1
- >=dev-libs/nss-3.9
- )
- openssl? (
- dev-libs/openssl:=
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- test? (
- nss? (
- >=dev-libs/nss-3.9[utils]
- )
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.37-libressl.patch # bug #903001
-)
-
-src_configure() {
- # Bash because of bug #721128
- 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() {
- # See https://github.com/lsh123/xmlsec/issues/280 for TZ=UTC
- TZ=UTC SHELL="${BROOT}"/bin/bash emake TMPFOLDER="${T}" check
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild b/dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild
deleted file mode 100644
index 079d34a4be68..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- || ( gnutls nss openssl )
-"
-
-RDEPEND="
- >=dev-libs/libxml2-2.7.4
- >=dev-libs/libxslt-1.0.20
- dev-libs/libltdl
- gcrypt? ( >=dev-libs/libgcrypt-1.4.0:= )
- gnutls? ( >=net-libs/gnutls-3.6.13:= )
- nss? (
- >=dev-libs/nspr-4.4.1
- >=dev-libs/nss-3.9
- )
- openssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- test? (
- nss? (
- >=dev-libs/nss-3.9[utils]
- )
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.0-optimisation.patch
- "${FILESDIR}"/${PN}-1.3.3-typo-fix.patch
- "${FILESDIR}"/${PN}-1.3.3-slibtool.patch
-)
-
-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[@]}"
-}
-
-src_test() {
- # See https://github.com/lsh123/xmlsec/issues/280 for TZ=UTC
- TZ=UTC SHELL="${BROOT}"/bin/bash emake TMPFOLDER="${T}" check
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.3.1.ebuild b/dev-libs/xmlsec/xmlsec-1.3.5.ebuild
index 1508b3b8defa..f0324bc08612 100644
--- a/dev-libs/xmlsec/xmlsec-1.3.1.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="doc gcrypt gnutls http nss +openssl static-libs test"
RESTRICT="!test? ( test )"
REQUIRED_USE="