gentoo auto-resync : 16:05:2024 - 00:01:30

3 files changed, 2 insertions, 98 deletions

diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index fbd5d1b06f21..32ade995426f 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,7 +1,5 @@
 AUX libquotient-0.8.0-no-android.patch 993 BLAKE2B 119a902b67ac0c101a84217e52f3438f83c474322d75b9ccc5fa8a2375bbf55c8910da65b6b7eac645eef840fa69e356343bc78fac88d14582fca395867050f7 SHA512 be757da77733eec67111c5e5f96c6459018aabbe863abdfbc7029e548b75f52f7a2754ee6eb93eaea6d08d7a2978ea9470585192ba95186358b02ec1df9f6f10
 AUX libquotient-0.8.0-no-tests.patch 1215 BLAKE2B 4749dfb1b6e2be0f59b83a73092e7b4191458ad7220faefe0db71846d3d5fcbd59eb4adfcf97c0d779bc074fb0ccd1faef8eccfc44e4ad53750f79da6524b7dc SHA512 2923d0cec567378e1ddd9c7a50667a28bb79cdf871ce328b6db1ee0eb457b6c7d1a376b7659cb92f13483c29baa4991f410b3c5c478c881f80443a7eb4003b7f
-DIST libquotient-0.8.1.2.tar.gz 730435 BLAKE2B 7c43bc394d46ddb600c683d771add48f9a20d205ce61796b27a34933521e38be2b3b331263ffc6bb00fd1197a195b295e3311d52d8d74cdfe51453954cb79ae1 SHA512 ff11f1e9093004461425179fcab630237bf1d28f6e5abe6486d657b455b560884047715fccff5b31f26275ffd423df787014aaac35c556eddb1842e8e68841ce
 DIST libquotient-0.8.2.tar.gz 744095 BLAKE2B c33016e4eda22e0a363f06ab4545d17010519b8d778566c1bae29e4c7d6563280f4ce3c1235f7d75f55ce4a8971ef5ce23e45f1d3a0edc043e23857d805a824f SHA512 3d971439f8a89609930ca1648f6cf1bdb59f3ad492af1a15a7f8a13d06c81bd5bfffa1dd732ef5156fab8a9ea2ba3e98376bf76511db17bdeee17641a772b762
-EBUILD libquotient-0.8.1.2-r1.ebuild 1926 BLAKE2B a5104973ab5d280f35f5a4af480faa02404bcc8ae13a7a1cfa8c1cbb0b152bcf92aac092d243ae1266a24bd3334bdb43ab9e772c47783e37b35150400c156eb9 SHA512 1ec198a0cf6e08f34dd18339f2159eb7c7fca4fe3f9d6163110b30488acde7f2792ac31c40ea43923240595ae040c593a7c28c4e533cd87299a508ae552001b8
-EBUILD libquotient-0.8.2.ebuild 1960 BLAKE2B 5c50c69cddb65227a21c1b19be0f4775a719b530ee972aba5c645cf58afbb82e58153233e0f3b1f7eaf271fd82e583e26b8f4b8ff707774c6e7f2b06408e8049 SHA512 98a10ca9d42616fb51ba05017ee56decc73d741397ac9c17a6d00fd28f09bb33af908ec94c43f4c77ad8f57929e2153c5f1838773426cffc3b9f37d03ad95fe0
+EBUILD libquotient-0.8.2.ebuild 1957 BLAKE2B 4bae039fa63546716e61bb4f20711561696a253d1b80bd2845eb369f375cf29c8def8d05f55dd927e234b58479fd71614295b2bafbb758f5004dff714e3b3259 SHA512 71245e17ad39283568bf23fcf7b6907aa9533cb6ad8015991efef54d7cee8b36d5498ac2a82d28df54006e881b4371ccb9ed48c82b6ecb77f12b0654cb96d697
 MISC metadata.xml 338 BLAKE2B 84af57de6f4faeb65a9a9bd272a29e6cb4491e8eff3d79c4704566baa4af7cfa2f9c6c14a52a0a44e8751848b9e89f30807a6d0c304eb28d8b2cb9f43f0b37c5 SHA512 f93f27e29f09f8e6e6c0038a403990260c8998213c8248c2acbfc1f7e76faa07c296d4b30214c746f30d42b37d636be92720e692280098d4d72d3d542b5004aa
diff --git a/net-libs/libquotient/libquotient-0.8.1.2-r1.ebuild b/net-libs/libquotient/libquotient-0.8.1.2-r1.ebuild
deleted file mode 100644
index f66415455e7e..000000000000
--- a/net-libs/libquotient/libquotient-0.8.1.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild
-
-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/${PV}" # FIXME: check soname on next version bump
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+qt5 qt6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/olm
-	dev-libs/openssl:=
-	qt5? (
-		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
-	)
-	qt6? (
-		>=dev-libs/qtkeychain-0.14.1-r1:=[qt6]
-		dev-qt/qtbase:6[gui,network,sql,ssl]
-		dev-qt/qtmultimedia:6
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		qt5? (
-			dev-qt/qtconcurrent:5
-			dev-qt/qttest:5
-		)
-		qt6? ( dev-qt/qtbase:6[concurrent] )
-	)
-"
-
-PATCHES=(
-	# downstream patches
-	"${FILESDIR}"/${PN}-0.8.0-no-android.patch
-	"${FILESDIR}"/${PN}-0.8.0-no-tests.patch
-)
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
-	my_src_configure() {
-		local mycmakeargs=(
-			-DBUILD_TESTING=$(usex test)
-			-DQuotient_ENABLE_E2EE=ON
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-			mycmakeargs+=( -DBUILD_WITH_QT6=ON )
-		else
-			mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
-		fi
-
-		use test && mycmakeargs+=(
-			-DQuotient_INSTALL_TESTS=OFF
-		)
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
-
-src_test() {
-	# https://github.com/quotient-im/libQuotient/issues/435
-	# testolmaccount requires network connection/server set up
-	local myctestargs=(
-		-j1
-		-E "(testolmaccount)"
-	)
-	multibuild_foreach_variant cmake_src_test
-}
diff --git a/net-libs/libquotient/libquotient-0.8.2.ebuild b/net-libs/libquotient/libquotient-0.8.2.ebuild
index 8ecb8d3f4492..46e892502015 100644
--- a/net-libs/libquotient/libquotient-0.8.2.ebuild
+++ b/net-libs/libquotient/libquotient-0.8.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/libQuotient-${PV}"
 
 LICENSE="LGPL-2+"
 SLOT="0/${PV}" # FIXME: check soname on next version bump
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+qt5 qt6 test"
 
 REQUIRED_USE="|| ( qt5 qt6 )"