gentoo auto-resync : 08:06:2023 - 15:45:39

8 files changed, 81 insertions, 10 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3df63a1bf8bd..4810078ca4ca 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 5d139ad0d297..aaf1ec508cfc 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST libktorrent-22.12.3.tar.xz 616864 BLAKE2B 7acccec7a946083bde8ecf7fe67a0e0fef2fa02a8e2d2e8319956249630d902651f56e1b22d4eafbbc2c1709b0b70cfde762475a2bbe4b355941c8a9aecdd4db SHA512 16fbdf1422882928e22c326df432c5d266815a56e83a80056734fd15a38898036d4cef993a86e63ccf8bf8a8618f857535b6aa4bc3c8479e1ad4b0dd3b4521c3
-DIST libktorrent-23.04.1.tar.xz 604072 BLAKE2B ecd0514275d3de55fa96de3fd5135994ffec9a323433b6c3b4ac27494cfedbccd09f1d4596f7198de045ca2a231b9535ed05e1e12c78fd2221580e7b3a151ccd SHA512 250143cab7d5e7275246a887b6b59dc82fba03064d8c62f6c707edc91fb91f4ae2778137c1464549df40c10ec339e8b4f03c92befa37d4593ed773e46a30e7ec
+DIST libktorrent-23.04.2.tar.xz 604072 BLAKE2B 567b5051058bcca9457ae8fbbcb922ca570e110c7aaeb9506049c29673aa552c8ab333aa24ff4046266fc9f998da9daf24aa236072d0ebb705fbce91e36fac8e SHA512 836831b4b21cead5ff59654173681bf9784305c9f11db146a06b5f74c7c9e1802469ea324d7a1986071760aaf798768eb09a575b8df88df56df1d48675b2756c
 EBUILD libktorrent-22.12.3.ebuild 1449 BLAKE2B 4307e696aa8b5c804dbaa8f1759ec3fbdef64e7cedefdeeec9c880df1c81de6e09894f8ee92f3b17046328a307c0a4c35c793d81c260730baef3c326eb725e9c SHA512 4b8dfb6a3817d4c2015f54f4cef6cc24d9afc76b4a6ecc242f6e57c70ba54dc5f4fdd25c3d4b997ce01a589b7071347a7e70d9e584763b2b98ecff51cbbd9e0d
-EBUILD libktorrent-23.04.1.ebuild 1452 BLAKE2B c94e0a7be1d7547fd29a6cff070d3857f840fe8e77ecd40f337e62706d4d9b58a72008cafac3029a8765df44c93c96d86774c424200588ab6557c83364c98e3e SHA512 3f5f1f375257df73aebd648f9ca957964577e67865d0996485457ef7895d8534a9652910543c5e4b26180ceafc746ce2ca85f89f7f4a2b7884adf5a0e333cfe1
+EBUILD libktorrent-23.04.2.ebuild 1427 BLAKE2B 3a74fa7ac7abe64b3fc839af4f97f5560269db73ebb98da5e46e268f629cc7ef2a2815436910aaa443b54b00f281e8a7fe0a55124333b0d7c023909e60c2d8f7 SHA512 3abea601c401cc426ed483b598633697bd274289a91aa4414bfaddc49400529aaa6ad1b7f2037cfa5e6b44df82931e9500ee4fd931aebfa6d2ab6ac3ee37aa60
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-libs/libktorrent/libktorrent-23.04.1.ebuild b/net-libs/libktorrent/libktorrent-23.04.2.ebuild
index 2ef0c863b832..97bd4df6feec 100644
--- a/net-libs/libktorrent/libktorrent-23.04.1.ebuild
+++ b/net-libs/libktorrent/libktorrent-23.04.2.ebuild
@@ -5,9 +5,8 @@ EAPI=8
 
 ECM_TEST="forceoptional"
 KDE_ORG_CATEGORY="network"
-KFMIN=5.104.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
+KFMIN=5.106.0
+QTMIN=5.15.9
 inherit ecm gear.kde.org
 
 DESCRIPTION="BitTorrent library based on KDE Frameworks"
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 476c5e11ad99..732406c7f2b8 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,5 +1,6 @@
 AUX libquotient-0.7.0-no-android.patch 969 BLAKE2B 775a680ed803047c7bd5fd72a9a40f0a9540921a6004fe8242c0df9a849d868100283a3ebc4e586e0b50de4e3cf7dc1ba8d9731b427515bc4f90196e61fab1a9 SHA512 27d56906e23ae8f56696ca9d7aeafc15398f81286cafd4f2eae54638b16819ec3fcd40a53b96953b3f62eb4982e09db1abc00e8e76abd61a55343752fb5e5ad4
 AUX libquotient-0.7.0-no-tests.patch 1234 BLAKE2B 60a3da8a15c9c77d8c997b0c0d95a6e13e9d332fdcbee2e6a88882269969519a82daea1280721ff6661a410f03fbd43d5233d8f4804896af637dfca67dd7111f SHA512 e2aa9d7ddca5d7cbb9323d3be9551515b726293c14eb34b4374f701082d9ce21af9f39836ecfada4247b25f1fe6b8fdd2f62976c32658e7d48266f02123ff582
 DIST libquotient-0.7.2.tar.gz 671676 BLAKE2B 37a22c01b94bb77b89534e48ebcf8427429760095ecdc9427297c57e1d7dabdaaeaf9c7498b4695d23e468b89e1ac9cd44b9f64593454e5c3f8f452b95745c75 SHA512 ba849b938c0bf93e075da466a8360703fb903ac2735b35a7e83944a1288c9324ff76daaf57164144c55cef450fc658e42e6dcacfd23f87a4db455019e9c21f47
+EBUILD libquotient-0.7.2-r3.ebuild 1250 BLAKE2B 0f84f4ffafbee4c70d8e98ce5f7003888b6aa9505c41a82215a3421d640e22148cc70ca78738e9d8c8329828c45115cf4a3100cfadf89103d21f55c4429fe07b SHA512 7636b6f6ecc6906b8a90534ad020bf769e489c4046192dcaa397b3f2b6bc5e0aa45976784dc9e5f3c795dcbc04272b381a587bc4395902b2642cefc98e7ba407
 EBUILD libquotient-0.7.2.ebuild 897 BLAKE2B 024c319e15561b76f291b594b68893bf049d4bb560bf4aa53d03a0db0ec4e7e3ae98b3acc5077da54a9c776591fc66cd3ba832c5650f9095ce26bc6d7f28eb82 SHA512 9efea027d46a1edc8e2c215aeb3249e36a534e3996e40806b0932dfd20dbecbf886048856b7db7bcecf7aa486320f896fca5fdffffe06a31f9b9bbe91a1d640e
 MISC metadata.xml 338 BLAKE2B 84af57de6f4faeb65a9a9bd272a29e6cb4491e8eff3d79c4704566baa4af7cfa2f9c6c14a52a0a44e8751848b9e89f30807a6d0c304eb28d8b2cb9f43f0b37c5 SHA512 f93f27e29f09f8e6e6c0038a403990260c8998213c8248c2acbfc1f7e76faa07c296d4b30214c746f30d42b37d636be92720e692280098d4d72d3d542b5004aa
diff --git a/net-libs/libquotient/libquotient-0.7.2-r3.ebuild b/net-libs/libquotient/libquotient-0.7.2-r3.ebuild
new file mode 100644
index 000000000000..eb5357d1bd06
--- /dev/null
+++ b/net-libs/libquotient/libquotient-0.7.2-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Qt-based SDK to develop applications for Matrix"
+HOMEPAGE="https://github.com/quotient-im/libQuotient"
+SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/libQuotient-${PV}"
+
+LICENSE="LGPL-2+"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/olm
+	dev-libs/openssl:=
+	dev-libs/qtkeychain:=[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qttest:5
+	)
+"
+
+PATCHES=(
+	# downstream patches
+	"${FILESDIR}"/${PN}-0.7.0-no-android.patch
+	"${FILESDIR}"/${PN}-0.7.0-no-tests.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=OFF
+		-DBUILD_TESTING=$(usex test)
+		-DQuotient_ENABLE_E2EE=ON
+	)
+	use test && mycmakeargs+=(
+		-DQuotient_INSTALL_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# https://github.com/quotient-im/libQuotient/issues/435
+	# testolmaccount requires network connection/server set up
+	local myctestargs=(
+		-j1
+		-E "(testolmaccount)"
+	)
+	cmake_src_test
+}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 1bfca84ec954..5a56027db322 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -14,5 +14,5 @@ DIST xrootd-5.5.5.tar.gz 3243062 BLAKE2B 697dbd9d42e3fd9c6d2cf86a1c120e3752e74ab
 EBUILD xrootd-5.4.3-r2.ebuild 4627 BLAKE2B c3820362346a32f41c9a9afe447854211af4a2015e3e0950b98e18e6346ec9ec7528ae3ec7cef8be29dbaf069a9188dce4fad2a31023c87cb82cef709dc03c03 SHA512 705bd4e6189c67a0b7f31dc96241b086145268a13113826292ab6b00fdf739c497c67cb00033f5f42181f51dcc0476bf816fc5daf2dbace16d14c989fecd8589
 EBUILD xrootd-5.4.3.ebuild 3186 BLAKE2B 39211730f3cf2da1f616c3cb88e0fbe5449b534fdb9612c47f919537162fb1cb14e4a225feeeed6b51428ae51c7550d31a875b71a0c1b5b3ee3b12e2cd474f26 SHA512 3ab16277df556260c833c1a60cb47c964ffefa7cef623aba61038d73be6959f2dbae41f2ccef28e95274472d0995a840347128fb38d4e5d8f171af709d8267f2
 EBUILD xrootd-5.5.4-r1.ebuild 4747 BLAKE2B b998c253caf6335c65a071d9ad58b3481e24c697ba53506d38751284561f3fdd89f89f9b42d30789b168d8bc83ed6d96b0d12fed781cb6ee61c1751f142f2ac9 SHA512 064dad4eb4c39910149ad0a9a98519ae44e93038a000f9df4d5f8e4981267d681994bf033a75dfb711ae504368ac76c3852dcfeae3b3aae04874eafa203e724c
-EBUILD xrootd-5.5.5.ebuild 5131 BLAKE2B 1db4765c9c86cdebb0737961e69c8dd388343ed578fdaf0aa64d77e2199d86d949d9a0e8e4b737605854597f31d8dc65b8cde3702ab73174a607ad31c4f0bc37 SHA512 9714cf15a9d19f2c449bb019052f5b03e0cf5400191e07ec967c3a6c3c43e863ecf924b9edabee7b871a0b2e3d0069a1d2b1f0378bdf7b13ffbd2a26853c7f0f
-MISC metadata.xml 1223 BLAKE2B 91d347d56ce4e60e13a50f8331a9f6ae5d8030c71d0ce42273637b305b83334e5b5e1652f96396faf4d5ce669dc8d970d4eafaaa32ce21ed7b6e7378013347ba SHA512 9dbcae7cd57b4b1ad3809b7adf02d6053d5d476bdf6ce4b20a41897e550281e68c8a58fe9a8fd6a08fccc61adc384c7123c8a5a02b226522c32a52a26f8ce5a3
+EBUILD xrootd-5.5.5-r1.ebuild 5323 BLAKE2B 7f447697571190745567e5e6225e4694d399e62d2e18b5a13a27af2859a9e87d899264bb8592d955410deef91c511879b8d84cebd8446afab4e537898564e3da SHA512 fd2ce0e94e4be67261d519ecf1c3aef653d1965f4a664f563a7554f51f56ecd4a84946abcabdf5bf50363ab29ccdcd305ec21aadb51b96ae5b062f99c4069a9e
+MISC metadata.xml 1425 BLAKE2B 6bd0a688dd2a671d6e8086896d10b2aa05b2e033b21c60bb7c622ad1f07d982777a9848317d2ba43dad5ac0e0973419c2df5ed30948ec1441c7ee1cd0d8959da SHA512 f1e8720586dbceb895562a3ecfdc059aa840b4a9fbc49f0e51dd1e886e7f1fa13b79db4d1cb487f66e06232e9f4ade043e967ec387d315ad8a05e28244640d65
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index 16c259164057..3b614243b413 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -20,6 +20,8 @@
     <flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag>
     <flag name="http">Enable http protocol support</flag>
     <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing (preferred) instead of bundled tinyxml</flag>
+    <flag name="macaroons">Enable support for macaroons with <pkg>dev-libs/libmacaroons</pkg></flag>
+    <flag name="scitokens">Enable support for scitokens with <pkg>dev-cpp/scitokens-cpp</pkg></flag>
     <flag name="server">Install xrootd server and related plug-ins</flag>
     <flag name="xrdec">Enable erasure coding support (XrdEc plugin) with <pkg>dev-libs/isa-l</pkg></flag>
   </use>
diff --git a/net-libs/xrootd/xrootd-5.5.5.ebuild b/net-libs/xrootd/xrootd-5.5.5-r1.ebuild
index 9137e1925da2..7b7be06008c8 100644
--- a/net-libs/xrootd/xrootd-5.5.5.ebuild
+++ b/net-libs/xrootd/xrootd-5.5.5-r1.ebuild
@@ -23,7 +23,12 @@ SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples fuse http kerberos +libxml2 python readline +server systemd test xrdec"
+IUSE="examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec"
+
+REQUIRED_USE="
+		macaroons? ( server )
+		scitokens? ( server )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -39,8 +44,10 @@ CDEPEND="acct-group/xrootd
 	)
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2:2= )
+	macaroons? ( dev-libs/libmacaroons )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
+	scitokens? ( dev-cpp/scitokens-cpp )
 	systemd? ( sys-apps/systemd:= )
 	xrdec? ( dev-libs/isa-l )
 "
@@ -98,10 +105,10 @@ src_configure() {
 		-DENABLE_FUSE=$(usex fuse)
 		-DENABLE_HTTP=$(usex http)
 		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_MACAROONS=no
+		-DENABLE_MACAROONS=$(usex macaroons)
 		-DENABLE_PYTHON=$(usex python)
 		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_SCITOKENS=no
+		-DENABLE_SCITOKENS=$(usex scitokens)
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_VOMS=no
 		-DENABLE_XRDCL=yes