diff options
Diffstat (limited to 'net-libs')
127 files changed, 3102 insertions, 165 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex 49ead57b9a9e..7aa93f620b49 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-libs/accounts-qml/Manifest b/net-libs/accounts-qml/Manifest index ca4cb178a064..cd7dde15c563 100644 --- a/net-libs/accounts-qml/Manifest +++ b/net-libs/accounts-qml/Manifest @@ -1,5 +1,7 @@ AUX accounts-qml-0.7-gcc12.patch 819 BLAKE2B b53cdf8fd455f84c8cc053e10c3082f683f6cd30d5e133695ae44f8afd2b749bc47d9e5ea9f7deb4f894e21ca683bfe75d9928b4a28fc5e0e7ec3c715b16551a SHA512 5c714ba915bf7f0181df491b8a56e3692896d3145b6b869cd6128f4d712ce821c208d8992e75d9cc18841bfa19e2fb9da60a03e4a1b6d2dfb3bc6531b28dae73 DIST accounts-qml-0.7-patches-1.tar.xz 3416 BLAKE2B bbaef28c3d455d4aa458790a875a321870c90e88ba3e6735790b3ea50d89c6ac4ac3ef3320239fb4a120681690af4144ea616638ebe21e51e898e178a94eb5cb SHA512 3f3f4996311fe76c9a438dc2794394879b655373146baa38be13c54a93f0016035d371ae7152df02b56b25f7898ab7d0752de636202e88acae1ee536f2809ad6 +DIST accounts-qml-0.7_p20231028.tar.bz2 50521 BLAKE2B 6704557e50b40d0be6e706c05ce888f959fd2028c7fa9aea9d3f2064828b6869bee454cd88189e70abe483b0809ec857634b0b8fa5f989fca05ae7af55efb80a SHA512 0d366b526873bdeecb9a5582992b8d659777beff3b5449745141a3c8156e130714acd81343440a2edcff7ed7bfeed2ce1afdb89188c8be2a2737491278b44253 DIST accounts-qml-module-VERSION_0.7.tar.gz 62029 BLAKE2B 0924b73868135ad5d9ec7545d5b0ba84f140053f0be4d17f1c6d3754ec19e362af906af60fb45e6405b5d080dd8f63845070815b12e8bfeda30032c9ed172708 SHA512 4e0e5df64d0a477e11f412c0def85d0de1730efff9682790f5339a57d58778282aa8ca0fa201e409b3b9a2a75fea70f10555b1f70224a3b95ab8d44b942cf7e1 -EBUILD accounts-qml-0.7-r2.ebuild 1343 BLAKE2B a60cc55e9c2eca0690f185e49afa12cbe878c3a965659657037b604e58721cfdb462ef81cf893cef4899aa9f7587ea11c923527b59f7500e239472d1c292e096 SHA512 17cd20a0067de717c955563e1eb50ddfef726e0c8ae2b1d19fce221510a5609f61d5eb8a8dbda10a31fc4b5d04b37e62622e8e2fefba9056123353916b019a6e -MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f +EBUILD accounts-qml-0.7-r2.ebuild 1344 BLAKE2B cf839eb0b53d0aa7728cb31aa9e69517ae8d53efeb493082fe3c72c10c28bfd51e6bfdb886c661587770d8f89df884983f5cb7b5df269dcdaf3c219a3abd9183 SHA512 e6589ba7701c56898573385fa32ce198ba2b13c555c28171f5efb32c4fa968b969648061419718b7660a6d31e78eb5e1dd94a2c64f30c9193c3e070d8ce3cb72 +EBUILD accounts-qml-0.7_p20231028.ebuild 2669 BLAKE2B 2f25cc3f40e9e336711da53b01602cf4e9b6186ca3e1f0dd0a516e3d9564ebf3c9aca00695b6278a306b5cda25f72b12a33b712413456cc24735f7c68eae195e SHA512 3a63400ee44b72240879d16a6faa244977cda3d1bd62f8a27d17cbe848e2e910f30ebb9a65761578c3d429008914d0a837666ad390f3b69908685ae7696ab93e +MISC metadata.xml 347 BLAKE2B 755e5ea43cad3783e4cb0e4f981a70a02cc25a344de46fe29923edcf5737778312017ddb7be004fc7cc075a6ffd206133952f07aeac30f9bf84277c3ea00eff2 SHA512 adbed6a6a004dc5a83adb510ca9ea5a8c2d43639452cc0c7ca28a2bff6a3680bb7a190c3e78d85008ae3cb444d07cf9d34f7e1b296cf2789e49e682fac970456 diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild index 502e8c12b743..d1a1aa9bc909 100644 --- a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild +++ b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,7 +33,7 @@ DEPEND="${RDEPEND} " BDEPEND=" doc? ( - app-doc/doxygen + app-text/doxygen dev-qt/qdoc:5 dev-qt/qthelp:5 ) diff --git a/net-libs/accounts-qml/accounts-qml-0.7_p20231028.ebuild b/net-libs/accounts-qml/accounts-qml-0.7_p20231028.ebuild new file mode 100644 index 000000000000..7b40f6711238 --- /dev/null +++ b/net-libs/accounts-qml/accounts-qml-0.7_p20231028.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils multibuild + +if [[ ${PV} = *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/accounts-sso/accounts-qml-module.git/" + inherit git-r3 +else + COMMIT=05e79ebbbf3784a87f72b7be571070125c10dfe3 + if [[ -n ${COMMIT} ]] ; then + SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/${COMMIT}/${PN}-module-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${PN}-module-${COMMIT}" + else + SRC_URI=" + https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.bz2 + https://dev.gentoo.org/~asturm/distfiles/${P}-patches-1.tar.xz + " + S="${WORKDIR}/${PN}-module-VERSION_${PV}" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="QML bindings for accounts-qt and signond" +HOMEPAGE="https://accounts-sso.gitlab.io/" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="doc +qt5 qt6 test" +REQUIRED_USE="|| ( qt5 qt6 )" + +# dbus problems +RESTRICT="test" + +RDEPEND=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + ) + qt6? ( + dev-qt/qtbase:6 + dev-qt/qtdeclarative:6 + ) + >=net-libs/accounts-qt-1.16_p20220803[qt5?,qt6?] + >=net-libs/signond-8.61-r100[qt5?,qt6?] +" +DEPEND="${RDEPEND} + test? ( + qt5? ( + dev-qt/qtgui:5 + dev-qt/qttest:5 + ) + qt6? ( dev-qt/qtbase:6[gui] ) + ) +" +BDEPEND=" + doc? ( + app-text/doxygen + || ( + ( dev-qt/qttools:6[assistant,qdoc] ) + ( + dev-qt/qdoc:5 + dev-qt/qthelp:5 + ) + ) + ) +" + +DOCS=( README.md ) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_prepare() { + default + rm -v doc/html/.gitignore || die + multibuild_copy_sources +} + +src_configure() { + my_src_configure() { + cd "${BUILD_DIR}" || die + + local myqmakeargs=( + CONFIG+=no_docs \ + PREFIX="${EPREFIX}"/usr + ) + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + eqmake6 "${myqmakeargs[@]}" + else + eqmake5 "${myqmakeargs[@]}" + fi + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + my_src_compile() { + emake -C "${BUILD_DIR}" + } + + multibuild_foreach_variant my_src_compile + + if use doc; then + local qtanybindir + if has_version "dev-qt/qttools:6[qdoc]"; then + qtanybindir="$(qt6_get_libdir)" + elif has_version "dev-qt/qdoc:5"; then + qtanybindir="$(qt5_get_bindir)" + else + eerror "dev-qt/qttools:6[qdoc] nor dev-qt/qdoc:5 available even though in deps(?)" + fi + ${qtanybindir}/qdoc doc/accounts-qml-module.qdocconf || die + fi +} + +src_install() { + my_src_install() { + emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install_subtargets + } + + multibuild_foreach_variant my_src_install + use doc && local HTML_DOCS=( doc/html ) + einstalldocs +} diff --git a/net-libs/accounts-qml/metadata.xml b/net-libs/accounts-qml/metadata.xml index 8641e5bdd399..320bd7afdec3 100644 --- a/net-libs/accounts-qml/metadata.xml +++ b/net-libs/accounts-qml/metadata.xml @@ -5,4 +5,7 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="gitlab">accounts-sso/accounts-qml-module</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest index aa059ec64072..5613f964c319 100644 --- a/net-libs/accounts-qt/Manifest +++ b/net-libs/accounts-qt/Manifest @@ -1,3 +1,11 @@ +AUX 0001-Port-away-from-deprecated-QList-toSet.patch 3641 BLAKE2B 25a036baf7ff4864d205d0eded66ef7651ed51a3608fa7f0a72e40eefa3331e3741718b0161fe5a882a6c08f382362c494ffa5f8546f57f2365d5f77fcf22d88 SHA512 26c84e920c772f346f82f8886a6d0ce05117ed1bfbafcba843486e0f22f4c49f806c475a3a73b3c76173e9409a3b17d1ce89a0148877bccf9e8808eda35b1796 +AUX 0002-Add-Qt6-CI.patch 5085 BLAKE2B 2dec34a0b6726a780e593fbb74745951041f3e6cbe6b95c15229bb6aefc8ecc5f6ecb6c6a8f3d81f84939bca45c45ad0edc8370f4c1ac2f35a8840ba72cf28ed SHA512 82c9fe0e377180b1f9014376f6cdba67985f003f7ed5bf967f6ad03b52e38169cf62cdc50f3306a7d9862b33dd62ca412bd871a4d465184a5c4fb6d1b751d631 +AUX 0003-Use-undeprecated-Account-value.patch 914 BLAKE2B 42b2483989abea47e96c6b450ab395ff8ad81c56932f422f7f3b378cf16af62eef1c5f1ac93ae6174cf2d25ba8724332714a44b3eb3919f2c3c8368467807e3e SHA512 6f5b5189246cf6ae3cb15a48878d95fff91563127c0888da784cc4fc126ba576214ae801bb24912e6d147d99b300629971c2a874a1087e7d0c3d20b0118b28e4 +AUX 0004-Don-t-access-a-QString-out-of-bounds.patch 1414 BLAKE2B 611ee017ba8db1440c9954bd6c58c724f8b790374a126658826157a61e4e5c5fe5493ee49371fbbb1e5abd638dbe1e8f26574d5266d80ca6a581870bd6f32c82 SHA512 5ccff28c1ab3951f093d4dcc0dad782b60118e7abc978564b60c1463efb683f9f495f6cf7e100d96fc28e60980ffd2a79ab6f1b471ff5fa15823c113003c0a7e +AUX 0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch 4128 BLAKE2B 86f3a68616ee7919d8d0123ff3373583d5c6f52dd0a77d3fd480e8556d78a09643f0007d343a143c1c79005147a59febe80d23a0417446c4f62fb040ea0f2701 SHA512 5bb20f5086c10d68aae819314137b221c34fc8a57a7eed1c44b0e96e64e1cf973df82c19698487297c452f704769cb26ffeb799b8ec3e30c3d4741fb313b63fc +AUX accounts-qt-1.16-libdir.patch 4809 BLAKE2B 50c73a04be62a4748278f7cf46a8c06286363b9929324863af079e4da2c487d36194231a06d15ccb159d0a1f668fcf1a1ad80330730bebc08f53d29bbaa499f0 SHA512 dde1e34655952e8ae0ade756d8ff8559b4049eed0d273c078043eafe24751edf57e66b6300ee875c28b56978ed502bef79186605b3bc73b752fb226ae2bda90d +DIST accounts-qt-1.16_p20220803.tar.bz2 55304 BLAKE2B 3143894e0b0887cbcd07391330a6c5fc423b2d1609c3057b2ee921a8c3ae78d9c149c39f74c29b50cc5e28428bef31d8ed598ca76beacd3946d6f99109d24aa0 SHA512 c919cc2b70de5a0a288a942297480ee68568ab5f708a504801ce953193a5d7e30be159a517f1566c283436663052e6d0fbd6eef1386376cb3cba0144505318df DIST accounts-qt-1.16a.tar.gz 64376 BLAKE2B 39abe10249efff2edeae1a8ce210be3ce06656311ed5a3a3fbcb847194ebbd8ec6e111ef070fb29a2a847591304cf22a7cb60e9d1178a201b886313c4c8aaadb SHA512 a2a65899a258ac41c67fe496ba14468a95615fe8cfc518b7aaf7d3e72e0088304c61f5d76d50bd26a95b5f56dea4d0191bf08ecead508286504161aa05b7a05b -EBUILD accounts-qt-1.16.ebuild 1245 BLAKE2B 1e24188b096835f96e009dbf3a60a74c1036d1bda9fe40018afccb7f25e00aebf120c1683fbadd4fe601adcb4b25f4a69fb358a848119851b96e82d3458e85c8 SHA512 526fa6895c8534232bea65063643c33ccd25bcb12927480b8a6906f6bf78ca58c61d7a8f07c446f9c05e92c23825ab2e1d0c1aee7736eec012ddd27a30134701 -MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f +EBUILD accounts-qt-1.16.ebuild 1246 BLAKE2B c827ee70ba0344e152692559d76a6866840651083e509434c65cf997f4826669b6f173af24de9f58aa5f2690eee28a4150e7907655303ae654db113cdb7ff146 SHA512 bde1752c2640107c64286b5415294c71dab734eca555d259658d1d99ec89273a512f76396d02600b52fd54068b2a72c6497292a995a6453b967bc7f64d84cc93 +EBUILD accounts-qt-1.16_p20220803.ebuild 2967 BLAKE2B b380eb877d95f820de84466a2277d92ba4eb6cdcb055ea8a455bd041d754065f5129c39cb3347015a42867bd61afba7658b73c3b1774e9e574421e43a815e637 SHA512 b64f8268132e757305168ef7b48814f1b592d9131def5e4d7dab4fd97053cd7e403a4c48c9872759754f6f29fbe1d2b685eac6853ac75e3c8b8ff5543224b9d1 +MISC metadata.xml 342 BLAKE2B 220884a62a67c3bc3417a30099191a253c3af9144d30fb04bc6b495c9a665e167392d96421a707bdc9d7d3737781650e48839ec9db12047590a69e8b1704730f SHA512 2525b4cab71fe0a925d2acea96ec7a164f1df175f7699b9b26d30a2642559627790d264b147c40365162ce3dda67fbbde2ed8115bc42e4ed284b970658bb3779 diff --git a/net-libs/accounts-qt/accounts-qt-1.16.ebuild b/net-libs/accounts-qt/accounts-qt-1.16.ebuild index 9614b92cac2c..e49f56bfcaae 100644 --- a/net-libs/accounts-qt/accounts-qt-1.16.ebuild +++ b/net-libs/accounts-qt/accounts-qt-1.16.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 @@ -29,7 +29,7 @@ DEPEND="${RDEPEND} " BDEPEND=" doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] dev-qt/qthelp:5 ) " diff --git a/net-libs/accounts-qt/accounts-qt-1.16_p20220803.ebuild b/net-libs/accounts-qt/accounts-qt-1.16_p20220803.ebuild new file mode 100644 index 000000000000..d90c6af12cdd --- /dev/null +++ b/net-libs/accounts-qt/accounts-qt-1.16_p20220803.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils multibuild + +if [[ ${PV} = *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/nicolasfella/lib${PN}.git/" + EGIT_BRANCH="qt6" + inherit git-r3 +else + COMMIT=c86db79be389601bf6798f815ca5b8f78a524156 + if [[ -n ${COMMIT} ]] ; then + SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/${COMMIT}/lib${PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/lib${PN}-${COMMIT}" + else + SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/VERSION_${PV}/lib${PN}-VERSION_${PV}.tar.bz2 -> ${P}a.tar.bz2" + S="${WORKDIR}/lib${PN}-VERSION_${PV}" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Qt bindings for libaccounts-glib" +HOMEPAGE="https://accounts-sso.gitlab.io" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="doc +qt5 qt6 test" +REQUIRED_USE="|| ( qt5 qt6 )" + +# dbus problems +RESTRICT="test" + +RDEPEND=" + dev-libs/glib:2 + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtxml:5 + ) + qt6? ( dev-qt/qtbase:6[xml] ) + >=net-libs/libaccounts-glib-1.23:= +" +DEPEND="${RDEPEND} + test? ( + qt5? ( dev-qt/qttest:5 ) + ) +" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + || ( + dev-qt/qttools:6[assistant] + dev-qt/qthelp:5 + ) + ) +" + +PATCHES=( + "${FILESDIR}"/0001-Port-away-from-deprecated-QList-toSet.patch + "${FILESDIR}"/0002-Add-Qt6-CI.patch + "${FILESDIR}"/0003-Use-undeprecated-Account-value.patch + "${FILESDIR}"/0004-Don-t-access-a-QString-out-of-bounds.patch + "${FILESDIR}"/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch + "${FILESDIR}/${PN}-1.16-libdir.patch" +) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_prepare() { + default + + local qhelpgeneratorpath + if has_version "dev-qt/qttools:6[assistant]"; then + qhelpgeneratorpath="$(qt6_get_libdir)/qt6/libexec" + elif has_version "dev-qt/qthelp:5"; then + qhelpgeneratorpath="$(qt5_get_bindir)" + else + eerror "dev-qt/qttools:6[assistant] nor dev-qt/qthelp:5 available even though in deps(?)" + fi + + sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \ + -i doc/doc.pri || die + sed -e "/QHG_LOCATION/s|qhelpgenerator|${qhelpgeneratorpath}/&|" \ + -i doc/doxy.conf || die + if ! use doc; then + sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die + fi + if ! use test; then + sed -e '/^SUBDIRS/s/tests//' \ + -i accounts-qt.pro || die "couldn't disable tests" + fi + + multibuild_copy_sources +} + +src_configure() { + my_src_configure() { + cd "${BUILD_DIR}" || die + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + eqmake6 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) + else + eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) + fi + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + my_src_compile() { + emake -C "${BUILD_DIR}" + } + + multibuild_foreach_variant my_src_compile +} + +src_install() { + my_src_install() { + emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install + } + + multibuild_foreach_variant my_src_install +} diff --git a/net-libs/accounts-qt/files/0001-Port-away-from-deprecated-QList-toSet.patch b/net-libs/accounts-qt/files/0001-Port-away-from-deprecated-QList-toSet.patch new file mode 100644 index 000000000000..190178cc3030 --- /dev/null +++ b/net-libs/accounts-qt/files/0001-Port-away-from-deprecated-QList-toSet.patch @@ -0,0 +1,92 @@ +https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21 + +From 3107822e036300684c2bdf587838a110eea8ba30 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 1 Aug 2022 20:35:03 +0200 +Subject: [PATCH 1/5] Port away from deprecated QList::toSet + +--- + tests/tst_libaccounts.cpp | 44 +++++++++++++++++++++++++++++---------- + 1 file changed, 33 insertions(+), 11 deletions(-) + +diff --git a/tests/tst_libaccounts.cpp b/tests/tst_libaccounts.cpp +index 471e3d5..efede91 100644 +--- a/tests/tst_libaccounts.cpp ++++ b/tests/tst_libaccounts.cpp +@@ -326,11 +326,11 @@ void AccountsTest::testService() + QCOMPARE(service.description(), QStringLiteral("Test description")); + QCOMPARE(service.iconName(), QString("general_myservice")); + QCOMPARE(service.trCatalog(), QString("accounts")); +- QStringList tags; ++ QSet<QString> tags; + tags << "email" << "e-mail"; +- QCOMPARE(service.tags(), tags.toSet()); ++ QCOMPARE(service.tags(), tags); + // Called twice, because the second time it returns a cached result +- QCOMPARE(service.tags(), tags.toSet()); ++ QCOMPARE(service.tags(), tags); + QVERIFY(service.hasTag("email")); + QVERIFY(!service.hasTag("chat")); + +@@ -687,10 +687,15 @@ void AccountsTest::testAccountService() + spyChanged.clear(); + spyEnabled.clear(); + +- QStringList expectedChanges; ++ QSet<QString> expectedChanges; + expectedChanges << "parameters/server"; + expectedChanges << "enabled"; +- QCOMPARE(m_accountServiceChangedFields.toSet(), expectedChanges.toSet()); ++#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) ++ QSet<QString> changedFields(m_accountServiceChangedFields.begin(), m_accountServiceChangedFields.end()); ++#else ++ QSet<QString> changedFields = m_accountServiceChangedFields.toSet(); ++#endif ++ QCOMPARE(changedFields, expectedChanges); + + QCOMPARE(accountService->value("server").toString(), + UTF8("www.example.com")); +@@ -727,17 +732,34 @@ void AccountsTest::testAccountService() + + + /* test some more APIs */ +- QStringList expectedList; ++ QSet<QString> expectedList; + expectedList << "server" << "fallback-conference-server" << + "port" << "old-ssl"; +- QCOMPARE(accountService->childKeys().toSet(), expectedList.toSet()); +- QCOMPARE(accountService->childGroups().toSet(), QSet<QString>()); ++#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) ++ QStringList childKeysList = accountService->childKeys(); ++ QSet<QString> childKeys(childKeysList.begin(), childKeysList.end()); ++ ++ QStringList childGroupsList = accountService->childGroups(); ++ QSet<QString> childGroups(childGroupsList.begin(), childGroupsList.end()); ++#else ++ QSet<QString> childKeys = accountService->childKeys().toSet(); ++ QSet<QString> childGroups = accountService->childGroups().toSet(); ++#endif ++ ++ QCOMPARE(childKeys, expectedList); ++ QCOMPARE(childGroups, QSet<QString>()); + QCOMPARE(accountService->contains("port"), true); + accountService->endGroup(); + +- expectedList.clear(); +- expectedList << "parameters"; +- QCOMPARE(accountService->childGroups().toSet(), expectedList.toSet()); ++ QSet<QString> expectedList2; ++ expectedList2 << "parameters"; ++#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) ++ QStringList childGroupsList2 = accountService->childGroups(); ++ QSet<QString> childGroups2(childGroupsList2.begin(), childGroupsList2.end()); ++#else ++ QSet<QString> childGroups2 = accountService->childGroups().toSet(); ++#endif ++ QCOMPARE(childGroups2, expectedList2); + + /* Remove one key */ + accountService->remove("parameters/port"); +-- +2.43.0 + diff --git a/net-libs/accounts-qt/files/0002-Add-Qt6-CI.patch b/net-libs/accounts-qt/files/0002-Add-Qt6-CI.patch new file mode 100644 index 000000000000..f8383b5f8a43 --- /dev/null +++ b/net-libs/accounts-qt/files/0002-Add-Qt6-CI.patch @@ -0,0 +1,137 @@ +https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21 + +From d00f7346b091b885ba0ea3f6055e74a173fd0034 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 17 Oct 2022 23:33:16 +0200 +Subject: [PATCH 2/5] Add Qt6 CI + +--- + .gitlab-ci.yml | 80 +++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 66 insertions(+), 14 deletions(-) + +diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml +index 95d5a92..f8b5bf6 100644 +--- a/.gitlab-ci.yml ++++ b/.gitlab-ci.yml +@@ -1,5 +1,3 @@ +-image: ubuntu:bionic +- + cache: + key: apt-cache + paths: +@@ -13,23 +11,19 @@ stages: + - test + - deploy + +-before_script: +- - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR +- - PACKAGES+=" wget" # for downloading dependencies +- - PACKAGES+=" libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip" # for libaccounts-glib +- - | +- apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \ +- qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen \ +- $PACKAGES +- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr +- - pip3 install meson ninja +- +- + build_dependencies: ++ image: ubuntu:bionic + stage: deps + artifacts: + paths: + - staging ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - PACKAGES+=" wget" # for downloading dependencies ++ - PACKAGES+=" libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip" # for libaccounts-glib ++ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y $PACKAGES ++ - pip3 install meson ninja ++ + script: + - STAGING="$PWD/staging" + +@@ -52,7 +46,15 @@ build_dependencies: + + + build_amd64: ++ image: ubuntu:bionic + stage: build ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - | ++ apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \ ++ qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen wget libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip ++ - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr ++ + script: + - STAGING="$PWD/staging" + - export PKG_CONFIG_PATH="$STAGING/lib/pkgconfig:$PKG_CONFIG_PATH" +@@ -69,7 +71,16 @@ build_amd64: + - build/ + + test_amd64: ++ image: ubuntu:bionic + stage: test ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - PACKAGES+=" wget" # for downloading dependencies ++ - | ++ apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \ ++ qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen \ ++ $PACKAGES ++ - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr + script: + - STAGING="$PWD/staging" + - export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH" +@@ -83,6 +94,47 @@ test_amd64: + paths: + - build/ + ++build_amd64_qt6: ++ stage: build ++ image: ubuntu:jammy ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make libglib2.0-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip libsqlite3-dev libxml2-dev ++ script: ++ - STAGING="$PWD/staging" ++ - find $STAGING ++ - export PKG_CONFIG_PATH="$STAGING/lib/pkgconfig:$PKG_CONFIG_PATH" ++ - export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH" ++ - mkdir build ++ - cd build ++ - qmake6 CONFIG+=debug CONFIG+=coverage .. ++ - make -j 4 ++ dependencies: ++ - build_dependencies ++ artifacts: ++ paths: ++ - build/ ++ ++test_amd64_qt6: ++ stage: test ++ image: ubuntu:jammy ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - export DEBIAN_FRONTEND=noninteractive ++ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make libsqlite3-dev libxml2-dev libglib2.0-dev ++ script: ++ - STAGING="$PWD/staging" ++ - export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH" ++ - find build | xargs touch # Avoid rebuilding ++ - cd build ++ - make coverage-html ++ dependencies: ++ - build_dependencies ++ - build_amd64_qt6 ++ artifacts: ++ paths: ++ - ./ ++ + pages: + stage: deploy + script: +-- +2.43.0 + diff --git a/net-libs/accounts-qt/files/0003-Use-undeprecated-Account-value.patch b/net-libs/accounts-qt/files/0003-Use-undeprecated-Account-value.patch new file mode 100644 index 000000000000..7a8cb85b009e --- /dev/null +++ b/net-libs/accounts-qt/files/0003-Use-undeprecated-Account-value.patch @@ -0,0 +1,28 @@ +https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21 + +From 102cf562f9d143de2f93ba40f8448c1d531c2c7b Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 18 Oct 2022 01:40:05 +0200 +Subject: [PATCH 3/5] Use undeprecated Account::value + +--- + tests/tst_libaccounts.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/tests/tst_libaccounts.cpp b/tests/tst_libaccounts.cpp +index efede91..d12091c 100644 +--- a/tests/tst_libaccounts.cpp ++++ b/tests/tst_libaccounts.cpp +@@ -516,8 +516,7 @@ void AccountsTest::testAccountValue() + QTRY_COMPARE(synced.count(), 1); + + /* check that the values we wrote are retrieved successfully */ +- QVariant val = QVariant::String; +- account->value(QString("test"), val); ++ QVariant val = account->value(QString("test")); + QCOMPARE(val.toString(), QString("value")); + + SettingSource source; +-- +2.43.0 + diff --git a/net-libs/accounts-qt/files/0004-Don-t-access-a-QString-out-of-bounds.patch b/net-libs/accounts-qt/files/0004-Don-t-access-a-QString-out-of-bounds.patch new file mode 100644 index 000000000000..e342139cbb5d --- /dev/null +++ b/net-libs/accounts-qt/files/0004-Don-t-access-a-QString-out-of-bounds.patch @@ -0,0 +1,42 @@ +https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21 + +From 3c4d5fa1f53cd66c9870b799e8518980176547b2 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 18 Oct 2022 02:03:59 +0200 +Subject: [PATCH 4/5] Don't access a QString out-of-bounds + +This asserts in Qt6 +--- + Accounts/account-service.cpp | 2 +- + Accounts/account.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Accounts/account-service.cpp b/Accounts/account-service.cpp +index e6c04f2..d8d4304 100644 +--- a/Accounts/account-service.cpp ++++ b/Accounts/account-service.cpp +@@ -335,7 +335,7 @@ void AccountService::endGroup() + Q_D(AccountService); + d->prefix = d->prefix.section(slash, 0, -3, + QString::SectionIncludeTrailingSep); +- if (d->prefix[0] == slash) d->prefix.remove(0, 1); ++ if (!d->prefix.isEmpty() && d->prefix[0] == slash) d->prefix.remove(0, 1); + } + + /*! +diff --git a/Accounts/account.cpp b/Accounts/account.cpp +index 2e40c60..104611a 100644 +--- a/Accounts/account.cpp ++++ b/Accounts/account.cpp +@@ -548,7 +548,7 @@ void Account::endGroup() + { + d->prefix = d->prefix.section(slash, 0, -3, + QString::SectionIncludeTrailingSep); +- if (d->prefix[0] == slash) d->prefix.remove(0, 1); ++ if (!d->prefix.isEmpty() && d->prefix[0] == slash) d->prefix.remove(0, 1); + } + + /*! +-- +2.43.0 + diff --git a/net-libs/accounts-qt/files/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch b/net-libs/accounts-qt/files/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch new file mode 100644 index 000000000000..904e7d5aa1ad --- /dev/null +++ b/net-libs/accounts-qt/files/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch @@ -0,0 +1,118 @@ +https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21 + +From 18557f7def9af8f4a9e0e93e9f575ae11e5066aa Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Fri, 7 Apr 2023 15:49:22 +0200 +Subject: [PATCH 5/5] Adjust buildsystem to include correct Qt Major version + number + +--- + Accounts/Accounts.pro | 4 ++-- + Accounts/AccountsQt5Config.cmake.in | 2 +- + Accounts/AccountsQt6Config.cmake.in | 5 +++++ + Accounts/AccountsQt6ConfigVersion.cmake.in | 10 ++++++++++ + Accounts/accounts-qt6.pc.in | 15 +++++++++++++++ + tests/tst_libaccounts.pro | 2 +- + 6 files changed, 34 insertions(+), 4 deletions(-) + create mode 100644 Accounts/AccountsQt6Config.cmake.in + create mode 100644 Accounts/AccountsQt6ConfigVersion.cmake.in + create mode 100644 Accounts/accounts-qt6.pc.in + +diff --git a/Accounts/Accounts.pro b/Accounts/Accounts.pro +index 13804ee..da62da7 100644 +--- a/Accounts/Accounts.pro ++++ b/Accounts/Accounts.pro +@@ -3,7 +3,7 @@ include( ../common-project-config.pri ) + include( ../common-vars.pri ) + + TEMPLATE = lib +-TARGET = accounts-qt5 ++TARGET = accounts-qt$${QT_MAJOR_VERSION} + + # Input + public_headers = \ +@@ -45,7 +45,7 @@ QT -= gui + + INCLUDEPATH += $${TOP_SRC_DIR} + +-CMAKE_BASENAME = AccountsQt5 ++CMAKE_BASENAME = AccountsQt$${QT_MAJOR_VERSION} + + PKGCONFIG += \ + glib-2.0 \ +diff --git a/Accounts/AccountsQt5Config.cmake.in b/Accounts/AccountsQt5Config.cmake.in +index 55a8964..746f689 100644 +--- a/Accounts/AccountsQt5Config.cmake.in ++++ b/Accounts/AccountsQt5Config.cmake.in +@@ -2,4 +2,4 @@ + # ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt + + set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) +-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) +\ No newline at end of file ++set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) +diff --git a/Accounts/AccountsQt6Config.cmake.in b/Accounts/AccountsQt6Config.cmake.in +new file mode 100644 +index 0000000..55a8964 +--- /dev/null ++++ b/Accounts/AccountsQt6Config.cmake.in +@@ -0,0 +1,5 @@ ++# ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories ++# ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt ++ ++set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) ++set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) +\ No newline at end of file +diff --git a/Accounts/AccountsQt6ConfigVersion.cmake.in b/Accounts/AccountsQt6ConfigVersion.cmake.in +new file mode 100644 +index 0000000..616cd60 +--- /dev/null ++++ b/Accounts/AccountsQt6ConfigVersion.cmake.in +@@ -0,0 +1,10 @@ ++set(PACKAGE_VERSION $${PROJECT_VERSION}) ++ ++if(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" ) ++ set(PACKAGE_VERSION_COMPATIBLE FALSE) ++else(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" ) ++ set(PACKAGE_VERSION_COMPATIBLE TRUE) ++ if( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\") ++ set(PACKAGE_VERSION_EXACT TRUE) ++ endif( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\") ++endif(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" ) +diff --git a/Accounts/accounts-qt6.pc.in b/Accounts/accounts-qt6.pc.in +new file mode 100644 +index 0000000..c625b2e +--- /dev/null ++++ b/Accounts/accounts-qt6.pc.in +@@ -0,0 +1,15 @@ ++prefix=$$INSTALL_PREFIX ++exec_prefix=${prefix} ++libdir=$$INSTALL_LIBDIR ++includedir=${prefix}/include/accounts-qt6 ++servicefilesdir=${prefix}/share/accounts/services ++servicetypefilesdir=${prefix}/share/accounts/service-types ++providerfilesdir=${prefix}/share/accounts/providers ++ ++Name: libaccounts-qt6 ++Description: Accounts Library ++Version: $$PROJECT_VERSION ++Libs: -L${libdir} -laccounts-qt6 ++Requires: Qt6Core Qt6Xml ++Cflags: -I${includedir} ++ +diff --git a/tests/tst_libaccounts.pro b/tests/tst_libaccounts.pro +index a5b91fe..9992c0b 100644 +--- a/tests/tst_libaccounts.pro ++++ b/tests/tst_libaccounts.pro +@@ -9,7 +9,7 @@ QT = \ + testlib \ + xml + +-LIBS += -laccounts-qt5 ++LIBS += -laccounts-qt$${QT_MAJOR_VERSION} + + INCLUDEPATH += $${TOP_SRC_DIR} + QMAKE_LIBDIR += \ +-- +2.43.0 + diff --git a/net-libs/accounts-qt/files/accounts-qt-1.16-libdir.patch b/net-libs/accounts-qt/files/accounts-qt-1.16-libdir.patch new file mode 100644 index 000000000000..dfcbe71938b1 --- /dev/null +++ b/net-libs/accounts-qt/files/accounts-qt-1.16-libdir.patch @@ -0,0 +1,116 @@ +From e3882382b2e98bce5be07baf23771856828123fc Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 7 Dec 2023 23:20:32 +0100 +Subject: [PATCH] Make LIBDIR configurable + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + Accounts/AccountsQt5Config.cmake.in | 2 +- + Accounts/AccountsQt6Config.cmake.in | 4 ++-- + Accounts/accounts-qt5.pc.in | 2 +- + Accounts/accounts-qt6.pc.in | 2 +- + common-installs-config.pri | 2 +- + common-pkgconfig.pri | 2 +- + common-project-config.pri | 6 +++--- + 7 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Accounts/AccountsQt5Config.cmake.in b/Accounts/AccountsQt5Config.cmake.in +index 746f689..9280a7d 100644 +--- a/Accounts/AccountsQt5Config.cmake.in ++++ b/Accounts/AccountsQt5Config.cmake.in +@@ -1,5 +1,5 @@ + # ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories + # ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt + +-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) ++set(ACCOUNTSQT_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so) + set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) +diff --git a/Accounts/AccountsQt6Config.cmake.in b/Accounts/AccountsQt6Config.cmake.in +index 55a8964..9280a7d 100644 +--- a/Accounts/AccountsQt6Config.cmake.in ++++ b/Accounts/AccountsQt6Config.cmake.in +@@ -1,5 +1,5 @@ + # ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories + # ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt + +-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) +-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) +\ No newline at end of file ++set(ACCOUNTSQT_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so) ++set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) +diff --git a/Accounts/accounts-qt5.pc.in b/Accounts/accounts-qt5.pc.in +index fbfcea8..faea96b 100644 +--- a/Accounts/accounts-qt5.pc.in ++++ b/Accounts/accounts-qt5.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include/accounts-qt5 + servicefilesdir=${prefix}/share/accounts/services + servicetypefilesdir=${prefix}/share/accounts/service-types +diff --git a/Accounts/accounts-qt6.pc.in b/Accounts/accounts-qt6.pc.in +index c625b2e..cdc0233 100644 +--- a/Accounts/accounts-qt6.pc.in ++++ b/Accounts/accounts-qt6.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include/accounts-qt6 + servicefilesdir=${prefix}/share/accounts/services + servicetypefilesdir=${prefix}/share/accounts/service-types +diff --git a/common-installs-config.pri b/common-installs-config.pri +index 82baf75..420accb 100644 +--- a/common-installs-config.pri ++++ b/common-installs-config.pri +@@ -17,7 +17,7 @@ contains( TEMPLATE, app ) { + #----------------------------------------------------------------------------- + contains( TEMPLATE, lib ) { + +- target.path = $${INSTALL_LIBDIR} ++ target.path = $${INSTALL_PREFIX}/$${LIBDIR} + INSTALLS += target + message("====") + message("==== INSTALLS += target") +diff --git a/common-pkgconfig.pri b/common-pkgconfig.pri +index 975068a..9f010d3 100644 +--- a/common-pkgconfig.pri ++++ b/common-pkgconfig.pri +@@ -3,7 +3,7 @@ + !isEmpty(pkgconfig.files) { + QMAKE_SUBSTITUTES += $${pkgconfig.files}.in + pkgconfig.CONFIG = no_check_exist +- pkgconfig.path = $${INSTALL_LIBDIR}/pkgconfig ++ pkgconfig.path = $${INSTALL_PREFIX}/$${LIBDIR}/pkgconfig + QMAKE_EXTRA_TARGETS += pkgconfig + + QMAKE_CLEAN += $${pkgconfig.files} +diff --git a/common-project-config.pri b/common-project-config.pri +index b856961..0484e36 100644 +--- a/common-project-config.pri ++++ b/common-project-config.pri +@@ -44,15 +44,15 @@ INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib + isEmpty( LIBDIR ) { + message("====") + message("==== NOTE: To override the library installation path run: `qmake LIBDIR=/custom/path'") +- message("==== (current installation path is `$${INSTALL_LIBDIR}')") ++ message("==== (current installation path is `$${INSTALL_PREFIX}/$${LIBDIR}')") + } else { + INSTALL_LIBDIR = $${LIBDIR} + message("====") +- message("==== library install path set to `$${INSTALL_LIBDIR}'") ++ message("==== library install path set to `$${INSTALL_PREFIX}/$${LIBDIR}'") + } + + isEmpty ( CMAKE_CONFIG_PATH ) { +- CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake ++ CMAKE_CONFIG_PATH = $${INSTALL_PREFIX}/$${LIBDIR}/cmake + message("====") + message("==== NOTE: To override the cmake module installation path run: `qmake CMAKE_CONFIG_PATH=/custom/path'") + message("==== (current installation path is `$${CMAKE_CONFIG_PATH}')") +-- +2.43.0 + diff --git a/net-libs/accounts-qt/metadata.xml b/net-libs/accounts-qt/metadata.xml index 8641e5bdd399..17eb6070226c 100644 --- a/net-libs/accounts-qt/metadata.xml +++ b/net-libs/accounts-qt/metadata.xml @@ -5,4 +5,7 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="gitlab">accounts-sso/libaccounts-qt</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest index 586acc0c05c8..8b1e603d862b 100644 --- a/net-libs/aqbanking/Manifest +++ b/net-libs/aqbanking/Manifest @@ -1,3 +1,3 @@ DIST aqbanking-6.5.3.tar.gz 2690700 BLAKE2B 2a6407a9d6bfe6a7cfa3b3f4b6d3183b801bda8914770a11d48491fa7bc48e9b034b7eb5d220c6181725240e4475460a11c64df2d73dac98ccb30a61d5de5bca SHA512 bca4449981f9660dc7de8506a2088981b52dcf4ded765fd337263962b464b7903319878e8efbce6cbef043b65be8edb828fee873f19e8c6b2fed0cf7906d58b2 -EBUILD aqbanking-6.5.3-r1.ebuild 1328 BLAKE2B 7d0ad3c9445756882e292aaef683d3d555fe35a7ee8fbfc18301b1c1af6dcd2dd5a1213ebeee6d3b6d4dd461903451744e1221f4026d779d4ae55ba27238ee96 SHA512 74cb5cf8603a6403a7753105853a07d6a9099807ec3c75aad1ead44b59b47a4b750cb77872eeda3501890b34a9bbde80c1eb328b35fb03db21c92090529bfc02 +EBUILD aqbanking-6.5.3-r1.ebuild 1329 BLAKE2B e83795249b2905656a3f21bbd279cb1aab11924748ccdb57b0f66b9b5ae0bc9b12da0dca6a7c3ddc07a30d063c9e7812580098b8d81b76ad1acf1cd75e19f615 SHA512 3fe8dd98f462bec08dd2d54cd620221ed7b99905001cc228d6d4fd03a4f0bacb91eb4f37dc86b2e3e8ec4c9cbac579394f7e66c657b991859926b1461bf69070 MISC metadata.xml 294 BLAKE2B 3e8d1f1507f7ddb3187be8ca27bb737073510725cb99e38816a95ae321f3c06428131cd55ba2d825749d4788e7551c4c6492804b4f2b60039370209af1b2115e SHA512 f0d83a3d07d5fce12d53c0557f32648a8b3df0b2a85d927a53531910bfd24762f32284dbc2f2c8d5dbb2aecaf96060c0f5f3fee5adfb2b12fb2cc60194a5907a diff --git a/net-libs/aqbanking/aqbanking-6.5.3-r1.ebuild b/net-libs/aqbanking/aqbanking-6.5.3-r1.ebuild index 97c9bc415b75..a0741935a412 100644 --- a/net-libs/aqbanking/aqbanking-6.5.3-r1.ebuild +++ b/net-libs/aqbanking/aqbanking-6.5.3-r1.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 @@ -15,7 +15,7 @@ IUSE="debug doc ebics examples ofx" BDEPEND=" sys-devel/gettext virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " DEPEND=" app-misc/ktoblzcheck diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest index f954704e363e..2b14491dd4d5 100644 --- a/net-libs/axtls/Manifest +++ b/net-libs/axtls/Manifest @@ -3,5 +3,5 @@ AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb23145674 AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18 -EBUILD axtls-2.1.5-r102.ebuild 4523 BLAKE2B 9c1d728e6f0969b4469631022fe5b0e106f355c90278d9a0249b9917d1a793111d4cb756f7cec30fed99bad7c70f2605850343364012f0c261a5d8dd7bbd4aac SHA512 1e235123cb943036fc8dd1a959d098bbe7811c924f011cadc80cb82c1001a4c90602a87e345fd46b2fbd2d7aacf54b9a5f43ba6395a9e8dc2075aad71409834f +EBUILD axtls-2.1.5-r102.ebuild 4524 BLAKE2B 93b7168c77e73943db40882b23483c286c7cf05f9a9d26a8341a4cbc4a127cfaf9d5f878166f0597e874f42a0c21888aeecdec68a01de3c4006a79997ddff757 SHA512 4ecbb903cc7e034023586db5afb7c588116ad60e97ea0a84abc3aaeb4659c8dae610561144d4665a9606fd974be302d2c685f9f448cdbe9d5667615457f63700 MISC metadata.xml 543 BLAKE2B 8c544c59171270a2280c1018f077ed1d5385e4de87f133155baf88be1823157a0c0c8587620ab542b87102fd01c75919daf72e82f736fb8d65cbced67e2536ea SHA512 d36334d336738a6d6529da42a3132dc988aeecffe4bb7d5ea78fbd6f4b008b88a7d23a216d69f7bd1b07e2746f75ace61a75b0c7426395a8259398c910827e7c diff --git a/net-libs/axtls/axtls-2.1.5-r102.ebuild b/net-libs/axtls/axtls-2.1.5-r102.ebuild index 046f79d41d75..dbf955fd07ab 100644 --- a/net-libs/axtls/axtls-2.1.5-r102.ebuild +++ b/net-libs/axtls/axtls-2.1.5-r102.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -48,7 +48,7 @@ IUSE="httpd cgi-lua cgi-php static doc" # TODO: add ipv6, and c#, java, lua, perl bindings # Currently these all have some issue -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" RDEPEND=" httpd? ( acct-group/axtls diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest index 21827e76e2da..cc32b49d0c1e 100644 --- a/net-libs/davix/Manifest +++ b/net-libs/davix/Manifest @@ -1,5 +1,5 @@ DIST davix-0.8.4.tar.gz 7616367 BLAKE2B 0048d066b5ebae0639ea511dfb9147a5c76b73e5f273e0912abd7a10c40228bbbc60fea56f1b91a1c64b396b5ab67a291b42743e037e1e61a14aee2fbb783e09 SHA512 09a0389788b525e3c29639091c11ab4dacf1668efec42a93f3e995663793467b7aaf43daf66351e8a140f760711e96391c1cce0759a7f198110ebe511c0c7a4d DIST davix-0.8.5.tar.gz 7371985 BLAKE2B 134c4bd35627edcb46bfa5be3ea56b5a6373ea2bfee0261ede722fb4419808e6050b1846a40acf92da75626289e54a6b83f11dd2145b9d647f7cb370d652b696 SHA512 cddd0d7c08566853bb09efbe83041c9261086f972fd207f1ae2b0099dcf6f5ab51ec3889556ad34e28c0be28afcf86fa8adcdc1806a02a884ec3e76573164fe4 -EBUILD davix-0.8.4.ebuild 1748 BLAKE2B 839db21a31e9da3deff82ac62efeffd2a7055a863389ee39c297c3b734335ff0422a803baadacbff89bb065985fa3e904a0fdabe6555edba250f286a230cb38e SHA512 fd52e5cb708dbe8db11008661ea0320c7c503acb7eaa2ec50b7f4289ac631cc1706d625872d4ffbc35fd66ea96164978644ba7cf369b57bf5075dcd61b1a289e -EBUILD davix-0.8.5.ebuild 1750 BLAKE2B 7bbf359c892104f262260eb9db0efc2b410442200b7bf0022515cafb94bde6e9cad5cb649f5921af6e372645a707ce0f0d555aed276931e2bf80246f6dbc5ef3 SHA512 68f175f61df5d07b140b45f08103681ade41018342bddadc4f8a1825e9d74744db03e2c4c9dcbb19b4c6bf9d2dca7ed780e12f43a5ec8fb4e9d00807bb7bc43a +EBUILD davix-0.8.4.ebuild 1749 BLAKE2B f521c0e537082706742bdd0b756592a9d4a2305065e2d83620f9ca0ed4a30b39bacb48972e4178c509d6ee63e34bed680ee801b0f5c6d5cca43b84123386fd29 SHA512 9c24ea88b90cbe15eb813612661557281bbd643b80165c8bc9f690f5951d2063d24639d7f32a383e940eda078b993250e8e277d9e9e732b28f7a50d7543e26dd +EBUILD davix-0.8.5.ebuild 1751 BLAKE2B bd7ff8d06eda4fc7247acc6f3354a6ac117ff98e0f6fd90c7aaaa467d951182f9e4fa91e2c7beed38fb6219a17c36c97e63b888d0fb1a0fe4342d02db68a9950 SHA512 159632ae5e7b0d7a05b327ba6dc69861611f665800c9655a2eb5b9266683894cc6873efa345fa7b906576d50a3f3e29622a648448ad0501916b03d5148e8ab4f MISC metadata.xml 411 BLAKE2B 2337249e053b9d5328625bc392a9234c61dab65c76d7eab80cf3ae928eadb39d9de9c952fe9f52dca01623ff4012eb121f78b0c32138e0c833dec494e683ef84 SHA512 dcd6132646ff919ba6ec3c4dbb9a31745edbc0b5faa658fe7c0f4d42737122d5294aff00c293a11ba7d8c0bafd10a931dd519c04245c8618c6ea969ec4f9e2ea diff --git a/net-libs/davix/davix-0.8.4.ebuild b/net-libs/davix/davix-0.8.4.ebuild index c09c04985e65..07d1660f6f24 100644 --- a/net-libs/davix/davix-0.8.4.ebuild +++ b/net-libs/davix/davix-0.8.4.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 @@ -28,7 +28,7 @@ CDEPEND=" DEPEND="${CDEPEND}" BDEPEND=" doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] dev-python/sphinx ) virtual/pkgconfig diff --git a/net-libs/davix/davix-0.8.5.ebuild b/net-libs/davix/davix-0.8.5.ebuild index a42596f7f80b..3db5aa1aa72f 100644 --- a/net-libs/davix/davix-0.8.5.ebuild +++ b/net-libs/davix/davix-0.8.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 @@ -28,7 +28,7 @@ CDEPEND=" DEPEND="${CDEPEND}" BDEPEND=" doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] dev-python/sphinx ) virtual/pkgconfig diff --git a/net-libs/kdsoap-ws-discovery-client/Manifest b/net-libs/kdsoap-ws-discovery-client/Manifest index 1b9e9b814d8a..d4aeb6aebd72 100644 --- a/net-libs/kdsoap-ws-discovery-client/Manifest +++ b/net-libs/kdsoap-ws-discovery-client/Manifest @@ -1,6 +1,6 @@ AUX kdsoap-ws-discovery-client-0.2_pre20200317-no-install-docs.patch 467 BLAKE2B 1b972ba3ae3a6831d49c1c2986fae4ff75fa051964b1c39399b413d724c7c93fef6bc9e740a7e0f10860b64e228f1f18ad1f4836e887aec67d0b2addf7205892 SHA512 2370c1571dcee014b258f388a8a6401a331afc4a2ca0e3491e112ad686bc822cb780b155a1f74e4a8dbe315a65207cc22e088f2471ba621b645cc8e043829903 DIST kdsoap-ws-discovery-client-0.2_pre20200927.tar.gz 37493 BLAKE2B c0dff21554bc56c4055c74a166a85186d67b0378f7bfbfcd3582ae7b992aaa71cefb6b794258fa07b37fcdd1d42ac2bf9fbfd7cd8142f8f77b1ba9791d683dae SHA512 86f8c4eee3fd484253ee91190092a9ae0dbd3d0c536ec25a6e3ec35be45d4a3d320cffbfc0ed2024d447788b43c9df88ca81181157720ce8942c9034d4eea49f DIST kdsoap-ws-discovery-client-0.3.0.tar.xz 30948 BLAKE2B e8a9e0f0cb3eee9e942436b4a8d07d7b8ab6578fecd5b3d59aadee7af91268945c4b4c37619212fb0f54038de65d38b318c33717f3e0eff07b088a101a0d72c6 SHA512 24c437686fc7d6659f610d030b263cef33c35e4c4f4f8a750068d3b2dcd166142d32d21c3d15a14f6ec7eb87b28d883d1d1ba8e11497ea75a1328e29a256a5c8 -EBUILD kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild 1286 BLAKE2B e978f40eb31627f5bb1b040c26b0a559e49322251ec4d020891bd4e7ccc5b51de66880f57a513d2d6e94d54cd55b79987915090781da9b9f9a0c3e15424bf5b8 SHA512 875183c1a22535811e0deaaf96c2222c5146d2d22f4f2fb1bf6fb162f9d6f6162d75d58bb8356b0b0b8bce9c6a9caa163198d8528d09cbd6227812729d03e109 -EBUILD kdsoap-ws-discovery-client-0.3.0.ebuild 1103 BLAKE2B b7bdec5a36b215d13f94ea18b84405398c29f6d67f44fd25828cd354a84aa92e654576fc28929d2399eda0bb21247bc0a12ae4ae4b82947af261b22445f68c34 SHA512 e7ec3afc71d32e019dc083d796a24ff27fd7c86ed53aee9a024da511393a6852f75650e1536240e090bfc50ce6085a6770249a5b633ca0e9f455a498adf2bd8d +EBUILD kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild 1287 BLAKE2B abeea4047a653f5fd3125b5ba0704e87f77b110ca46c557af7e90c4265a256c8cc1221ae736b67598c4b9ac9b408c933e79d160ed79f91dcb811b5fb67126c6b SHA512 bd7718dc7a3f54c5269d37f93c10918a7f31bac78ff03285ffd90f7241f6313296c9a8f104e87606b9a8ae45eb49b82be477dcbf518f7b1eb08d167293d0b4a3 +EBUILD kdsoap-ws-discovery-client-0.3.0.ebuild 1104 BLAKE2B 1d6dcbc16a1f7cc8ab7094f80faf4f89eb4a53bce88058af429fa297d1143e134111befe2b5f67ec74d5d421e573a53c0a392928497d58ae4fc58af28cde2d25 SHA512 c494d6d3764b77c1f89347df691ee0c527fd81a939fb7fcf2cfb517e90c94886b837f6bff1e22b9187bfaa9e3a93f1bac0dd6a1a758e9f7a9df807914880c2e1 MISC metadata.xml 355 BLAKE2B 837ce719b98553c8995bcf17d26eb6e6adb4679690029677487e14ae2026c4ad40ca1431a7133d026de65a27a74494b6be51dfa60e1e88dd06e3c86a55276a3d SHA512 138c43e593a78fa0983dd4d5abc1a32f50a33ef34f24adc45d64eb040eb30934325af7912f070348b4bd41cb1575f76740637100915f5baf1a45fc8bdcdf1972 diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild index 56cfe158fc12..2edc08a9eea2 100644 --- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild +++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-qt/qtxml:5 ) " -BDEPEND="doc? ( app-doc/doxygen[dot] )" +BDEPEND="doc? ( app-text/doxygen[dot] )" PATCHES=( "${FILESDIR}"/${PN}-0.2_pre20200317-no-install-docs.patch ) diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.3.0.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.3.0.ebuild index 96289b56c583..94d02706a782 100644 --- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.3.0.ebuild +++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.3.0.ebuild @@ -29,7 +29,7 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-qt/qtbase:6[xml] ) " -BDEPEND="doc? ( app-doc/doxygen[dot] )" +BDEPEND="doc? ( app-text/doxygen[dot] )" PATCHES=( "${FILESDIR}"/${PN}-0.2_pre20200317-no-install-docs.patch ) diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest index ef8d854dbcdd..283a78e16901 100644 --- a/net-libs/ldns/Manifest +++ b/net-libs/ldns/Manifest @@ -4,8 +4,8 @@ AUX ldns-1.8.3-docs.patch 3940 BLAKE2B bf0823b32dcf5935fdccee131aa52f597a229c8df DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1 SHA512 54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6 DIST ldns-1.8.1.tar.gz 1284971 BLAKE2B ae01ef32571fe3996ddd41f911815239abb704ea1dee479fa612bfd701ca369222ab709923f014662248988cb4452a75bc5debad47d2b0386dc59169b353e6a3 SHA512 600f8e221716742caf439a425008827aef1814fc1d9e751f8f492d0235ff45ca48df90abba17979bac9f4485947bb9fe8102924d9cebe6cb56d5b788e1c4bd14 DIST ldns-1.8.3.tar.gz 1299856 BLAKE2B 2250445da3beec76c96fbb5cbc00f8d6a5bb6ed5867da7f23511d46ac73d6101303eb6ad85def426b7f9287f6a629a95117bcfa6eb46b775d07ed84048162c7f SHA512 c318747bd975ade389d048680b80495fb083b46507d8dcea7d4d42c75823f56a35b438dcc5320803d39583e5a1e515a51686f7f9010c061a6e8199e1a5505ae9 -EBUILD ldns-1.8.0-r4.ebuild 2970 BLAKE2B daf7f3e9d06f4d45861278b75951e5eb1792f8d721229dbb343d2c6e41fe7ba28a21bea5f46a456fb94edab312a7b35a620dd115e02ecdfd59c8755a8cf23885 SHA512 05c6fdfad9784b3bd38d52bb6ac2f09617a109ddd3c24ce99ac57f5c52270da6ce229b9c1d2bb886b9109dc112a7596bb24355ced8b3f9cfb2983bd24b672f8e -EBUILD ldns-1.8.1.ebuild 1842 BLAKE2B 8ec37b4adba589508ad5ebaa4fee0c6326c6d6ee7659e46a4d41f25a69549b3ee460e78ffe24dd9e4b5c763b773100d3d871e169c0c64b08c3f2359d5e7df1d0 SHA512 c551fafcf95fbced99f02d5ae81ac5596038f51fa2dbaafedc6001369ec2d50a197e2b345ec500488b3a11f3058d3586d759b32f122cc9f8b4638fa55a23c926 -EBUILD ldns-1.8.3-r1.ebuild 1942 BLAKE2B 52da64d464f7973f4222bc37c85b595ed3b948e93c6621001b4e2f6c4670513bdbe6b9597f947eb980f134080ad4d861aedcfc42989ac3a500206dc44e695355 SHA512 f6c2746715b1995ea7f648b076325472714194e699fd44aa87ffeb9564f8934a0e07d3efdb095e85b798226d00c9c6f0ed95f0f8a641328378f86bb96418f359 -EBUILD ldns-1.8.3.ebuild 1949 BLAKE2B e250146286fab7c4b498288c769cbdbb7391d56aad00a1854bd73a2e35827dbd6935de52584fbf22292c878327e5eb0df7bbeef3e611ff1482b1d9d1ccd33c62 SHA512 4c6b2b302918f9ab4ed8ab6a8f5eb31feb73f153e95543fced9669836e73bc93575dc650602069594f02a45e2c50b46d098b0a7ccfd386ba486a5d4de35e6e2a +EBUILD ldns-1.8.0-r4.ebuild 2971 BLAKE2B d2b95b97029f2aa651c2686fbe880fcf78ee1bca76065da6c6b215fa89d6fe0c6c31face129a85ff60669c9baaf2d578f0f9485642ea1c6d8dd15df3ed8d593e SHA512 624610ce9274dcb8ed81e4645d4571af67bce77f623245fc0c212c395d58762b3e091b2532ecf51db96716fea94799a04e4c026a2cbe86c2040c37cd48cf673a +EBUILD ldns-1.8.1.ebuild 1843 BLAKE2B e8a701f4a4b3928fa7df6018bd263a0fe64184278badfb640f87ef2e1b5f4c1a2449866080f5849561429fe0164db103d014c9d6a2295d37502584bee4564d4d SHA512 0a76c332c61e0adc75d556714fec3ce7cc1ed2f43832a8bb373463b7c4e6e99a4825c6743a58e8a6acc35d2b367d3263e81583da381e0e7d9b1be13c7ec8dfa4 +EBUILD ldns-1.8.3-r1.ebuild 1943 BLAKE2B d37692bced21132fb8da0c52219641fe340a10bc8e63c1e756fa04765fb6fa5bc621973f029c3c291bc296daec6e322ea0dc33896e59dd0f324ddbeae6f31b16 SHA512 7a612d4b5a1dbbb833059529905b94ec272f0bde71fe60295ab54a52be37f17909fcaa5e0752de6f5e453ef568c07cda32d4bfa453caaecfad55f9068dc793c5 +EBUILD ldns-1.8.3.ebuild 1950 BLAKE2B 84a5d557237f3125a7a20962e3c80b5c4a10656318e8e0ef32e9ec6ac404cbcc7d10d0b8b22950743a8fa7a37a364123d99a24d0bbaba2caae3af134c08d7a35 SHA512 0c116e51495bc8e54869e38da1a9e5865f32ebc0fd377873ae1acb62f8efac873554240ba68168eda0c9c5dc3b90877a1bce2f3995c96daa468fa4dfae103b3d MISC metadata.xml 933 BLAKE2B 4382e8d75f379211e781a0309b483105cbdba740cbd473b29d6b892351d3a5d270487c759ba7a1f5bcad448222cb1c24ef8257cd089c54ce9df0523ff708888a SHA512 395c02c568874e3d22434431f5e72dd98a647455ec0587723cb447c4d5a2fb468256bb35aff2c74b8255203d21f4d844f5a4ad426037eeb907d67ffedeb6d74e diff --git a/net-libs/ldns/ldns-1.8.0-r4.ebuild b/net-libs/ldns/ldns-1.8.0-r4.ebuild index 12cbd068b4df..d1d069aba919 100644 --- a/net-libs/ldns/ldns-1.8.0-r4.ebuild +++ b/net-libs/ldns/ldns-1.8.0-r4.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 @@ -26,7 +26,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} python? ( dev-lang/swig ) - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " RDEPEND="${COMMON_DEPEND} !<net-dns/ldns-utils-1.8.0-r2 diff --git a/net-libs/ldns/ldns-1.8.1.ebuild b/net-libs/ldns/ldns-1.8.1.ebuild index 310606f4c952..00759dab1a36 100644 --- a/net-libs/ldns/ldns-1.8.1.ebuild +++ b/net-libs/ldns/ldns-1.8.1.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 @@ -20,7 +20,7 @@ REQUIRED_USE=" BDEPEND=" python? ( dev-lang/swig ) - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " DEPEND=" python? ( ${PYTHON_DEPS} ) diff --git a/net-libs/ldns/ldns-1.8.3-r1.ebuild b/net-libs/ldns/ldns-1.8.3-r1.ebuild index acb50358cb16..332c7eb493fb 100644 --- a/net-libs/ldns/ldns-1.8.3-r1.ebuild +++ b/net-libs/ldns/ldns-1.8.3-r1.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 @@ -19,7 +19,7 @@ RESTRICT="test" # missing test directory BDEPEND=" python? ( dev-lang/swig ) - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " DEPEND=" python? ( ${PYTHON_DEPS} ) diff --git a/net-libs/ldns/ldns-1.8.3.ebuild b/net-libs/ldns/ldns-1.8.3.ebuild index 04665c7bc53b..d6ce039b9ddb 100644 --- a/net-libs/ldns/ldns-1.8.3.ebuild +++ b/net-libs/ldns/ldns-1.8.3.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 @@ -19,7 +19,7 @@ RESTRICT="test" # missing test directory BDEPEND=" python? ( dev-lang/swig ) - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " DEPEND=" python? ( ${PYTHON_DEPS} ) diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest index a5ff5f07ae27..335eaf5e8750 100644 --- a/net-libs/libad9361-iio/Manifest +++ b/net-libs/libad9361-iio/Manifest @@ -5,6 +5,6 @@ AUX libad9361-iio-0.3-cmake-gnuinstalldirs.patch 2218 BLAKE2B 5275c4eaaed38f3814 DIST libad9361-iio-0.2.tar.gz 167678 BLAKE2B 9880114bc53f3d4975dbe0773f8d112e40b0df47e34985bdc68c5b6740aee2c140ced39353929a793c2b327b5811461436ceb2934c2a71fc7b92b218092d468d SHA512 f95fa955531198ab33c16d41685d23140e875b2eafa1da10cdf60a7bf1ae760e86e2d3d28c9ab36a3a7b7a90e36bb53456dec1d6e537a1574a5505b7595e764c DIST libad9361-iio-0.3.tar.gz 188475 BLAKE2B bdd3733ece66f1b34075821316ce054537059297964cc4bd92bc4c768d1253a2b6d1822bf6cce20082395b0f7d72ccc63a5002608f8042494a6a543a3e0369a4 SHA512 904f81fead71a9c93ccdcdb8822247fc8c496920abb9b13ea4b2b0465d50f5c0115ffc8d226496e76f7bb23b466031556129b18a1f35c65c30dcb3b0c1aeeff9 EBUILD libad9361-iio-0.2-r1.ebuild 763 BLAKE2B 9fbbe38e6efba6f01640b339a6d6e08a5695bd6c1ffffefd970057b5b989fd988607071166f8759109f7c71527b3fe404e38c0b025016f9bbfb78d5184c54656 SHA512 ebc2dd5a8882762d7308f740b6cd690b4ace1e496f646ef490381973d0f1c598e87115ae0e5a5be9b4d7c6a0ae2b6d4aa23c83a91c43e7f4872b23d42e9b0eef -EBUILD libad9361-iio-0.3.ebuild 1082 BLAKE2B d563c4dd59dc38b91d508245eee20ca5c4fcec9972454746110958fed9e7f73014a8adc393ffba05ffd1dcf20892a0444c00673246abe013988261f744246dfb SHA512 ceebdd408d68839ab64fdda37696c0d11a3c066f411c67b83fd7e3126fb7004ac3024b774b15d02ca8e804fdfe292f60a217c20cc4393124085832510a3f921e -EBUILD libad9361-iio-9999.ebuild 1030 BLAKE2B 4b443c8a18453d16b2c57113aea9cf7d3f3a740ef5369cd6ff8a1284aa75a708a4d3b1347bcfeab3d46d56aff38af258cc7a875e7e82d38868777a9713155398 SHA512 7433d6e64c475e292c950184aebad3472d1e0384bde3347b1877876ca8a1074008463364284f0ab53ecd4f72d50704c1a4d5aed5e3a5345e7c62b9cfbebd997a +EBUILD libad9361-iio-0.3.ebuild 1083 BLAKE2B d77abfab35d7ebe30dc6634ea0d75590b89cd62b45ecd188d188dfdd609a60f722425af241a61a6c87365f2c349811646c2fdbe9353c9a949be194054199a2ef SHA512 33f043a9127382ed9da2839d8730c00f0266382a712950f1c8bd6fa61adc82cbfd5e0702b25dcd2f880b149dc449bccdd35296f1442dd7097e9f00f64e0891da +EBUILD libad9361-iio-9999.ebuild 1031 BLAKE2B 55738f4f7f48fb5e3f07768e19de83338d81dd5f96c48de7b1fcadcf2358fd766792cb320f277ef249588fbaf3689c5c81ac839fd43b3e01a2c1b01610e04174 SHA512 d44aafac770a0af95516bbf0f425304f4c3eadcefe59fbe0865dc6af39b4d94c573bc6d909a7df8f29ac07b1e43e06edfe9565bb3e252cc9bf8d43f79f3dd7d9 MISC metadata.xml 442 BLAKE2B 4aaee897fc8e0ec7c1081c20bcee1470aaeebd3f14252177861cbaff053a29c4b4b6a5476015252d8a75e8dd191d45e3c3c6f0cd6a08f41d3374831f3c392ac0 SHA512 b8e19d2f3382733f2756c406a7f08635956973c32cd8ec400bed18445dffb51d0595c09040de74bf907d32f6119976326b4ba914d29e74e65a9bc7eb1d3016cc diff --git a/net-libs/libad9361-iio/libad9361-iio-0.3.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.3.ebuild index 4150b0e0fb58..27c4c9cac2bb 100644 --- a/net-libs/libad9361-iio/libad9361-iio-0.3.ebuild +++ b/net-libs/libad9361-iio/libad9361-iio-0.3.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 @@ -21,7 +21,7 @@ SLOT="0/${PV}" RDEPEND="net-libs/libiio:=" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" PATCHES=( "${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild index f26413486b48..d0bab6787776 100644 --- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild +++ b/net-libs/libad9361-iio/libad9361-iio-9999.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 @@ -21,7 +21,7 @@ SLOT="0/${PV}" RDEPEND="net-libs/libiio:=" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" PATCHES=( "${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch diff --git a/net-libs/libasyncns/Manifest b/net-libs/libasyncns/Manifest index 30c75a454ff7..8ea76ffd8d5f 100644 --- a/net-libs/libasyncns/Manifest +++ b/net-libs/libasyncns/Manifest @@ -1,5 +1,5 @@ AUX libasyncns-0.8-configure-res_query.patch 428 BLAKE2B e19cdfc88ebee7f22dac6dad6dc302fa80957464c91eb8907ef75bd3f5fb32d7b985545a1aafccf2cd228688c16ab731ddd9c5315083f8f4d117a9a6d4ee731f SHA512 ed338a91575f9e642c3da9764348fb7d4e5b2d0da4ef9a849a4cb176df96776100e59b419bbc9206395252d8317c20c5cfe1b68e008825fde1192e24dc9f8ce0 AUX libasyncns-0.8-libdir.patch 299 BLAKE2B ad0b79b5725877642c1b03c8183654be8d54e78e44bf7ab4de3c8bd1ffc5ceb2e6cfd250cc4725c2a0491d062d12124faf55fb20b07887e1f47cee7ab156f0de SHA512 b4a42a4241034756feeacdcd9a7d6e57a8b2d9ae945b149e05c6ea9d8b33791733601ef9d153e75d7979079cdf4c02c4136f881236e2a2b393ce070021c3a2b0 DIST libasyncns-0.8.tar.gz 341591 BLAKE2B a93e7fdeb6e686cf3ed87db8fe2473f8868defd5bb6a29497c48d970d1ff33c550b5521d84a224314c9e93bd4cf09f502bde0fbe1c4d2680f6fa07f1f1a224c6 SHA512 2daad3a2d9eb875e0575843d9e9e2787be6cbba89211fd073fa8898ff80e0a891c7da1a7b0ef70f306318cb3a963ecd65d53d24d08b5f6b98e7cd2a3b3bdcda7 -EBUILD libasyncns-0.8-r4.ebuild 1251 BLAKE2B 288400463a0c75b8940d745a66436d5c1aa98ab807116994fb3927858ff833ae493f55760e888684b9cd0d43ec1f4f81832f1fa5c9f5fb9ffc4c6e08052f0e75 SHA512 11df392e6354c818c979ed91ddee889f01f40baafa64ec44f6e30526bbe0db380cfb4fe8f147a08be5a3e643f3ccff43feea73fcf1cb7fea9c7e7469ab9c21df +EBUILD libasyncns-0.8-r4.ebuild 1252 BLAKE2B c6bb35fdc76e27b4f8c3b5cdf43f1f96450616389930787375a62b8defcf955c3c2e8737b2743b9a67373525b85e32c2b73f3fe5ae988cf3f030a9f9375dc790 SHA512 0d7c721d4ef852d18172a424435e9e69df08a7e53f9ee0477f55b6058bdc40e753fe86a40c95193dfbe8afecc4ea8d2345efb346448cdd0d159abd0a2d7d9e51 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild index 93a117c9f3a5..243c2e1db04f 100644 --- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild +++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~ IUSE="doc debug" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" PATCHES=( # fix libdir in pkgconfig file diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest index 643dfd23ba83..598b8d02101e 100644 --- a/net-libs/libgadu/Manifest +++ b/net-libs/libgadu/Manifest @@ -1,6 +1,6 @@ AUX libgadu-1.12.2-fno-common.patch 907 BLAKE2B 22e147267c88ba1bd7fc1f289332517f7ea72f684fcaab1a74a0da0ee7ab8a1dc8e6e3fc5dd9853e22c11e326c65d08ff26a6f6fe85d44843398b6d574cbf629 SHA512 f4179768b86b80d71b6ede4608bbb598f7ec2d9d5e901d925436faea997ce23358707910a9b4f7adc1f290c369d2ae664f74f96b01de35e8220e96a79c5c26b7 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677 -EBUILD libgadu-1.11.4.ebuild 1059 BLAKE2B 5b15b69094220a19f8da329e839c05e4a52aac8d2ba0609580c2361c7016dc42552af3b48a3da9ea46cd138140202262006c3c1fb471b6d3a10535d1a569ca7b SHA512 754495fcea55eb89db427f48c016d52c9cb457c94bb4022f13089e4820cce8cdf29006afcc0654eb8318ae647b6349bbf28ed075ffbe733f15a7e2017678d3ca -EBUILD libgadu-1.12.2-r1.ebuild 1188 BLAKE2B a251057af9b8c9eaeab367338970c802f88fb2b2773e02175485c47ebca4552afcd67e94f2c138e875f6b7d1c2548035ba64a883f7fb9bbe87db15e2b1d39252 SHA512 c4a2142ab3ef9692cef99024bd26219a9e700ce06529221b4210a317fa38229a50bde8d33b77b3c0638c2f458baab35101b2baf123ee24a20abdac6e88285d40 +EBUILD libgadu-1.11.4.ebuild 1060 BLAKE2B 160eb63861a4f3537122e90b8a22929e9b2cb255c0204a291972a66b0e394733805be0e4a2bee9f595cccecb7dc32128b9571a6af9d6891a2aa69d0363c27116 SHA512 8c86784ebe66c425fd94f315bf2dd6ec4afd36d2507dcf7a6cf780488f826512a5841aa41a4b433ccbb8810cc819c484243e0ec26f7b2b91fffb2323b7f5b747 +EBUILD libgadu-1.12.2-r1.ebuild 1189 BLAKE2B 72a44c971fd02175362522271d7c1a54c3e3d6d5236a71ad5023d9111f4e7307bf4b636964e995a665129a5d2993f71661928ed9c13357ba440774b59f2445ae SHA512 53b4db7daf6ddf256527565e910ea829d5b9f7d628322da3e87a17e6faf64be75fdc4435dab49008aa3d179253935a8211fd37752c66f1b94f1e776258e4af5b MISC metadata.xml 333 BLAKE2B 73a1642fc54c87fafd5a02ee1ac2c4260c36acc6188daa2cc6ca4f0fa648916da5acf2bd557de1176fe0cbe484211c886d008196aab111bd3fa86f7205dc7403 SHA512 39ae90c603a4fdd4f3e75d109155658cb1484fda41300fd27d55590e2a2a2f47da5add1f7f2873f47b339e06828f975bf7441f502edbcb548a284e6f012434b9 diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild index 7f3392a75a41..b04edf0fbaea 100644 --- a/net-libs/libgadu/libgadu-1.11.4.ebuild +++ b/net-libs/libgadu/libgadu-1.11.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ COMMON_DEPEND=" ssl? ( net-libs/gnutls:= ) " DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " RDEPEND="${COMMON_DEPEND}" diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild index 4fb4f5df9f5a..7a7597d44c42 100644 --- a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild +++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ IUSE="doc ssl test threads" RESTRICT="!test? ( test )" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) test? ( dev-libs/expat dev-libs/libxml2:2 diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest index 085ebaa83703..d8e3353efe0c 100644 --- a/net-libs/libhubbub/Manifest +++ b/net-libs/libhubbub/Manifest @@ -1,4 +1,4 @@ AUX libhubbub-0.3.6-json-c.patch 1020 BLAKE2B ddeeec6a9dce9329b91fd09afd347663aaaf1bd3b5cae0ecbc96520d8e4f034e6f1a2b8d6caee19419f38ae8aca96f51baba64b072d8c8affdf8769b8cf9966a SHA512 33c8cae170757b5890d7168c8c2e7ceb013aedbb322eb8b57854264bd6e470472ad88a737ca360ef2eaa6d732f3f0ee9f6592def2b1803d83335ae47f02f5ad8 DIST libhubbub-0.3.7-src.tar.gz 784780 BLAKE2B dd7bd85d3401d87c7bc72dad5d6d0439ab826cf97e76a29367a045215621cb66ff6e97f4028f552b7f395691087f53df077075dc65115a41a59eca476f73305d SHA512 d8ae4a8c4ded2c0e73902bfcf4d5d353154e27f236be0f6ea878cc2daed8a399378a4a9c2021f96106e1c822585b1daa09c9bd49c1551d3e87f37348865cfce1 -EBUILD libhubbub-0.3.7.ebuild 1220 BLAKE2B 5590520fbd40fec2c9e24f1fd3b78b279d4b8a7d43ef1d6ba8381889bd49c7d9cd053beb39471645d9d9ffbd1e9c9aae2b731a7b4431af80a5394cced13b12c2 SHA512 577608527443780ff5756c7510e363dfb971946f554e5dd6a828d7a45abf656660152551841a4a941b90bd65f64e29ca842e04ffbcafd6b38f5aa36124560917 +EBUILD libhubbub-0.3.7.ebuild 1221 BLAKE2B abb6538e8cb54d6a3ad55ddde2f93b28bdac322f54b42ae62aaf9c78ae1bbc0910652d6f55e9c70362f31beed8d41561fa095856bf7c11409d2f0cfed3ee8a47 SHA512 e35968660e3a816a2e2753424414ed446603875ad3a407431710a836b63f7375f0144e6011ae039abefb09eb03c453485a636120bd53812eb0ff014316f15d3f MISC metadata.xml 495 BLAKE2B 46d4a88164e0e39d037239285a009538f05b31ce5bb819f3379c356404c9924763bbb9b1d705e58684cfcf82d378187e448ba206a5fde1a1d61b2004c99e605b SHA512 90387fa992cb76ab5afa0d4eb774515bab608b96006107d40c4550abf5d8505ba369c37618d48d3be1093d0b35480ec50b23ff010a7ce150d96c7c11a0452f05 diff --git a/net-libs/libhubbub/libhubbub-0.3.7.ebuild b/net-libs/libhubbub/libhubbub-0.3.7.ebuild index 650a968a8c25..5dec0136be01 100644 --- a/net-libs/libhubbub/libhubbub-0.3.7.ebuild +++ b/net-libs/libhubbub/libhubbub-0.3.7.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=7 @@ -17,7 +17,7 @@ IUSE="doc test" BDEPEND=" dev-util/netsurf-buildsystem virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) test? ( dev-lang/perl ) " RDEPEND="dev-libs/libparserutils:=" diff --git a/net-libs/libmrss/Manifest b/net-libs/libmrss/Manifest index ba72eb0e5323..8c19a81ef8f4 100644 --- a/net-libs/libmrss/Manifest +++ b/net-libs/libmrss/Manifest @@ -1,3 +1,3 @@ DIST libmrss-0.19.2.tar.gz 375238 BLAKE2B e01682d9223d3f2cea444b5e6b5e9b6e476782ef0ae1c4a85d5ea8e8e5383d5317f2d35eff93347e6b5fde0778060c212b8e489915f50b20f098f7e94805e148 SHA512 0997ced472b767174977b7623484c57bfd0b901a9650cb7f7738ad7393153752ebfc1f717e2eacfb5f7eb319140599128d73de7e095327ee089cd1f85ab42b24 -EBUILD libmrss-0.19.2-r1.ebuild 1189 BLAKE2B f870eaee209a1c06a9863dbdb2f86b1a6b5fac1b8acc7cb37691e9125b02656467dfadabb9d7ac65e6c482121af0bff3e22a935b45d888436e52ca971c1d4f51 SHA512 15ebe7f28bb5742ec1ef2cd7e4c5fbed5b0dea5e07220016ba3e797fe533b1a53a31eda83bf751cbd808136dde4303a634bd65ae29dc83d4695a4ba89056cd35 +EBUILD libmrss-0.19.2-r1.ebuild 1190 BLAKE2B 0446d8034f83f0012ca4a5158cef6b73eb98108e874fccdd5cde8397edd8dc8ee3bcd38e1c8f49d10f76ac239dd06fc258b66efdc0dd302a1d77948a8e6b6c71 SHA512 9d0d561462729f8d19e32a41567349f096bb49a9adfd73a5e14897eee083a9968d5a18b73171ed818e08a80befae9069b0ac661da407a5088b1f8f94a279c70e MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild index 05c56f50afa4..2b5d9fbaedea 100644 --- a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild +++ b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen )" + doc? ( app-text/doxygen )" # TODO: php-bindings diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest index 3a55b3162e90..ef530bab1b3a 100644 --- a/net-libs/libnet/Manifest +++ b/net-libs/libnet/Manifest @@ -3,6 +3,6 @@ DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f984 DIST libnet-1.3-docs.tar.xz 21264 BLAKE2B a2c837cde6966a580b5b0cae12bfd8bb33793a5835c3c1ff1ecc273055f56d0f0084b48d7ebe768c1326ed54b67bed5dd23bb9f7524590a2095283950036e848 SHA512 b36bdd7cf9b7acca261004d2308ea6bcf11a67efe581f15ac77548dd02ed1f3e86f1daeb00cef4e774db983e13a95d7f79062258229909cb41886a45f8fd974a DIST libnet-1.3.tar.gz 595500 BLAKE2B b43f15143e6a1de3350b814d7acd4a41d61eb08e6dfeb729868e55f65c445942ae52905953f3a4fad00402b47fc5119634233ea3ae28806c1869bb34ef6fba9b SHA512 c434327108b61e73b61acc5f2b346d049ab5d58e494db21971368eac733a9a0a3e9d95e0b4523c20629b02ed0feef086c50c582719635f21e980c440d55dd462 EBUILD libnet-1.2.ebuild 904 BLAKE2B 18e30802c5cd41fe8c8e9a5414e69d6d1d4050e7239a3df68a935d9b48ddc8bebfe3b47976293ec591cb63aad30483539edfed7a5c1ca6ef44da88ba543a6140 SHA512 de9a422ac93465a16c75619c4af4ad87b78cb779a3d87af68fc3d3642f636cfa3a6a44c0921fe19861566bc7604ead2fbf037c75d04702a1b728c7267ff24a46 -EBUILD libnet-1.3-r1.ebuild 1902 BLAKE2B d5f96b95d42d495709604d736a1361640c78a80e96bef62c49c08a5d138e85548e1f64ada5593cf1051a5c4b6070618c9f83bd5535fc387c54d9378706123623 SHA512 81027f80a0e878ca8d566c74f482094d2fce66569ce68b38d79e9478760e08b68345580cc9129a497d721e87ee13bdb7635b0b51bf2546f4a368feeddfd9893d -EBUILD libnet-1.3.ebuild 1000 BLAKE2B 1e8474d55a1bfea4ce42ce84664b9e36dbc30c1f6d9e4ea8fcc53a6315bd72449c0c56b8d4d829a5c3f7f5e832b913c5e60298d846b95488d6d27f14b7058e58 SHA512 5ed2f6792bb3de608d452a3890648b1c34fea7c65cc0b6de870924ea4db6a8c431421b0ef2ec58b9e6b52575816e6eaa7dd0c1fd7284c9e5a970844f5f7af9aa +EBUILD libnet-1.3-r1.ebuild 1903 BLAKE2B c4545a70958bcdf52b3c7c7641793955b24a755fb4b12d752644048f1ade2e799ea0bfa588ba2b7f35b213af5c5e97795b55184b84a9f2d6509cf0028a51667b SHA512 b2656335b83e42cd3aa313aaa3d7ccdfbbb84e3fc4ea59f6a7489de7678bedcb0a4a433fba93927f6c97e5e0046b2038421a841f2b13da30ab90a7ae27a3dd85 +EBUILD libnet-1.3.ebuild 1001 BLAKE2B b763c3c1d35d5960c44b6095e1e97cbdbf12881780824d8f44796c8db54a80ef4ff65e197a208b1f2360b40a73691eb0fc934ad52601ad3aab0589278f39c55d SHA512 8ac1246d42fcdd581c40561f891837b1f84d4de7ef9c5bad63a98d64addf73482091ae0afbea409e650be9ebe5413c168c537fa74436a013df6ad450f410ddf8 MISC metadata.xml 1344 BLAKE2B a4798ed5db1e0a20c9a97794e6c7ba98a473e283799cb51ca39e072437508933e1b6656fe558f47600ef6da2a59966c7235e82a6d64cc89b261f3106d8df2399 SHA512 a846b017e37680462b7a4b66a883d77eccb72f7aaa2ef0bf854e507adaa30c94042effd22bacf5756bffe575932fc014cf7c5393e933f9b59de8da43f849060d diff --git a/net-libs/libnet/libnet-1.3-r1.ebuild b/net-libs/libnet/libnet-1.3-r1.ebuild index 4f1aa41752c1..7dcc6589f7eb 100644 --- a/net-libs/libnet/libnet-1.3-r1.ebuild +++ b/net-libs/libnet/libnet-1.3-r1.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 @@ -33,7 +33,7 @@ IUSE="${LIBNET_DOCS_USEFLAG} static-libs test" RESTRICT="!test? ( test ) test" BDEPEND=" - man? ( app-doc/doxygen ) + man? ( app-text/doxygen ) test? ( dev-util/cmocka ) " diff --git a/net-libs/libnet/libnet-1.3.ebuild b/net-libs/libnet/libnet-1.3.ebuild index ec34798e5bdc..6abdb12e4e75 100644 --- a/net-libs/libnet/libnet-1.3.ebuild +++ b/net-libs/libnet/libnet-1.3.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 @@ -16,7 +16,7 @@ RESTRICT="!test? ( test ) test" # doxygen needed for man pages BDEPEND=" - app-doc/doxygen + app-text/doxygen test? ( dev-util/cmocka ) " diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest index 96b4ef184138..f1b435be39ef 100644 --- a/net-libs/libnetconf2/Manifest +++ b/net-libs/libnetconf2/Manifest @@ -1,3 +1,3 @@ DIST libnetconf2-2.1.31.tar.gz 323423 BLAKE2B 8a6a3e4e7eaf94ce2afba688555956159fb48ad83e802f187acc222dc3e3c62ab718758dfaa39abc81417895098c75cb0ee490ac64412634e88cef7389556ecb SHA512 f174aee332aa775308d8fbd7aff450af9531c94dfe76279a87acd3554f07957c468a1ef2d2c2c6a63748f87920790616426839cb9c3e0c50ec2c88c98273d8aa -EBUILD libnetconf2-2.1.31.ebuild 899 BLAKE2B cffde936ee509d861968eead570b5fc975231cdc2ca891fc5eef8cf66dabfe7b09ae468fe90c3061c2e333416fdd771e19ca7b2632d9487c30a72bc8679bbdbe SHA512 2d8e85433d0bdf7c5d32699301d26eb877da87e9de6b25e4c0b31dab16e0ffd66c0a6ddfd549835c17ec08c6eaa9026a49add12e150a9fb1cf42e3a6cc554392 +EBUILD libnetconf2-2.1.31.ebuild 900 BLAKE2B 30f86ce0b85dc8efe121976217701f528bafbc3b799fbf804896db491e4a3f2c073b70d45e932f38da2b12bf5fe8a7c46aef21e6dc5b76c1e4ff64e38a863704 SHA512 dd2da29872e28056d09bb8b061a3c1eb94a8dec5fbece4fe46e75253ced8093ec581a08a4304062017edfa1afd59ac7b3bfa5989631777287cecd7c088b5485e MISC metadata.xml 331 BLAKE2B cdf31d4cc5f23689277be613336e351a92be7cc1ac1aeafb1e52fa88985f1fcb9d6b71de3ee149b0b0269f9660ec357d83d7ae4b18355a1121bf3d38b957f7e9 SHA512 33da7a046f20febb4e756f73dad37dd66ba07b7da865f07ee72b08026be7f81a026960ec7d4abe558a33ffd162806456454da89733944d974cc7132555176b16 diff --git a/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild b/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild index 9d6b457d97b9..a10855bd1960 100644 --- a/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild +++ b/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ DEPEND="${RDEPEND} test? ( dev-util/cmocka )" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" + doc? ( app-text/doxygen[dot] )" src_configure() { local mycmakeargs=( diff --git a/net-libs/libnetfilter_log/Manifest b/net-libs/libnetfilter_log/Manifest index d7d9c92cfdf8..f9296fe1a276 100644 --- a/net-libs/libnetfilter_log/Manifest +++ b/net-libs/libnetfilter_log/Manifest @@ -2,5 +2,5 @@ DIST libnetfilter_log-1.0.1.tar.bz2 262545 BLAKE2B 4dcc7ff5deef95fc657a956556a1f DIST libnetfilter_log-1.0.2.tar.bz2 304022 BLAKE2B 5976dc484f8a5dc7b5484f12c9913acd9cf7600844f321da6105805b05ad7176d88185c4770bf9ac167c8525b01f1cd8cbc560f77a7cb8b1f129f9f6983b5bb1 SHA512 6b33718b1dd7f4504bceae14001da3a652cec46a6725a5dee83a7b55028cfa8e768cba917f968a5d5b60fd9ff04edf6040ef271a68e5fb65858bf73f4f9ccf23 DIST libnetfilter_log-1.0.2.tar.bz2.sig 566 BLAKE2B f4e3de583d9e0612bfc5932654d287154117fe720c28eb220fbc19c4e6cd8d57c66b92159d13949b035a2479a466110e38b0334f49dcf9b9fc0cb4c41ed79aa1 SHA512 b9a40fa08fa5d29a907522add329ea5268f2ef09274b5be3d30ab7e6a0c6aad915d8e8d7c5d708947a86c4a7fe950439ab536ec5ed78198f5b6b839de2f0ab35 EBUILD libnetfilter_log-1.0.1.ebuild 705 BLAKE2B 42febab635722cd8673c4512544eea0df814dc19af0092693c8bbd0dbb9eaa07f7c90790b9d95df9adc85791fdb5aafa74352cbe4b440c1eb24392108e434d10 SHA512 b0ac5df5cd2a7e5605ba732debffaf2eb8924a01dbfef5eb7d4f25ef318095bd158699c2396b201063db5469bfe17afda05a7fff804f33adca8def70cb19d05c -EBUILD libnetfilter_log-1.0.2.ebuild 1024 BLAKE2B 863cea52f31af35c7ba05b875334eaf4457a85b28c06a8ae6360d24b2998ead6f40d476d919b6512fe3f1775c5c43f201f169e7026cff718a6180c4b289e2ee6 SHA512 9deb0a43fff95b4c7c7354f6eafe0c045de10ac6a3c012dbf0e6253bd281ac1987c762ce49c0ed4f705a8c23c736f36367acc9a0a8b38ee77b20b53ed62954de +EBUILD libnetfilter_log-1.0.2.ebuild 1025 BLAKE2B bc29ea75aeb1f2da50cbe287401a2c7f3bc953d69813290f82a0bc0dc10d98d8c3826906e4b5d4a3916fd3ac99308d0d6afdc682a29c7be1f7ee0d516a7ab8e1 SHA512 0a7dc292ce9495ca5a8ed9b4804c7d9621a74c6109974fcd6ef6094eae7aebcb5d12d38b1331cd2f86dd26579c9bdb72979c7f944742f393fbdc7754818a0fbd MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619 diff --git a/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild b/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild index 7508bc11e988..aa614851bace 100644 --- a/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild +++ b/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.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 @@ -20,7 +20,7 @@ RDEPEND=">=net-libs/libnfnetlink-1.0.0 >=net-libs/libmnl-1.0.3" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) verify-sig? ( sec-keys/openpgp-keys-netfilter )" CONFIG_CHECK="~NETFILTER_NETLINK_LOG" diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest index 0e035bf346b2..08ea2c269b1e 100644 --- a/net-libs/libnetfilter_queue/Manifest +++ b/net-libs/libnetfilter_queue/Manifest @@ -1,4 +1,4 @@ DIST libnetfilter_queue-1.0.5.tar.bz2 313856 BLAKE2B 0d7806fd23961f6b80f6ef63faf0fe10307a34495337a7f6dd4f0eb76b5ba8a96292b86285e0740f83414417810e47f47b1400c7d83fb4d8fc6f58954f4bd9df SHA512 732a44b602e5efaa4f5582ea25ff8f5ec8f4dca5c0e725cd93fe2d441db80416b25c6018147be90acb262d7428eb5b21b3f7b5920e612d115061ec6a19d67f85 DIST libnetfilter_queue-1.0.5.tar.bz2.sig 590 BLAKE2B d8b5b3ae82fe2722db8a0c200a75146b70f79b7eafb34ddba8349f7f38f02eb5546eee9ae31920f5b7301787a2866a908199b69f8465fe1b6e45ebdc5fb7ae13 SHA512 65558652c7d54087eb1b5a37f7574bcca3495e5ee6587c7b555a7fe6e118007cf9431a66ed5280ce272890c659eb171570e0d0cbb733cf969ae8b44a1d541687 -EBUILD libnetfilter_queue-1.0.5.ebuild 1105 BLAKE2B 7070ddc90ca092b8874cde9d78aaf3570056ff0e2e5a189b5fc9476968634323d1302a2dd0c141ffae0326b03fcfb468e84fee1c4e5e82d8845a51b44320591d SHA512 9f346c7fc774876207f4f444641cdf35b6ef2f2a97e2535606c73641a7fc76e9b895009f326c245b1885ad817c39b7cbf519a69782a6389d1ae9453619f28bbc +EBUILD libnetfilter_queue-1.0.5.ebuild 1106 BLAKE2B 511ddde83498b958ae01a303336bd4ef5bf0bc77d5cbce44195a385ab481868c6135c58c4633b15382a1fe1d73df963421ad1ce8bf67e84537e4141fdaadccd5 SHA512 2b9fd3542d47e09789fc6d2f75eea780f9dc8372aaaff1092ccc95e3aa3b6361b61d36524f8583ea2def73d14d58225c59877be1d0416a2db1b606d878488b37 MISC metadata.xml 371 BLAKE2B 521c009d0ef0aba996abfc4be1681779fab5fd8c2120146ec745536be4554d25460ee02943a90a7c0154194e6df5694a134920a2271c5764e1e0809dabce26b3 SHA512 fd2f90008654c2292d539c21775fe161b458380f0b65827c91e50ddbbfce66e66d57b362584b711193e41d682df073ac154b9a1ec6d42bffb8f5d245737af14e diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild index 9da571fff5d9..3ac276b1b9f7 100644 --- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild +++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.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=7 @@ -23,7 +23,7 @@ DEPEND=" ${RDEPEND} " BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-netfilter ) " diff --git a/net-libs/libnxml/Manifest b/net-libs/libnxml/Manifest index 005e77687eb7..da3f7596ef72 100644 --- a/net-libs/libnxml/Manifest +++ b/net-libs/libnxml/Manifest @@ -1,3 +1,3 @@ DIST libnxml-0.18.3.tar.gz 361977 BLAKE2B babe5773f102889d52d0d63511984201e220205925b703221559cf73c8e380b78b3788ff48bdc2da382746bb95acf4c9a70c69d689c4fd7db3be4bd65f44000d SHA512 fc420a4b773eca68608ac1d509930a0528c3a41b53fc7cc340c09fd53f92a88afb4091e810d97d59e73a8beeaaeed52dd3c880273ef512a5305800b3ef46717a -EBUILD libnxml-0.18.3-r1.ebuild 1123 BLAKE2B faf9f28b22116825bbe73bd271cce9d7ee9a1e5753791b716c773db62a1da90bf8bfbf508594d319be42fd8430db70fb7fdcbc3e30029dc58c318bc0d6dc9016 SHA512 cd71d9e2fec57bfc393f9d9f46f2b2c151851bf6f70adb9c7b8c9a45d3791dab72682dcbf595fdaf6b4304c635cab00df052b30d4840b50ace11a99fa2c32292 +EBUILD libnxml-0.18.3-r1.ebuild 1124 BLAKE2B ecdd28d34748739270342c404a44c4053a57cdb6a6f1818d73a054289c555e505c9979b3d6fc0a703b0e5b6b6c85e3d3d5a0524a2f6447974233a9b481d23de6 SHA512 5950a3d265c62da92d94eddeb8d3b8bde2a6cbf6828be1c8e3ab8020d403a4ed1c14f8ba35a2405a4fdf228532fecd1a4b64e24991125eb3f53ff139b7775c24 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild index 1f4b284d7def..68da49679aab 100644 --- a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild +++ b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ IUSE="doc examples" RDEPEND="net-misc/curl" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" src_prepare() { default diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest index ea45c11e20c3..4558cd3ae863 100644 --- a/net-libs/liboauth/Manifest +++ b/net-libs/liboauth/Manifest @@ -2,7 +2,7 @@ AUX liboauth-1.0.1-doxygen-out-of-tree.patch 2231 BLAKE2B 61523955ac500d63879dae AUX liboauth-1.0.3-openssl-1.1.patch 4483 BLAKE2B 4d2628448a1341cc41a676d5002c7f0f17af384fafde77687bc83235d90f4b6b853bbc9a4262fd4acaa0b04cb67d586bca308bb9c66fafbe7de1734fb39a4c1b SHA512 90ae75bbaf7296826f813df852263901ad8632579b5e5dd1e8b1edc4719d3f749ffc30e6348ffc2ddd5239de544c934382f52c4d62e90b3e655fd9630b5b4880 AUX liboauth-1.0.3-openssl-1.1_2.patch 750 BLAKE2B cf07dc1722c41f55e1ea5d241c91bd62d4eb8c862a727cf350ea10ca11a24e195439599bf1e712158d6f0dbd113d5cce62d567b48883f23e505e1df6d077a34f SHA512 778222c9b5ff2a35447cc8c14f7868f011c3a3e938cebdd617471221e07278e82b70bc436dbcf28c4b7a558486465a0e36278d18718f48f57a2bb47e74eba957 DIST liboauth-1.0.3.tar.gz 504950 BLAKE2B 56cf10574af58995de9bf86bb7f00becb360cc899bf1ddb23804820d63ae2c7af29aa29031f68ce79a6cc441cbce27aebf5f1c9dfa029243d7732592d03620c7 SHA512 5a13818dbb3e0df76f7a3fde451eff4f90c9bebfe2076a294921af0c07c2b0789f717f0f862ac6961562d4227e016dc198ddd7efb9c7ac599c3bfbcdb2ac33fa -EBUILD liboauth-1.0.3-r2.ebuild 1592 BLAKE2B 6c76cf5af8ca1ac43da32d47ffe97ff1070d5912d96bbcfc5c250b9d3ece6cd8200059a62e9753249cfba239ff7f1abdc63e3c5e719dafd5005e4c9f8e35bd52 SHA512 a9db5e954ee658f867cf9cfeaac39610b367118c6afd75def4dcc8df0994d77e647da5f9ff77a8453b15af5c5ed7ab29f02310dcda599933311a7591cf3e6b14 -EBUILD liboauth-1.0.3-r3.ebuild 1748 BLAKE2B f2c3ab26714866cfebf548d00cbc151a6416134cd0b1f81fd53b032d3d31340a3986b591616e979955ac8592f265c099720cc099e00628d2dd5bf152839d1c71 SHA512 89718289454f802965b114fba901413e27d1776c05a0e5d5b61cb267562faf1dd4f73ceab08f2b7cc84fafcae80766347c9ea5a95e4ea9686b2a17d163cd25dd -EBUILD liboauth-1.0.3-r4.ebuild 1473 BLAKE2B 3c9bc85382b858d6f45d891fac75680e07347bfb5b616a651ec7995224313895b18ffa35a31b9e1b6591e765c355505cd3226c15c3adaedc1b22146803d0e880 SHA512 2f55140c52cb06eb6fb92e2accd8eee16a5628759498918d0ac518ea2cb12b1b8cc40ce543881622273e693e95a71581aedddcd76c88c52b18ecece267c54360 +EBUILD liboauth-1.0.3-r2.ebuild 1593 BLAKE2B 0ccfca1e133e9436e3e9fbe7191048454ad1dab771b3f006646b772a761ef3c3f59bb5aab72209d98b3d7c87344fc4f75e36d757d698e35c941b45e6265144ad SHA512 8334e0366fa3c7cb8ca972967ad0947e4874a6ea194ab4ae0ad7a059f5790e0be861c172ff2564f568cff3cedab390fe36efa537d684b9f0b67eb5ec28caac43 +EBUILD liboauth-1.0.3-r3.ebuild 1749 BLAKE2B 07c7ff8214910863d3820366d53a49d8075637434746daa8d98787236980a87e99aa4660b8731c8c3f4a2339235e56e511cf6204ddddca965443c20d877131ba SHA512 f1b0a1c7aa7d8ba9a533d3c1f2b8988e5e065baf8f564535a25d70963d1f758a5091795610fd1468db1cdc7e2b2f27f6eaebec8da4ec04bd3bfca996786c5fdf +EBUILD liboauth-1.0.3-r4.ebuild 1474 BLAKE2B 43e849a405d0873bf94833d3650a0cac27ace65c06daddd3340f15717d8f939c2d86591c88b5695b7bd57ae01451f744a3041dfbff2c88d7310fcf46f6083fae SHA512 755291ec90799044414ea695e177e65d311169fd0060620b8d8b8a41503f194cb8040048c555c5bb560f01887e0adc58c8f9c6d56a0557be0553a77a7fce6534 MISC metadata.xml 880 BLAKE2B 7d21173fe9d5aa67de1cd75f2055bd686ca7223ad58761cc79241e88e390696fa60abb32c845e51a827720d281963258b41661c0757ba28211b7a0f9055d8cad SHA512 09d4eff65caa5df8b6b60454726cbc0725527d823d337162b06d35476d54569b5e324e920a4c658dbb6c7d0db516e587903aeb6701f01206b7fb766081f11e92 diff --git a/net-libs/liboauth/liboauth-1.0.3-r2.ebuild b/net-libs/liboauth/liboauth-1.0.3-r2.ebuild index 5e47ba416dae..5eb4f89c6aa0 100644 --- a/net-libs/liboauth/liboauth-1.0.3-r2.ebuild +++ b/net-libs/liboauth/liboauth-1.0.3-r2.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=7 @@ -41,7 +41,7 @@ DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig doc? ( - app-doc/doxygen + app-text/doxygen media-gfx/graphviz media-fonts/freefont ) diff --git a/net-libs/liboauth/liboauth-1.0.3-r3.ebuild b/net-libs/liboauth/liboauth-1.0.3-r3.ebuild index a1ed30b8023b..465182fab20f 100644 --- a/net-libs/liboauth/liboauth-1.0.3-r3.ebuild +++ b/net-libs/liboauth/liboauth-1.0.3-r3.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=7 @@ -43,7 +43,7 @@ DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig doc? ( - app-doc/doxygen + app-text/doxygen media-gfx/graphviz media-fonts/freefont ) diff --git a/net-libs/liboauth/liboauth-1.0.3-r4.ebuild b/net-libs/liboauth/liboauth-1.0.3-r4.ebuild index 3cfed8f24c90..34415fa6c868 100644 --- a/net-libs/liboauth/liboauth-1.0.3-r4.ebuild +++ b/net-libs/liboauth/liboauth-1.0.3-r4.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 @@ -32,7 +32,7 @@ DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig doc? ( - app-doc/doxygen + app-text/doxygen media-gfx/graphviz media-fonts/freefont ) diff --git a/net-libs/libosmo-dsp/Manifest b/net-libs/libosmo-dsp/Manifest index 146d48633cb1..9a70238b9c7f 100644 --- a/net-libs/libosmo-dsp/Manifest +++ b/net-libs/libosmo-dsp/Manifest @@ -1,5 +1,5 @@ AUX libosmo-dsp-0.4.0-version.patch 318 BLAKE2B 401bbd22649d72bc7f93d5e33222c9779cd7bde3c9d4f12ea02cf79e79bb54a39aaf57a78b773230bc75eae2abf26efcb33c69b19dc233ddedcabfe67d541d22 SHA512 15b8080497615cd22384b57cf961cf66c467c966dfd3b2c7466b6a9c72527ec8901e0110ac212b7b188b409f8a112128a1f7797f4e7fa7d948ee291a9a916fee DIST libosmo-dsp-0.4.0.tar.gz 43664 BLAKE2B 10f1718868971492cc93bc13b8a0648ee8c15bbbdc06119b9783851fdfb9959f52cbefabf23ec18b03d961b8a3f7ae81a936008ae71e5001606ba24b78de4ac0 SHA512 364a4ac3fca3e10216057d647ae1ea77550f3d4d3707978c457f363dae66ec252e8eb60dc53db5f45f85bcdda26d54b13d56b60eb8eb3133479d21482ccf96da -EBUILD libosmo-dsp-0.4.0.ebuild 1072 BLAKE2B bbbb1704063e0b22cd737862946ca79e971b5896664f151cf495ec131462c3cceb8a9e42be20d7fd1b67c247e5ce2f96944fd8dcf57269f4ef3196711b5a821e SHA512 dd20e43720d8a4a89f7ff106a11ca01cf1008ecd8bb9881de1ebce6dee4cd4e3774a0664c559da6417cf51afb51a39fbde2533119f41ddb0af38185302359d6c -EBUILD libosmo-dsp-9999.ebuild 878 BLAKE2B 4fcd22730ba53aae7c6eb3cd96498c5227083f055b91c0c287a43b928db8ef839172733aa0b0744a75e44cf84cefb4c0b6cc762dce1635f689a871e3f9e1e226 SHA512 cfb8bd49a43591f926f42d8b192d64956389861699a1cc85e19ed6d9a2781a1e7a9936e3ce723703d0e3ced347723f6f7c1c7f7c702237eec7f9e1d8d869810b +EBUILD libosmo-dsp-0.4.0.ebuild 1073 BLAKE2B dcc3a888eccf055762fca9864ba65b282cb50d3a8d3c2d0d25af9fb78e3185ae3dd1cba31c28ed0b980ac8627320b72037bae1d7fd1d87b1c21659c5eb2da788 SHA512 3b5247ce6d68697b1b439067cf022fd424f84b2ba9bb2e17c7c364d72e6d9c808d9ffd9ffa7559122208459564841adfdd9bac29bb66a10f8bcaf6f0c88d5141 +EBUILD libosmo-dsp-9999.ebuild 879 BLAKE2B 676cd54b4f766b977e983d74a480a49ab8407db80092c43c4ffed9ce2f8340a7ed347077a817717d3894461542a9dba2cbf1e73daf3b1d97fa67653857d9f8c9 SHA512 e7a6aae7b00ca184e91b36a71ef0ce5a7cc5502d644405b6e264a3c43be16186cbb82fc12c60b3c2c75323c0e66b6ab4cd4bc5f46070b9a27f44f8313d565673 MISC metadata.xml 335 BLAKE2B 4a59f01a0e3aaf3293297ab368ff1438eb9d5e5bae3edfbbb1dd9f7191ccb47e9c504fa318a1a54752bbcf507f33c96d8808343f6f77a7de7a8c1fe1d84146ac SHA512 443b02d3f3aa162d3a176ffd081f6e0ff3bdd3276b48b817a03da2f43ab360b2db99add599f501ba1efcb47a12b30cf64587c5d307dc9c3583b46265150ba2d3 diff --git a/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild index 4c6a60c0a9b6..c7cc5eaddb37 100644 --- a/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild +++ b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ RDEPEND="sci-libs/fftw:3.0" DEPEND="${RDEPEND}" BDEPEND=" doc? ( - app-doc/doxygen + app-text/doxygen dev-texlive/texlive-latexextra ) virtual/pkgconfig diff --git a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild index 4b71863463d6..5793baf98d52 100644 --- a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild +++ b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,7 @@ IUSE="doc static-libs" RDEPEND="sci-libs/fftw:3.0" DEPEND="${RDEPEND}" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) virtual/pkgconfig " diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest index 96d9f9573a68..048d0a4d115d 100644 --- a/net-libs/libsrtp/Manifest +++ b/net-libs/libsrtp/Manifest @@ -7,5 +7,5 @@ AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aec DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887 DIST libsrtp-2.4.2.tar.gz 631393 BLAKE2B a062fb7a92294c66f1876c66bf05d9b11412a170c5f7221089680770ab85a62eabb68f781e487981b28602b1f4f7dbba07ebd44ed0248deaf6b9b56061227534 SHA512 6e4805e6d34b2050a6f68f629b0b42356b1d27f2cbaa6cc6166e56957609c3d9aa6b723dcc674e5c74180d122d27badd2f9496639ccb1e0c210b9e1f7949d0e2 EBUILD libsrtp-1.6.0-r1.ebuild 2337 BLAKE2B 52f337ea0bf805f22faa49c822d13fd93101ea021d5a69dafe48fa94cecb99d897c57674d5948558b9a4f7c052f0eb64f1a46899f91ee9223d86ff35ecc80ad4 SHA512 24b38fea4642f344faaa1f9722909b51f8c9c373fa2c231956309eefea81b938c19e55e7aaa1f4971a26f14130c2bce5d6631551d2bd7c976f17641e707b544b -EBUILD libsrtp-2.4.2.ebuild 1665 BLAKE2B 2dd0d96fabd57cf6169802c7aa166ffc564bed5403baa239a79134f2daef3b517b16a4fdf4a16c5a85d973ff2545ec35212891b1ee495f5a873b88f179136090 SHA512 507456231d52f7e4e5e379c04692a305af2e49787003467a60cb8dbb966c0f5fa660e7288048a6633df6e9b7611d051ab07d88a4cc5e6780c324de14271002ba +EBUILD libsrtp-2.4.2.ebuild 1666 BLAKE2B c2137f623c1f0e118d5fd8ac046ed7a10be7770f674cf568c89f7a3707cca2e4bf5a9b6d86372fa9b4832f7a90087a59cc5b53665d4f2779c0bc481a61e66cc5 SHA512 b461a6fa91c960ea44026136e4d32fffc1fc86c4bb46bfce49457c2c7fb7c8228e02793e9afe04c0803bf49eae8e0c0b0a66b2ba3cec79712727acdbc0cec6fe MISC metadata.xml 732 BLAKE2B 77564b70a4af50dea6dad18ad1763a5d61fbd8753fef74039b50d9131eb080758e3de2e06736a1665a66bbc716941549ac82efe44f0d58e321778144faf29166 SHA512 f021171abc6eae3bc732e3beac09a5ef126d4c8f31912192db9281cf523d2e2632f740757420b3fb477b88957ace138e03ee752ab44df63b0b16787f1a29e883 diff --git a/net-libs/libsrtp/libsrtp-2.4.2.ebuild b/net-libs/libsrtp/libsrtp-2.4.2.ebuild index 0add2291e7a0..96e02837fcf2 100644 --- a/net-libs/libsrtp/libsrtp-2.4.2.ebuild +++ b/net-libs/libsrtp/libsrtp-2.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) virtual/pkgconfig " diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index de09fac6c78a..da99054b7a16 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,4 +1,4 @@ DIST libssh-0.10.6.tar.xz 561036 BLAKE2B 6ae1c611b685fa8ec5e5fb159f93493edf4d8ae8536300cd9a357daadc28ca2fbd8a64a22157744bc97e2e672b0b84b58e1167d7369fe88306b3581098af9f57 SHA512 40c62d63c44e882999b71552c237d73fc7364313bd00b15a211a34aeff1b73693da441d2c8d4e40108d00fb7480ec7c5b6d472f9c0784b2359a179632ab0d6c1 -EBUILD libssh-0.10.6.ebuild 3494 BLAKE2B f5c2cbcf49c2c7b885e25145ae7603271e59fb7b4b24fc4475641fdaa7566716409486eae7fd43abeda28be1c2bff8cbaead6fc4bead7db9e914a5366c509b6d SHA512 52fbac5427ada924b1f4d993a660fa3ea03801ceebf4e632c1159a6e26f3921938b9aa5c87dcd5a6f3a730bf933815c3ded4281ee6cffa49813942c15e4eb44a -EBUILD libssh-9999.ebuild 3502 BLAKE2B 610cc25ac1e65176f7480905017cfb1a945b49bd72903ce6f694f254d278173df285e4db5574eaf9c505ea9ae031cb6adbc7cf40918975719f250b2f6fa0f6fd SHA512 158df4438cfa23b01d76860fe185d01f20c9283ce18974cf98cabda01b5d1e7e00ec9170d8638770f6eac0e80dc2640be31ad472a5aeb93858b8d5bff6851317 +EBUILD libssh-0.10.6.ebuild 3495 BLAKE2B 14035950f9906974d2e25f5aed3bc1ffbccc2c5f6628d43f00c495d39a2a9fd52fd84257e252468b04430540ccbcc2351248c49489a17e501ee88977d96577d2 SHA512 9feed2dda2d5d3c0db116d01e34adf695b15149ca0e4532074a84cd279ced5ece624c5bd4297b59ea8847061af366ffda9d605e46e6a034273910479f1dd0266 +EBUILD libssh-9999.ebuild 3503 BLAKE2B a91bb2d862b5e15f9c57619325781a603b685fe8fc2995a287136fc0178c1b2461b9471822a2be4623ce77b852063139590ae54af6cc52d797598e4103a7090a SHA512 0ef5869b0e59a14dce1069dc6dbea6720df0ea32a89831a045d3654548535c4bb9b7262b2dbbee77d573e584d70eca3e9522cb2350a16e61d2446cecc022868d MISC metadata.xml 783 BLAKE2B 79be0ef9802a5f1d58b866dd2738a721696b0a4a1b6fcf44b024c74593ba9737e4a64ce2cf1cb8ba4a17139da06ccbe2fe3d8365221159ebf797de1c4aa5b490 SHA512 f2204075966244ebc337663f1a9d010320dffeda90954c6bac69c22859fefd2b6ca0ff5809fc2d34743de6400e3d9da234c5b8a9ef211cc634f381ded5d97825 diff --git a/net-libs/libssh/libssh-0.10.6.ebuild b/net-libs/libssh/libssh-0.10.6.ebuild index c8f8901c99d8..b3297f65056b 100644 --- a/net-libs/libssh/libssh-0.10.6.ebuild +++ b/net-libs/libssh/libssh-0.10.6.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 @@ -41,7 +41,7 @@ DEPEND="${RDEPEND} elibc_musl? ( sys-libs/argp-standalone ) ) " -BDEPEND="doc? ( app-doc/doxygen[dot] )" +BDEPEND="doc? ( app-text/doxygen[dot] )" DOCS=( AUTHORS CHANGELOG README ) diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index c8592e03bb83..b15c073dad2e 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,7 +41,7 @@ DEPEND="${RDEPEND} elibc_musl? ( sys-libs/argp-standalone ) ) " -BDEPEND="doc? ( app-doc/doxygen[dot] )" +BDEPEND="doc? ( app-text/doxygen[dot] )" DOCS=( AUTHORS CHANGELOG README ) diff --git a/net-libs/libtelnet/Manifest b/net-libs/libtelnet/Manifest index e9c2557a2373..3cb1bb89ebc0 100644 --- a/net-libs/libtelnet/Manifest +++ b/net-libs/libtelnet/Manifest @@ -1,5 +1,5 @@ AUX libtelnet-9999-doc.patch 1317 BLAKE2B 07293a3658b80cccb147a75279ae7f6b9843101a0414233db33d8e4a2b6fd47283dd35a69942aff2f52775c359b5acf67f739434d5161ba13ed84eca62c95c45 SHA512 de7aef7504a3243fe01bcc11a78bc274f8662dc6fa472a1b6ab8fb84a1a518491d2343e4dd9817e6dbb0ba67fbd68406fd85ce4d1ae6e4e6469b3f71c3594d99 DIST libtelnet-0.23.tar.gz 241922 BLAKE2B 0436c3eb2085c0fc4262f30c86f634af33679a2381a54dbfe92e6f6196b825b100c9c35f78505191b7fea5360a16d9b960e35ff145cd177aaab50968b2fbe946 SHA512 da16a97d04bc6bb5959f431e0aaa03d08ac38e45ba870d7fe6161551ecfdbd5c37a2209cfb40a0f574e6ea0b5c2866c7461cc91d940d5bb5de09fe1584eeb780 -EBUILD libtelnet-0.23-r1.ebuild 770 BLAKE2B 32f8e7e2b9130376b99788877971661fe11a029ff7b45ac3cd357a0b30d6e08badb5c679b950c826ae6384ab46193fe6491179f7f85052b7b249b199456bcb2b SHA512 5e0c4672195566f713f892ac04b0650b446c2c67ee21753c845c9f1021a8cf437ef4978a290c893d5c0e1564fe21f8b8e611de1a4504fa4031fb54353ca1a183 -EBUILD libtelnet-9999.ebuild 770 BLAKE2B 32f8e7e2b9130376b99788877971661fe11a029ff7b45ac3cd357a0b30d6e08badb5c679b950c826ae6384ab46193fe6491179f7f85052b7b249b199456bcb2b SHA512 5e0c4672195566f713f892ac04b0650b446c2c67ee21753c845c9f1021a8cf437ef4978a290c893d5c0e1564fe21f8b8e611de1a4504fa4031fb54353ca1a183 +EBUILD libtelnet-0.23-r1.ebuild 771 BLAKE2B 15912266c26f7bfbcd2fcd5baafa6cd97b902037fa43ad335a642bfc83a39ec1ae7ac37e0b95cbfc55696bcd23ab7a564e64e6ebb4f68c1b160f22890a4cdaf5 SHA512 72f6866079adcefcdc92d22d9b53d66939831d8b12fea2111ff4600cc57e815a1a6363fb79681c2733e38cc220efcb8e6f11ba1de0f737a70f8bbdcf7ef9dc25 +EBUILD libtelnet-9999.ebuild 771 BLAKE2B 15912266c26f7bfbcd2fcd5baafa6cd97b902037fa43ad335a642bfc83a39ec1ae7ac37e0b95cbfc55696bcd23ab7a564e64e6ebb4f68c1b160f22890a4cdaf5 SHA512 72f6866079adcefcdc92d22d9b53d66939831d8b12fea2111ff4600cc57e815a1a6363fb79681c2733e38cc220efcb8e6f11ba1de0f737a70f8bbdcf7ef9dc25 MISC metadata.xml 467 BLAKE2B c5b25d5401e3d66331eb41fa429cd1dab9c53ee7a1307f4bd5783da5e6ea82f997243e41146bc1f3ae182213becff59e2dd4c8835768a8086d68c17da07105ec SHA512 37b8e0154e334a4661efaf28b11b8ef9f4ba05a6d874f7ad146f62db208294349659ce693d7ae9dcae0536f97f99444fd9d753eb56d3e233da39a2f9cd803f75 diff --git a/net-libs/libtelnet/libtelnet-0.23-r1.ebuild b/net-libs/libtelnet/libtelnet-0.23-r1.ebuild index bf00b8db2d1e..f19665475091 100644 --- a/net-libs/libtelnet/libtelnet-0.23-r1.ebuild +++ b/net-libs/libtelnet/libtelnet-0.23-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ SLOT="0" RDEPEND="sys-libs/zlib" DEPEND="${RDEPEND}" BDEPEND=" - app-doc/doxygen + app-text/doxygen virtual/pkgconfig " diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild index bf00b8db2d1e..f19665475091 100644 --- a/net-libs/libtelnet/libtelnet-9999.ebuild +++ b/net-libs/libtelnet/libtelnet-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ SLOT="0" RDEPEND="sys-libs/zlib" DEPEND="${RDEPEND}" BDEPEND=" - app-doc/doxygen + app-text/doxygen virtual/pkgconfig " diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest index 259465a1abe9..30eb16e9b652 100644 --- a/net-libs/libtrace/Manifest +++ b/net-libs/libtrace/Manifest @@ -4,9 +4,9 @@ DIST libtrace-4.0.19.tar.bz2 844871 BLAKE2B ff55935b46fb2193ae2e4ab10971d0983da1 DIST libtrace-4.0.20.tar.gz 3722006 BLAKE2B f68ededebef71673d6e3a655cb116a5a6d4cdee05ba5150edd85abd45863460208715ebb5eab3ee29254864f0130a594649db0baed99f7ced5d1d968472a595b SHA512 b4d00f0d6f8286eff9bac5408bd10244922f4ab262e3dec5dd6f0984ec9f538ab5ac6e554686e33f92168d687275629ec1725d4ebb7c491fe4bdaffd57058fc0 DIST libtrace-4.0.21.tar.gz 3741856 BLAKE2B c7178cdf9721dbbce423d38236ee1fe470f32b86af393c10600a326dfbd2e84f28df27584d4ed99590c00cb8042d4472782712024c4398b95e954565d50c33fc SHA512 0215488a36c6bcb5619d01f6f73f42c14d63b291233c3cf2668434f78e0d60c1faac6bb1f7927cdd6448771e5c0de8e1012dcc954c8815763079f5ebd0abe601 DIST libtrace-4.0.22.tar.gz 3742482 BLAKE2B bdba49d04b354ea075fbd21933b8ad5ecb187836cb13cf95ac8a4c89abbf0c90741696b41dc91924f52a6443e5dee34075b3200cbaf99acacfd43834887df655 SHA512 ecb2a275419e659d05149c64cad2e27caba5b3920188a3eef2df6323785eeaa11677c206ce7d9bcea593d970be95ad9e2019b37642c08d7fec9e0daac9d8681f -EBUILD libtrace-4.0.18_p1.ebuild 1462 BLAKE2B 539a7f8bcd1d2cca2fdf11da99f60e68e72ba1d9db2ea0e11bae0e0a47e0fa741c5719801adc85a80cec878b7195bfff388946f705046c6f41a913cfcc29828a SHA512 feeb109d7832ffbee9f022f7f1ea55fc93d7a76a2da5a8ec4145d822691e1d311360fdd8ac2f38dfe7dfb9311beaf049575c151c6aaafd568969e17a2282fb12 -EBUILD libtrace-4.0.19_p1.ebuild 1345 BLAKE2B 7f90328fd167aaaebfdc5a5c65b37a603c8bc84d14398fe92d3934f2b0a125cb8f64f0143e3cf7d53a2d22ba866e3adf71b1348223d23d9bcda676d9a17c12f0 SHA512 b3909d7e432b00131219768c4f89a9491170b1c1b93d6da0acd9f7e03814574c68c675c1106fd68003c377283fb2335ce4bd20daaf9c38aee28c26b3ff13538a -EBUILD libtrace-4.0.20.ebuild 1384 BLAKE2B cd88c9d87fb57ca94480fb2cbee359cbbddbe3dfcbfbf31d44c0288d624ec4b035f014466424d9522928e4a401cc9e68a0ca163b11a414d610645e66d9ebac5b SHA512 5625d53e63fe54e62689d05beb44484fd6baa66fdfeed1cb88cf316320ef9927618262a91656a8613f182d26f5d5fa6d3582abd1e27d0e6d27c08d531e5adead -EBUILD libtrace-4.0.21.ebuild 1392 BLAKE2B 6945da5460e6adb792a35e4711d5f736559bde6bda3fcab4bbe7ca1ac31f644930616734b3cc07d3abf3372964397d34068b650e870ef64ac6979337fe328c02 SHA512 cf76465d8354a92b91c3b9d97a9d7b857af0a8a1090d2ea17c6847f2e61fab7db7c23ac9acbade296fd8952750d173023473ae60d207c8f5b20c68b9ef9cb1d4 -EBUILD libtrace-4.0.22.ebuild 1392 BLAKE2B 6945da5460e6adb792a35e4711d5f736559bde6bda3fcab4bbe7ca1ac31f644930616734b3cc07d3abf3372964397d34068b650e870ef64ac6979337fe328c02 SHA512 cf76465d8354a92b91c3b9d97a9d7b857af0a8a1090d2ea17c6847f2e61fab7db7c23ac9acbade296fd8952750d173023473ae60d207c8f5b20c68b9ef9cb1d4 +EBUILD libtrace-4.0.18_p1.ebuild 1464 BLAKE2B 1fef8a354180d1a9ef7f3f6c9b1db7c9dae0fea452f9594faf1ae6aa3fb494d9b1caeb638741bacb985f723f81c7cd7bd46771e77e0f0f8e7498ecb929359338 SHA512 984f9ce9819e0b3cf67d10212292a2dd8570f8c713d8a21ab528bc101500543e92d64aafeaf212038a4228f4c8bb4689027da7c7cefad0db29e89f729c200356 +EBUILD libtrace-4.0.19_p1.ebuild 1347 BLAKE2B e29cef7b5993fef83ebe2e303accff892b7eb9a2d2eccb0f53277db99e9c0bc0339fdbd469c55acbe310128050a9614289c07f8510655fd1b5a7cde9c6522875 SHA512 1212f042e2169cf09f42da5b8de048a2e2184ce203698ebeb9dfe930658962121a6813764c6a4472f676c402b5890edb60b46e50006e49548d57222b9a176fa8 +EBUILD libtrace-4.0.20.ebuild 1386 BLAKE2B 2196b24de3d5bd44a331e1f685851cc8ce58fc371a81f82ae3e728f8cbc21d6b84426bafc1185b34b515db5afcb271abb41957d27ae6d2b8e8d1cb5b2c94e77d SHA512 16c4bb2fde988ffbf1641f1450a08efc55e576675b450a198549f4c401f7f5cb915b5f5bb0bb32f76e06288bc3590b09df00f8dc83adbc4a45a707a8c68abc53 +EBUILD libtrace-4.0.21.ebuild 1394 BLAKE2B 11497f0bb46e510618010a65e53fa51274ec403aa145b37e200e22b4f60ffc0c2628804338d788ab784d8ed746c30ec604a1ab7878e2c5b4e90d2571b139eda7 SHA512 83f7a2fb91a491a6671417053698b899125f3c63679d40a20d4e30e97cfb9431880098c7ccaff409b66ef9f1bd3928e1abbdaa5c55efc13306b9d166dc19269a +EBUILD libtrace-4.0.22.ebuild 1394 BLAKE2B 11497f0bb46e510618010a65e53fa51274ec403aa145b37e200e22b4f60ffc0c2628804338d788ab784d8ed746c30ec604a1ab7878e2c5b4e90d2571b139eda7 SHA512 83f7a2fb91a491a6671417053698b899125f3c63679d40a20d4e30e97cfb9431880098c7ccaff409b66ef9f1bd3928e1abbdaa5c55efc13306b9d166dc19269a MISC metadata.xml 525 BLAKE2B 02976e0d1f606614b5902644f5ee4d6580f6b0db53fb5a348a44a0e653052007a1e9f31bbf8185f0b2fc5cd890ffac517aae512c78625e8f30cdda4223f7a5f3 SHA512 fb048667eb5579363b3a62b1c6b7ac2d1f3e2a25b980f9f485b418dcf9d794f27608de847f7eb444765ef69dfcbcbd710af87f051d492fdb2b21f05a1ff231a8 diff --git a/net-libs/libtrace/libtrace-4.0.18_p1.ebuild b/net-libs/libtrace/libtrace-4.0.18_p1.ebuild index 763bf51f6961..404ec0be0516 100644 --- a/net-libs/libtrace/libtrace-4.0.18_p1.ebuild +++ b/net-libs/libtrace/libtrace-4.0.18_p1.ebuild @@ -24,7 +24,7 @@ RDEPEND=">=net-libs/libpcap-0.8 ncurses? ( sys-libs/ncurses:= ) numa? ( sys-process/numactl )" DEPEND="${RDEPEND}" -BDEPEND="app-doc/doxygen[dot] +BDEPEND="app-text/doxygen[dot] app-alternatives/lex virtual/os-headers virtual/pkgconfig @@ -42,7 +42,7 @@ src_prepare() { eautoreconf # Comment out FILE_PATTERNS definition (bug #706230) - if has_version ~app-doc/doxygen-1.8.16; then + if has_version ~app-text/doxygen-1.8.16; then sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die fi diff --git a/net-libs/libtrace/libtrace-4.0.19_p1.ebuild b/net-libs/libtrace/libtrace-4.0.19_p1.ebuild index 645692fb0c9f..da401f1ea38b 100644 --- a/net-libs/libtrace/libtrace-4.0.19_p1.ebuild +++ b/net-libs/libtrace/libtrace-4.0.19_p1.ebuild @@ -22,7 +22,7 @@ RDEPEND=">=net-libs/libpcap-0.8 ncurses? ( sys-libs/ncurses:= ) numa? ( sys-process/numactl )" DEPEND="${RDEPEND}" -BDEPEND="app-doc/doxygen[dot] +BDEPEND="app-text/doxygen[dot] app-alternatives/lex virtual/os-headers virtual/pkgconfig @@ -32,7 +32,7 @@ src_prepare() { default # Comment out FILE_PATTERNS definition (bug #706230) - if has_version ~app-doc/doxygen-1.8.16; then + if has_version ~app-text/doxygen-1.8.16; then sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die fi diff --git a/net-libs/libtrace/libtrace-4.0.20.ebuild b/net-libs/libtrace/libtrace-4.0.20.ebuild index 16c597619df1..0c4bf1d66107 100644 --- a/net-libs/libtrace/libtrace-4.0.20.ebuild +++ b/net-libs/libtrace/libtrace-4.0.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,7 +26,7 @@ RDEPEND=" numa? ( sys-process/numactl )" DEPEND="${RDEPEND}" BDEPEND=" - app-doc/doxygen[dot] + app-text/doxygen[dot] sys-devel/flex virtual/os-headers virtual/pkgconfig @@ -39,7 +39,7 @@ src_prepare() { eautoreconf # Comment out FILE_PATTERNS definition (bug #706230) - if has_version ~app-doc/doxygen-1.8.16; then + if has_version ~app-text/doxygen-1.8.16; then sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die fi diff --git a/net-libs/libtrace/libtrace-4.0.21.ebuild b/net-libs/libtrace/libtrace-4.0.21.ebuild index 5416f1837ee6..8e5ea4214918 100644 --- a/net-libs/libtrace/libtrace-4.0.21.ebuild +++ b/net-libs/libtrace/libtrace-4.0.21.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 @@ -26,7 +26,7 @@ RDEPEND=" numa? ( sys-process/numactl )" DEPEND="${RDEPEND}" BDEPEND=" - app-doc/doxygen[dot] + app-text/doxygen[dot] sys-devel/flex virtual/os-headers virtual/pkgconfig @@ -39,7 +39,7 @@ src_prepare() { eautoreconf # Comment out FILE_PATTERNS definition (bug #706230) - if has_version ~app-doc/doxygen-1.8.16; then + if has_version ~app-text/doxygen-1.8.16; then sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die fi diff --git a/net-libs/libtrace/libtrace-4.0.22.ebuild b/net-libs/libtrace/libtrace-4.0.22.ebuild index 5416f1837ee6..8e5ea4214918 100644 --- a/net-libs/libtrace/libtrace-4.0.22.ebuild +++ b/net-libs/libtrace/libtrace-4.0.22.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 @@ -26,7 +26,7 @@ RDEPEND=" numa? ( sys-process/numactl )" DEPEND="${RDEPEND}" BDEPEND=" - app-doc/doxygen[dot] + app-text/doxygen[dot] sys-devel/flex virtual/os-headers virtual/pkgconfig @@ -39,7 +39,7 @@ src_prepare() { eautoreconf # Comment out FILE_PATTERNS definition (bug #706230) - if has_version ~app-doc/doxygen-1.8.16; then + if has_version ~app-text/doxygen-1.8.16; then sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die fi diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest index b3c455fcd012..bc8b6e5e5124 100644 --- a/net-libs/libyang/Manifest +++ b/net-libs/libyang/Manifest @@ -1,3 +1,3 @@ DIST libyang-2.1.55.tar.gz 1201664 BLAKE2B b23d886163b1082c8895d1450113f364288eb6f77c4c73f7da1576877c35312b5558dbaf90e43268e18dd9348b024547c8cc4ee3a7ddabfb3762ffe67c47dc17 SHA512 dd0b58aec7e2d84f62636c62c9e7f67f0b4819e8d5ce9236874a3531607aa6fb58ccdcf537534eae8bfa700c37b8e3524be659929f4e7e03f8f67968bc352cb4 -EBUILD libyang-2.1.55.ebuild 804 BLAKE2B 07b3e55536898b232b880033d71e764db6fa2f33b4c40fa8fa853c35a7ab25e6f12171e70523f6b0e47b63c57a53129e4768e93b15e7759098364f6d6e1941d7 SHA512 88f6e74fe4c7c279ffdb427fd5c4d6d39e351787b589baf5c306476ea22f6bb85f3fb4b07f23df1bf1901ee3905439b35644a2b6d27763fe47cabe28b9200f4e +EBUILD libyang-2.1.55.ebuild 805 BLAKE2B d30273750afc3689c63d26e15c89d624d46091b229843346b56cb5285b25ab834abbe29fc57fb54cf310c6cf3330b614454114de65612ab0942041b57ad91bdd SHA512 5b2d3b61453974294cddaf8a497898ff5a7a54edfbf8933496fdfb38b0bc45267a2a1742106446fd7525b1d054e82083370fef89d02de3f9360e9a2f46fdd72e MISC metadata.xml 327 BLAKE2B ea8b33be859f8dd94b8aeff9bec39e90b9b0c2984c7df56de4ff7b0c39006723b721119b6fde6fe120f9d423559e8450ecbee3dbe1a65705f9c3e55c34eba1e3 SHA512 14c3ef2d8d242a8bcf7786419afe8b723455603bf187dad10f619b67c9c30bc0e0ab681974b294a4c73f0a32ca68366a1b7b2a730f6d3362af348765c0da1e31 diff --git a/net-libs/libyang/libyang-2.1.55.ebuild b/net-libs/libyang/libyang-2.1.55.ebuild index e49292e8b77c..21f0ae31268c 100644 --- a/net-libs/libyang/libyang-2.1.55.ebuild +++ b/net-libs/libyang/libyang-2.1.55.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ DEPEND=" " BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) " src_configure() { diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest index 0ef5b6cd8616..160d8daa8d98 100644 --- a/net-libs/mbedtls/Manifest +++ b/net-libs/mbedtls/Manifest @@ -2,8 +2,8 @@ DIST mbedtls-2.28.1.tar.gz 3914438 BLAKE2B 85969895b50b63537438e0b67e1dec97a0ee4 DIST mbedtls-2.28.5.tar.gz 4005000 BLAKE2B 755287e1a1e0be5d193a8a184a9ae3ab2b6c216235657f7f2e422fe06226cd4c7d11811bcb53519018137e7ed838b241704c955872e28f133bb17a5f42222acb SHA512 339911d244b4e6e4d77b344c796f018d9ad4c56249530b8a56e0dc305ddf30bc709dca96a19c5a06710e92d167ef22893e9e17e20837e9daee0d0be00a8ccae9 DIST mbedtls-3.2.1.tar.gz 4097571 BLAKE2B 4f33172c9c7a3ffbad6600c41d9b574a79e512ec417c3ec90a04085cce393456e8502e94150094bc80a217c352c8148d67bdab1bf0cb311c8dc88d653475a003 SHA512 e7f1726d2cdae6c580d588b40c8a51b9e353786efdd2e50fd1c11c7f46a2b6fe2622cfe2ee5cf998ec762b5ebf8f4720cfc1a1ecaebc497489f9d6a263a83523 DIST mbedtls-3.5.0.tar.gz 5614026 BLAKE2B 958825f59bb7f269c81042da66a1cd1d12ac799b599613582da591d455dc159aa344370bae8c0436e33c293bd69b1ae9266d2788a0bacd58f0ae8247bafb7f3d SHA512 87b58f698bb740aecb639155ac1248674d2b15ee7fa0eb01136f8fe476ddce0069589a13d532f38ee6db8285abed25570d2bcf55148c2324d8277048a93aacdd -EBUILD mbedtls-2.28.1.ebuild 2750 BLAKE2B f5c96dc57600dd4a215c427048586b89d59f61be6cd890d445b32b9c6f5c20618f427367c1e4022c1e1ed74bada52d467996e2d1a63d879eed6a043c9845e61a SHA512 811a598e3c7932e4a3d9eb608786d0985f73a4ce476f87a5fb4ffa5b9dae04e831d7c37f8dc98074eb90b8f33e9fda109cd0fcbeb734ec1c24c1b6347b7e4561 -EBUILD mbedtls-2.28.5.ebuild 2760 BLAKE2B 046190db6304b0145ba43da9202b58d36a0f84e102a9d5478a2df5244add800a7522e2d6b82701f737a2b7a046887725cbf52ee5d9f13632b54b71ac826b02d6 SHA512 c5fcdc012422397ef227a3673e3633108e2b22d4df7e32a51f1b626c995228f4fb1ae26c662d63936d5a01343d978148399b8d66e2c468f098dad23597bb3e6e -EBUILD mbedtls-3.2.1.ebuild 2446 BLAKE2B 70ce47c46fc5ac021dd77ec321bd27432553722cbe256932d49a45697516afcbb31ed3bd984569d571bdd66e16731ce0703b70999058aa552782988b378fa9fa SHA512 8737b2d01a1790fc5feec96f88a8ffd9c3933605b40bacb05f85520535e1f6a3c420e1b31269ca8e9c75c724ccaaae97ba460f1e16bb848b4efede749c65f519 -EBUILD mbedtls-3.5.0.ebuild 2456 BLAKE2B 67c7c8395ce6dac140e120229996caa507e1b820d553e68c74c06770b218e181a0627e3ab5abbc25d12fd680a2b9bdf42c1e92f88b93b0a503f028d7931206d2 SHA512 0cf48b3d76df5acd95bb3c0cd748cce3cd311c272a98ce4f19b2e43b17d52c073818536373a3cfd3c7a1c25f869fcc1451adc6451d0ceccb3c0236d9c92176bf +EBUILD mbedtls-2.28.1.ebuild 2751 BLAKE2B 82ec54f58cd561c1f75f488d40894817a5c07d81fc4be3e8c3769590ac748377bae677d090704addd0deb371fb197f7a57c05db5b299b4766fd898a6ef76344f SHA512 813f136f08c723528b96377c58867c83e4424cf2cb843efb830535ef4574a1327879e03d07b8906260cba1215d92b0983e165dbca0c2de5811c1ef49c3548d8a +EBUILD mbedtls-2.28.5.ebuild 2761 BLAKE2B 4a3ee0e033de9755cf4999eebe92d64e26e5a0e4587f979cfc03d83ea79f6a40c41a5dab42d72b9e5a14f6bf4a32aeeaa33c596ed9a6f01b61cd3cf7669722c5 SHA512 33dcd0c74643a4f7344f83f5b00949da86e1675183b4630feb7ae317379863557e9f61ce8edf876e3cbee548ab0df8a39b35190f0b0a351a628774bb747f4222 +EBUILD mbedtls-3.2.1.ebuild 2447 BLAKE2B f9e945b371996d118fe2dee4f5d7e9dc374c8d633b899630c5c931a1de16a813ec7b49da7d10f5c3f8ac9ae75c34ac8c5540d8344d05208ae12d131c7e63fd74 SHA512 ec8ba8bc268487b1d6e56378221c35462b869a3e2c5debbc9a252bc3f21715ca482033b39585baa3ff160234b598276cf40022e82c76aff9dd14ed68eba56ae4 +EBUILD mbedtls-3.5.0.ebuild 2457 BLAKE2B de993ed8cfe5d33b8fc957e878f150045a32600eff19db60b7640450afd8d9617541f4630265f23129088a843e530cc5f3eb10a84181029850a7a424240a7b07 SHA512 3af80b3ac422fbece6ede42acbe2ecf34d9656ff5500f4d60b180e0dafde8ed8bff9fb366662af10ace61096b8ce8c67086640e1b69db8d7c37244741104fd6c MISC metadata.xml 1002 BLAKE2B 033d355a23e984031d34df15058ec85e3e733cc3d88b3828d40a18e599ce7e669a413889a580534c06dd36a0d377583754a8115fc84a39461dc1727950eccdab SHA512 4687bdebe365f74517b650e62c7b7062d36e4f460370bc8e1517963866556076f56e74e9191b166b6d3a0b990947ab653d10768ade6d6275783c62c81f0b094b diff --git a/net-libs/mbedtls/mbedtls-2.28.1.ebuild b/net-libs/mbedtls/mbedtls-2.28.1.ebuild index e4fde3a1e519..88331eaf0432 100644 --- a/net-libs/mbedtls/mbedtls-2.28.1.ebuild +++ b/net-libs/mbedtls/mbedtls-2.28.1.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 @@ -22,7 +22,7 @@ RDEPEND=" ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - doc? ( app-doc/doxygen media-gfx/graphviz ) + doc? ( app-text/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )" enable_mbedtls_option() { diff --git a/net-libs/mbedtls/mbedtls-2.28.5.ebuild b/net-libs/mbedtls/mbedtls-2.28.5.ebuild index 856f052b1c77..2edf0c6ccf69 100644 --- a/net-libs/mbedtls/mbedtls-2.28.5.ebuild +++ b/net-libs/mbedtls/mbedtls-2.28.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 @@ -25,7 +25,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" doc? ( - app-doc/doxygen + app-text/doxygen media-gfx/graphviz ) test? ( dev-lang/perl ) diff --git a/net-libs/mbedtls/mbedtls-3.2.1.ebuild b/net-libs/mbedtls/mbedtls-3.2.1.ebuild index 77faa9515784..86aebd1df472 100644 --- a/net-libs/mbedtls/mbedtls-3.2.1.ebuild +++ b/net-libs/mbedtls/mbedtls-3.2.1.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 @@ -21,7 +21,7 @@ RDEPEND=" dev-libs/openssl:0= )" DEPEND="${RDEPEND} - doc? ( app-doc/doxygen media-gfx/graphviz ) + doc? ( app-text/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )" enable_mbedtls_option() { diff --git a/net-libs/mbedtls/mbedtls-3.5.0.ebuild b/net-libs/mbedtls/mbedtls-3.5.0.ebuild index c8e22a761ee7..66d87b69c563 100644 --- a/net-libs/mbedtls/mbedtls-3.5.0.ebuild +++ b/net-libs/mbedtls/mbedtls-3.5.0.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 @@ -24,7 +24,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" doc? ( - app-doc/doxygen + app-text/doxygen media-gfx/graphviz ) test? ( dev-lang/perl ) diff --git a/net-libs/meanwhile/Manifest b/net-libs/meanwhile/Manifest index 72d480059f3e..306c415c24e3 100644 --- a/net-libs/meanwhile/Manifest +++ b/net-libs/meanwhile/Manifest @@ -2,5 +2,5 @@ AUX meanwhile-1.0.2-gentoo-fhs-samples.patch 588 BLAKE2B 1905d0d49a814157ae8f6c8 AUX meanwhile-1.0.2-glib2.31.patch 6461 BLAKE2B 1d46f23d60776dd3f3743ca8c892828b966bc3bcf679d7e3f33739fb1d54fe999bf9ff605590c7458b3d4e12a374109903ba53bad1763e343c30224c506b89bf SHA512 b22a45ff231f33294808e65dd0e0461810be26078d94493c56e3e0303fa9d5606f7916f14edee7f94a2b78574300ba76df433b9e3c1ba0b5df3da0d07aa9ca70 AUX meanwhile-1.0.2-presence.patch 1163 BLAKE2B ba471439dd6acaa5e4b3db78432b76379570c8bde5c760ce0ce388ef33b41527e43c001445c7bfad3e998590c8e80e13b6b12723d340bfac338e9394ed4b8e9a SHA512 f4caf5f727464b044ed533abcb3929227bc55cba4132b55587411ae5c78c320c916924c5b9228a34634af68f4a00d8103616c64b4b77f04e15f66d8ff62dbbd7 DIST meanwhile-1.0.2.tar.gz 479325 BLAKE2B 70b032ab9b1fc6f556a16afceec5eac72b8efc686977734c84068fb34e49fed01c2c20743ba058cd99de155dd0172ea2132c8bdbfbbfcaa572f889c15da96e01 SHA512 ba356124352ed522bc4c62282e4267960e0d3751c990cc422957ae263c70932264dee2d5e3dfe436325ad53f1833ff541eda4b36a6b78441374256ef54c786e6 -EBUILD meanwhile-1.0.2-r1.ebuild 979 BLAKE2B a04e475c594a33260523d2bc3acef00ef9f46ce6b65671370aad0c83572632df5db90aaa03e9c17f96e9baeaf22cf441657351566ca0b2f082c3a1750854380a SHA512 15d5de0b494dc4c31817a64948f362b280e62adaa47e1c729bb2efeaeb73b95a25fa889b797e03f30caa6c942531baf35acec02d901fe90ee533ad166737a74b +EBUILD meanwhile-1.0.2-r1.ebuild 980 BLAKE2B 3d7458d676a45867663d6f08ebe111eb228ad9c40c71ac5f300b3ec1be31a83b35bc3b1773d5db9d0ad5f2ec13ef4f48dd2b0e1ac13fa9fd2b22041b82beae1d SHA512 dc12a5826bc3a8a9b4a8e0fc14aca250f9db36f2b40cf60695e128e3d94855e5945d9db3aa66478afde6a6123033cb2b97affd3eec01a3451d2990d27e7ed782 MISC metadata.xml 247 BLAKE2B 74c28276074552d0fc5d810dd61a5545f6fb763a986b82e4ae8d2d0fa46c114c6e192a43415a01d92eaddeebce452a391a6fcde5dea93059d653e6bfe2a1c660 SHA512 620b20721d49742e3afb9c30ec96c54f1223fa8a89d27489c8ae0bd20702f87748a53991d3e396264f8260b967fab8ddc1eb832a49614d729757a828ecda2aeb diff --git a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild index c652f9cfc69a..6173a8f7aae4 100644 --- a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild +++ b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ DEPEND=" dev-libs/gmp" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen )" + doc? ( app-text/doxygen )" PATCHES=( # bug 239144 diff --git a/net-libs/paho-mqtt-c/Manifest b/net-libs/paho-mqtt-c/Manifest index c46c45ef8d91..eaa0d3295316 100644 --- a/net-libs/paho-mqtt-c/Manifest +++ b/net-libs/paho-mqtt-c/Manifest @@ -1,4 +1,4 @@ DIST paho-mqtt-c-1.3.13.tar.gz 3489004 BLAKE2B c835f4e2a741539df900184825b4ce29138f76828ec329d9321c54a845607b8137292330b019e950640f36bb14b0252dfba4906be746742950e3f8f13985608e SHA512 0f436470bcff224461ed3227c8db10914f84bc2dcf76e51b55d4a78b80abaa4e636ac8f7a20e517524625888335c738e975283e5d573ae8d59147aa4de7963fc DIST paho.mqtt.testing-a4dc694010217b291ee78ee13a6d1db812f9babd.tar.gz 175858 BLAKE2B 7ba1be3e09740f45907c4ba2a5314830a56c4f6626af3fab15928647b235908429a96ece312e7f5b8fa044583c81e6d8deacc0fbd290e6e08fbc328524dba3f1 SHA512 a20ea68cfac7f2a4e140c9b9ebacf4debd544098151545dedb72fe1e3629b3a495df7e15b0e131d52c4e86fb8d165cb7b2ceee019c15599b0cb5d914da0e7723 -EBUILD paho-mqtt-c-1.3.13.ebuild 2542 BLAKE2B b18c6f262daccd46ce8df6de20a5b11ebcc6584172d57238d67cf6f7b6574437d6b9e3123e2e5095e97751d850463acfee698f496aca9d8fccb74bd61f10989c SHA512 1f5e5596a1b1eb0a4cb7a2d58b20a0f738ee30889d77334d93f2b6548a4a62d3288c4f9c9463be42e06285a262c84266154faead359badff1455291e169c7e76 +EBUILD paho-mqtt-c-1.3.13.ebuild 2543 BLAKE2B 68d53b3be494bc5ed88abca73cdae2b296dee46822cff90e77bd48f0c8de9fb2d07fd001893b12c2ce20384e01106ce31e708243e841dfcc970121d48040db51 SHA512 fccc294ebb89b4e5acf3bced4e9007f1f3131d8668bb419d45be382feef02ec14c0addef6e6505299b174764ede9acc2c97193374c962509a637f0f7c8e508ea MISC metadata.xml 812 BLAKE2B acf5c65842b641cbc813df4786c3cb65b6e7155b5082b5bee50bf7abb6531fab53bb4a4fad9452a062d7612cc663eb4e3327a4e9c9c9a9349f1b139289c7943c SHA512 f1aa7056cde248fb0976bf8b635017311aa6a53961fdf5c02eb601c1ffdc0079693d430ef143410a8873a07cf4809443fde98436c0ff640a0625361ffe488789 diff --git a/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild b/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild index 4cb7bd4741a7..842492849073 100644 --- a/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild +++ b/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.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 @@ -28,7 +28,7 @@ REQUIRED_USE="examples? ( ssl )" # Tests require net-redirections to be enabled in bash. See bug #915718 BDEPEND=" - doc? ( app-doc/doxygen + doc? ( app-text/doxygen media-gfx/graphviz ) ssl? ( dev-libs/openssl ) test? ( diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest index 8b7974a90d40..17619b83e397 100644 --- a/net-libs/qxmpp/Manifest +++ b/net-libs/qxmpp/Manifest @@ -1,3 +1,3 @@ DIST qxmpp-1.5.5.tar.gz 606405 BLAKE2B 999dfcaa601f1d79df97febcd63bfcdcce87de9c0e68db6c1253407c89414003f326011a9a5e366031f78ddae084d06f04851ab3f4573ee53c59567770ae0edc SHA512 39774655fdb87dc54f32f7a018d4964c9ff8e9bebedd9cc94e6ad41288bd67365eec524525de09c5a3d2ea274e418fc6d5497ac2c1927946154cadaf7fc0d655 -EBUILD qxmpp-1.5.5.ebuild 1173 BLAKE2B 87ef135030d2cf796882a2bd90e3c3fb872476e3d20a66bc5a17bf60eea895611e4ed1fe37367c2fe7339e1da4517a2e7ceaeb80232d0ad6d1929728459df3bd SHA512 77f6448e14f626f5b57fc493d5c69643efe361412c28b11abaacc213ca556e7aaebe779a3cfda137e0e5c90323c728747ac72ea609cf66f5c7464cd11516b19f +EBUILD qxmpp-1.5.5.ebuild 1174 BLAKE2B 36365e9c768bea247e86112d82ccfbbae7363b5839190f22fd1813bdd823431a37e133c9357527058abf8a9d3ff93a20561be87e9128f59d2c52379fdd5195c8 SHA512 8798ae15e52cb18da3126151301f8a6293421c07166f7dd74cddfdde8f52e124b3ee16587b3e4f1fed8318904f138acb2092263ada647638380e0fdfebbc78ac MISC metadata.xml 712 BLAKE2B 7e1c78ed48ec7054376fba6babd95594706f7f560cb057fce3dfb4c88ad961fa0f0e0010a156ec487e66268015e6229ee0e2941561377a262b09a1fdc8778b55 SHA512 dc381ed3677ccb1a215215d3e4340b2e696410da368b470d77d0807bf6140907ae8f3a809c2ef33437807b1becd7a14a5240c5b541153765d8b9012a49bc90c2 diff --git a/net-libs/qxmpp/qxmpp-1.5.5.ebuild b/net-libs/qxmpp/qxmpp-1.5.5.ebuild index 3a313fe6d2c3..943f6c7e5580 100644 --- a/net-libs/qxmpp/qxmpp-1.5.5.ebuild +++ b/net-libs/qxmpp/qxmpp-1.5.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 @@ -29,7 +29,7 @@ DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) " BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_configure() { diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest index 8947c3c96f71..9e406f886db6 100644 --- a/net-libs/rabbitmq-c/Manifest +++ b/net-libs/rabbitmq-c/Manifest @@ -1,6 +1,6 @@ AUX rabbitmq-c-0.13.0-read-credentials-from-file.patch 4241 BLAKE2B 7643d57b94b5ec340dfdb1a886ab7e8a3a5b29cf2e17efd27a29d85adfd67d892c520b91799f4dcdc6959fda1361583364509fdd366abac16aeaba56aefdbc98 SHA512 64b143f6ea985dcaf9a847b3b973ea1a7a9fd9e77271f874b010b3fa59e74e283c1083904288fd3cc1e6767912e2e8a8bbcae10aa6769fa50fd905a29f386300 DIST rabbitmq-c-0.11.0.tar.gz 145638 BLAKE2B dce862d132d4bca010dbc284957f34a35d55407ea0eb4fb79369f699207c01cc7ed64c1bd58bea2d1178bd2c02176c3e93b66177fc975175b1da9ab9baaf661f SHA512 0c3dbb6e2b862e9f25e3f76df798ea272bbd81de2865950b95adf1f1e5791eb20d7c9d5a76cb7d2fda54bad5f12bdf69cbfa7e9fd1afdede6f9ec729ca2287de DIST rabbitmq-c-0.13.0.tar.gz 126670 BLAKE2B dbb759bfb21cdce532bb770fecc21e18881da198f55278301143e9d4a0f070f58c00e4cadab71c6b4a0b91f198a1fd66cc405f518d52972cf68c0ef33ee2176c SHA512 a93c104846b7d004c97019f81879db4daf747fd29ee6f4feaf287302c0f24d5d34d8c7bc232805ccabf105fd1aa6dfcb88218236bb6bb33cebf64ec9e3dcd77c -EBUILD rabbitmq-c-0.11.0.ebuild 1286 BLAKE2B beae7e19f65fa4260410fab82d0b15a2dfdec12589a4eb29132cd79a2059858105c42bd013c1dca736a03f869ce5d2c1fccd55d1d6462f34d98151cd6d283076 SHA512 7e5272781de1477a477780d8beb75a3f62e4b9de412bd4c29558d57b175000e4d2dc09c74b85030d799d40efb59668ceda38d862e2dd87b996cfe5f6cfb5dc18 -EBUILD rabbitmq-c-0.13.0.ebuild 1321 BLAKE2B 99c751c9ef4275542a69a8ad268444f853dd8686d1d049c166e8ab52f61a6d2392e2f4d869f0025097cfe8c93412919ca2590ea92353b61200a80c120fa59439 SHA512 b8b28cebfd2d0763b9be300fb60f0b633a377def32f3e0a1c96fb10edb9de2d1103f3ea5aae2335f93769f909c7316689b6c4fe33f87446649e535e942908199 +EBUILD rabbitmq-c-0.11.0.ebuild 1287 BLAKE2B c60738fa477a49fb1014b45a3f688d8b9a48ae830a45bb6bb3e4a892fe5c8babab66b562dfa8724a7156107b5e59339028422cfa7f0fdc44deaf0664c7ba50aa SHA512 caf6a3835dde45516aa3d2d72cf953c9706cd2dbf199279bbcd915db7e34803462f2d6cd0ff53b87c3f3096f372fd20ece5e674e734563572ebc38529f38b315 +EBUILD rabbitmq-c-0.13.0.ebuild 1322 BLAKE2B 063e592a03a086e871f5a589b44c3936cb46921d0b2986eff201bfb1ae13ac384ceee1bf1c356935860a8a1ef5227ea49445f8510898b46fe3d24c67ee71b072 SHA512 5b773036c7d5c7f43d753de2af32584b44bd9b749929baa1b1d46691311e9d36f780cd035b8b3fe43b2c6c1207beb310044ad9f407e22d0fbb972bab59103f98 MISC metadata.xml 559 BLAKE2B 4d90132455a2ebec576c99568628ef8990be9cc378d6eb0626929f7c6f321dd2f82280f9333da35cba64bc079ced417b88423efe780f445eb73325b71bce45c8 SHA512 7053f4dd3049af2fe7121abbf32fd448e2e310a827dd40e48deabbe324a9f4767820b5e1e834e9d9e8496ff16bb145557dcad40bb556cb0d56b1446300db366d diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild index 86bdbb1b7e79..ef0b261ecebb 100644 --- a/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild +++ b/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -27,7 +27,7 @@ RESTRICT="!test? ( test )" RDEPEND="ssl? ( dev-libs/openssl:0= ) tools? ( dev-libs/popt )" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen ) +BDEPEND="doc? ( app-text/doxygen ) tools? ( app-text/xmlto )" DOCS=( AUTHORS README.md THANKS TODO ) diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.13.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.13.0.ebuild index 01d68044d959..8d819f4233ba 100644 --- a/net-libs/rabbitmq-c/rabbitmq-c-0.13.0.ebuild +++ b/net-libs/rabbitmq-c/rabbitmq-c-0.13.0.ebuild @@ -27,7 +27,7 @@ RESTRICT="!test? ( test )" RDEPEND="ssl? ( dev-libs/openssl:0= ) tools? ( dev-libs/popt )" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen ) +BDEPEND="doc? ( app-text/doxygen ) tools? ( app-text/xmlto )" PATCHES=( diff --git a/net-libs/rtrlib/Manifest b/net-libs/rtrlib/Manifest index 703e0b91ed30..d939abf67b51 100644 --- a/net-libs/rtrlib/Manifest +++ b/net-libs/rtrlib/Manifest @@ -1,3 +1,3 @@ DIST rtrlib-0.8.0.tar.gz 262281 BLAKE2B 82fc5c8416540fdd87ba3683664ab0afdd905758541a9283ca60b5ec89c1642394cacf453d254f996128a5a9ab64fcefaf15d9a18a04451cdb3e1aa0e8e3c841 SHA512 36e44dce5c6117f3fe3c21994a7f9ebfeb4029ade1fddcb0f1df680c9ca4713fe3031da4cf80963b8a3d9bdb930bd9fd95c84b1fe182a9089a29ddfe879060dc -EBUILD rtrlib-0.8.0.ebuild 939 BLAKE2B 99e8a48eac321b02e0adc883b6f0d842e0fef31bd4e729c95eab340e610caab1601333b44125d3be5b6b2b2de4db27a5188cf87f6f819437aac975d0f0834491 SHA512 0a8d26e2b82a500c97b2f4cb2d2afb5cd2e54f11ade8da84f5d4b867a721f7fb828855a516c985b64c668853416deaeb8a7a049f4a8b1c1e66bee0a9f835abbb +EBUILD rtrlib-0.8.0.ebuild 940 BLAKE2B 27a85d65f8d14a7af2c4749ef65d389da69a7f0e6bec45916f4e149e421662f8daea38148e96cdb702ba638782d94ced422e9759daff99204a3b311c4ada72a7 SHA512 4beb2dc399833538fba720f5fefb9fda2a5147c5ded615425d01899ef7caacb81f1068e31779850753ae2cd2ba78fa474b5f1f70a13f32788aeb49ca990545a1 MISC metadata.xml 313 BLAKE2B 4a38d9c146228c313cb60652288d0700ca322d4a48ec3789e0812707f420ec3272de7d979283f03ba20d0563c106dd8542e67ad2bb6f6d30d22d180bc1c170c8 SHA512 5e2d2ad711208eafea92737485153a7cdf8ae14dbc39c67e709cda509df24eff91471bb82764b3d9635f2d2891f9fcec53dfd312f41d05feaa53f9c41fd20a0f diff --git a/net-libs/rtrlib/rtrlib-0.8.0.ebuild b/net-libs/rtrlib/rtrlib-0.8.0.ebuild index 9379131cb962..d903cb14d3bb 100644 --- a/net-libs/rtrlib/rtrlib-0.8.0.ebuild +++ b/net-libs/rtrlib/rtrlib-0.8.0.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 @@ -18,7 +18,7 @@ IUSE="doc ssh" RDEPEND="ssh? ( net-libs/libssh:0= )" DEPEND=" ${RDEPEND} - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) " src_prepare() { diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest index e72c43495e7b..ee3fe2845582 100644 --- a/net-libs/signon-oauth2/Manifest +++ b/net-libs/signon-oauth2/Manifest @@ -1,6 +1,19 @@ +AUX 0001-Port-QSignalSpys-to-PMF-syntax.patch 10255 BLAKE2B 4c37af2d97f3052754c6aebf67bd460cab6fa40ab59db6cbe375cb0287aff225d1cf791d5680435d73b6e55977a64672e95e0cecdc55c2dc4556e39e1b87e832 SHA512 6f1d948272c0a2938de482e92493161667d2509e761342c51050e0e413e6c00cf7fe0f50fb45ad2849907a3251d1fd3c5205253c8d0b402000f54b288aac74ac +AUX 0002-Port-to-new-connection-syntax.patch 4543 BLAKE2B a9b69c5270141f4c24525ee6cb662f95a589f55ccf2f90308477081aa7b1ad6d3d86343effd93729b69f5e673d448fc6bf0b67759d75b0d91d3db7f79efdbf7d SHA512 23c5eefe1c9b7fd2404d61b2d660f808f5f8ed84e1e1bda1f77b3333d20c049f67b56471f680646ea41d281be89d780745ea28aec60b5991d3493092fcb3bfeb +AUX 0003-Port-away-from-deprecated-error-signal.patch 1760 BLAKE2B 9c0531b20aadf7bb24659162495836a32c6e75b7e985daed35c5772ec54a5ab5862dfa990b53fd95401e7a8762bc18e9c559ea309fb480dec1385054ca84849b SHA512 1a9d4ed9277f63586d34b294da59c3ce35ceb93f8837a005af025f52047e5c76b834ee2a172fb3dc130e2c27aa3a19a7ad15d88e56b12ff8214a4481f7e5d816 +AUX 0004-Port-away-from-deprecated-qrand.patch 2294 BLAKE2B c69bc5594cdc5ce937ddf034d37dc88be1b8ce432d3f8e6c91ff15be5f41286af9e672b5b2c9920f1a06497907aa33961970ca4b30ffce1b6aa9b8b11a2e4644 SHA512 8ca6fca429243c54b7af7cf9630a9b0c1d841eb988768b2d374e0afacd14015df84e6f217f904a3999be01d304cbd7e16a2e13cc8c1fa7f65bf77a65baa510c3 +AUX 0005-Fix-string-concatenation-in-Qt6.patch 7713 BLAKE2B 8bf013b9008b6053e5fd00dd4dbdf30eb5fe049eb4201249fd03b2f17911eb20fcd6c9e4a7147fdf07ff468d0e048d4de475e3d1dc829d85e9660886f22e46a3 SHA512 90b2ef458bdda4949704c3921bb40fc316b1e00396d0c54ab9d28a3ceb5632bd95bff03e0f6db094e03540aed8dbe036f5996e3bdae00e2ab75b099f3d3d07b3 +AUX 0006-Port-away-from-deprecated-QRegExp.patch 1748 BLAKE2B 74db8998a6ae3e39983a8650206e01e69fa80b33ccf0750a98a4ea44ba00eae0d1a6382f8e9646622cee56234e29c1bb7e7fe97e6f3c36e29aca18d35e782a49 SHA512 857b35de8b2e6d86d013fdd6d1a1b3e9d79707bcc1276e24256a6de01b969e716b2b17bbafb909f845399e70c4613874850e616964a02ce64011242b8793939b +AUX 0007-Build-with-C-17.patch 674 BLAKE2B 14bfd05a70b3872c218643b0ccf384a6ec7551f6ae47bb91cca92d60fb2f2f1cc70614662b1c3a2e809735466694f71ca2667b055843edb2195448fc3f76a06e SHA512 dbe8b43155f92ada6d44617d9eadf0c3b561292fa4d63bb07ea230c300546ae775e024a1178d265b7d229cfc77c85e31e4dae056d49f63a0c1409d0b96ad5607 +AUX 0008-Use-correct-signon-in-example.patch 693 BLAKE2B 887e7ea5c3d901fd1a3525128db2b6cb3fa6b238f37682a81c23efa5e74c226284d3db08fc2bfff0fffba1ee0f5f5236d05733a78323b971f65b50cb86531f78 SHA512 375cd56a271b063120cdb0b91814ff34da21da316622465f0d5152793c686ab4e2552c3e145e6213cec9ffa6b6fd746b3e6b29e5c4ad5e2a7705c08563cb3ea9 +AUX 0009-Port-away-from-deprecated-QString-SplitBehavior.patch 1517 BLAKE2B 447c1df8998a9a8e673581195fc3f4ee8768753ea02967f5e63f27c4607e25f55c3b93362f377c714ae8787111b0cdcf6c24da1d76ddd9f9af02fe1502a375d4 SHA512 605934a62221851182b8abfd5b82a216fa36626098ec5683a74521c153d9f2fe1b45c850161503fe3557e12970bc98c164b8806bc1862d068b0ef7a92091e7fe +AUX 0010-Port-away-from-deprecated-QList-toSet.patch 1220 BLAKE2B 166ae7330bc12acc25a73fc6b100c60f508e5c94df43bd830255fa45e21fd8ea9f32409a85b9da5eea2b58eb6d8bb0839bfd9cb46a9d8bcaed88df8dc68532fc SHA512 37bd0ad71777a9cc9d5bfbc7cd05b47c0c78bdad345d24f9134fc7ea0cbb2e288c93914a408b8bb0d0188bc88613fb8b9562b4e4bd886b2bf371f3dbb8c11b84 AUX signon-oauth2-0.24-dont-install-tests.patch 352 BLAKE2B 6dfa625f68f0178947414dee97ab22a34e366353a7b5b07e166c426a5b86ab418faf31a8bcd868d297ae4b92d10a8231f403810f66d6f4dbfd31a0afeba4165a SHA512 af1908f5e2549182823847df5ef80b933adc6d4a15f39c63d4a82cb8540e97a29c60c7056f17fb2db314ed92d51594d5f76687862018a70f1de592ecb3a928d1 AUX signon-oauth2-0.25-cxxflags.patch 795 BLAKE2B 6dfd833830d7344f962fb97bde7c54f976be2c41988e90837225f3adfc0cc4b651aa670f35a95dc481ce651d10942a0d386e03f86dca117d4145928cda965111 SHA512 94dffe79441d5ea90acc29e1d457bdec2e762c18a169ae8873963ed612709d472ac55985ca21c41298557eda4e65879d70a595eda635df75a46c7bdea3ab675e +AUX signon-oauth2-0.25-drop-fno-rtti.patch 699 BLAKE2B 9913bb6405ecba28b2661c6c72245f71f0d4070110729a492a7dc01aa6de248d2a2fd06fb497ff213aeaf9f0f9ef63022993558a85409abb01efcf0d6698c7fa SHA512 08f2fa31707655af966cc99296e3497ab922d84a81348ab7d16557232ca6a967d452798ff510fda9724b59b8fbda3c7107ecfc4b8f064ab974889b3675108a8b AUX signon-oauth2-0.25-pkgconfig-libdir.patch 455 BLAKE2B 787c03ead028ff9e7980deb7eb4e2439864a1307e60dfa34b3e7c18d9f2b753016aa79208651624f10cebdfd89b672eb03097a8c7482389e7bb128bb16189e58 SHA512 b0589d51b4d5c7c51754752c7159e501620d782916fcea8aeb7d3eb8b33121372517be4babce48c90e5abd2e1fde9d3663deb66a8d2065e8cdbfedbf938b7a6d DIST signon-oauth2-0.25.tar.gz 41090 BLAKE2B d14cde073cf834427e337f94345b719ad1af38a285587f987f6ed42f96e8aecfcf63720e42b7f86f2018565c198e1f31b7b75da74c86db3e8a15680da70d3f9e SHA512 721cd514ee0a1175e3b1bbaa78dc1a87fd382327bcbee8356de040f04455f7cc80ed173e3f33a6acf4c0d679847063a25282e9d5c9a9be99f730bec41be96451 +DIST signon-oauth2-0.25_p20210102.tar.bz2 34873 BLAKE2B 4e53f6d19cf0e9c8513afef44ab640dcd3ed811a9830acff65abd997691926388015b35e6f010c6a0bc25cc257e22a4b8e359ec690bbc35182cd1cf87c716b85 SHA512 5b371e6230c9ed4352ff151626dfaf40d2ecb41e389ee3a753fc41be3937191d416b864d555fd85cecbfe1615233a063db881adae3ea29aefb652a36d46633b5 EBUILD signon-oauth2-0.25.ebuild 1151 BLAKE2B 754e64ec51bdc35ffa5b5a65373ecf19ac79e080d2874127881ebb9d05bb2286861a5cd3d32b02214ac28fd011b954b1800c5437f3224511a39240cf4b922d70 SHA512 d5262a193c7ef6ac34e3c43c5b5260a668eb42045dbc62ee87ad87e02ba95e903e50803614dfa71e16f3c8c1ea836c9ceb649d1167d3257c470c2f1f3777b5cf -MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f +EBUILD signon-oauth2-0.25_p20210102.ebuild 2398 BLAKE2B 031eb2f1e69a5f4bd9e082fe54bdca4b34d43e3048f864a0ce878a5cf4564c9a065ffd8790f624602f7b5ee1f8d2e614a226c645523fcf6b152e7232171350ad SHA512 b9751f7f7c6fb01858246d34859b450e5b44d91435b935f227ac7a097591c8d17f1801ea1b674923bd119eeaddcbc3fc759db9d1ccfc21aa11f8ba8c338c99a5 +MISC metadata.xml 348 BLAKE2B 223f85a8556cf010e028dcfe0fffc9d524d38f591aa07af45cb992f9095651113deeb18bb5a2a90b363b4dc62307a19e410c9ccc51b6d87de1b98a1e457ab8b7 SHA512 00f32e7e48f5bd2cad3286636d35f6d328a100eb555fed58b2ce49447a14a0fcc20a087f3fb0227e56669bd5873551532b4e3d36772fd5fae7f4d11dc0c84f68 diff --git a/net-libs/signon-oauth2/files/0001-Port-QSignalSpys-to-PMF-syntax.patch b/net-libs/signon-oauth2/files/0001-Port-QSignalSpys-to-PMF-syntax.patch new file mode 100644 index 000000000000..96b6d0af77f3 --- /dev/null +++ b/net-libs/signon-oauth2/files/0001-Port-QSignalSpys-to-PMF-syntax.patch @@ -0,0 +1,200 @@ +From d3ba6d4c19ca0b1081fbafc757d3c496cc21ada2 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 18:34:07 +0200 +Subject: [PATCH 01/10] Port QSignalSpys to PMF syntax + +--- + tests/oauth2plugintest.cpp | 86 ++++++++++++++++---------------------- + 1 file changed, 37 insertions(+), 49 deletions(-) + +diff --git a/tests/oauth2plugintest.cpp b/tests/oauth2plugintest.cpp +index 94e5c43..b257dc7 100644 +--- a/tests/oauth2plugintest.cpp ++++ b/tests/oauth2plugintest.cpp +@@ -244,7 +244,7 @@ void OAuth2PluginTest::testPluginCancel() + m_testPlugin->cancel(); + + //then real cancel +- QSignalSpy pluginError(m_testPlugin, SIGNAL(error(const SignOn::Error &))); ++ QSignalSpy pluginError(m_testPlugin, &Plugin::error); + + OAuth2PluginData userAgentData; + userAgentData.setHost("https://localhost"); +@@ -435,11 +435,10 @@ void OAuth2PluginTest::testPluginProcess() + QFETCH(QVariantMap, response); + QFETCH(QVariantMap, stored); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); +- QSignalSpy store(m_testPlugin, SIGNAL(store(const SignOn::SessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); ++ QSignalSpy store(m_testPlugin, &Plugin::store); + + m_testPlugin->process(sessionData, mechanism); + if (errorCode < 0) { +@@ -696,11 +695,10 @@ void OAuth2PluginTest::testPluginHmacSha1Process() + QFETCH(QVariantMap, response); + QFETCH(QVariantMap, stored); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); +- QSignalSpy store(m_testPlugin, SIGNAL(store(const SignOn::SessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); ++ QSignalSpy store(m_testPlugin, &Plugin::store); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -777,11 +775,10 @@ void OAuth2PluginTest::testPluginUseragentUserActionFinished() + QStringList scopes = QStringList() << "scope1" << "scope2"; + data.setScope(scopes); + +- QSignalSpy resultSpy(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); +- QSignalSpy store(m_testPlugin, SIGNAL(store(const SignOn::SessionData&))); ++ QSignalSpy resultSpy(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); ++ QSignalSpy store(m_testPlugin, &Plugin::store); + + m_testPlugin->process(data, QString("user_agent")); + +@@ -1286,10 +1283,9 @@ void OAuth2PluginTest::testPluginWebserverUserActionFinished() + data.setScope(QStringList() << "one" << "two" << "three"); + data.setDisableStateParameter(disableStateParameter); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1362,9 +1358,8 @@ void OAuth2PluginTest::testUserActionFinishedErrors() + data.setClientSecret("fa28f40b5a1f8c1d5628963d880636fbkjkjkj"); + data.setRedirectUri("http://localhost/resp.html"); + +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + m_testPlugin->process(data, QString("web_server")); + QTRY_COMPARE(userActionRequired.count(), 1); +@@ -1486,10 +1481,9 @@ void OAuth2PluginTest::testOauth1UserActionFinished() + data.setConsumerSecret("fa28f40b5a1f8c1d5628963d880636fbkjkjkj"); + data.setRealm("MyHost"); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1610,9 +1604,8 @@ void OAuth2PluginTest::testOAuth2Errors() + data.setClientSecret("fa28f40b5a1f8c1d5628963d880636fbkjkjkj"); + data.setRedirectUri("http://localhost/resp.html"); + +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1683,8 +1676,8 @@ void OAuth2PluginTest::testRefreshToken() + + SignOn::UiSessionData info; + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1766,9 +1759,8 @@ void OAuth2PluginTest::testRefreshTokenError() + + SignOn::UiSessionData info; + +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1842,10 +1834,9 @@ void OAuth2PluginTest::testClientAuthentication() + data.setRedirectUri("http://localhost/resp.html"); + data.setForceClientAuthViaRequestBody(forceAuthViaRequestBody); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1908,10 +1899,9 @@ void OAuth2PluginTest::testTokenPath() + data.setClientId("104660106251471"); + data.setRedirectUri("http://localhost/resp.html"); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1995,10 +1985,9 @@ void OAuth2PluginTest::testTokenQuery() + data.setClientId("104660106251471"); + data.setRedirectUri("http://localhost/resp.html"); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + QScopedPointer<TestNetworkAccessManager> nam(new TestNetworkAccessManager); + m_testPlugin->m_networkAccessManager = nam.data(); +@@ -2062,8 +2051,7 @@ void OAuth2PluginTest::testOAuth2AuthRequestUri() + QFETCH(QVariantMap, sessionData); + QFETCH(QString, expectedUri); + +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + m_testPlugin->process(sessionData, mechanism); + QCOMPARE(userActionRequired.count(), 1); +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0002-Port-to-new-connection-syntax.patch b/net-libs/signon-oauth2/files/0002-Port-to-new-connection-syntax.patch new file mode 100644 index 000000000000..f97e0041698a --- /dev/null +++ b/net-libs/signon-oauth2/files/0002-Port-to-new-connection-syntax.patch @@ -0,0 +1,101 @@ +From a0b372dfb6d37d0a81a545239128fec5ee94283c Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 18:51:29 +0200 +Subject: [PATCH 02/10] Port to new connection syntax + +--- + example/oauthclient.cpp | 8 ++++---- + src/base-plugin.cpp | 12 ++++++------ + src/plugin.cpp | 18 ++++++------------ + tests/oauth2plugintest.cpp | 4 ++-- + 4 files changed, 18 insertions(+), 24 deletions(-) + +diff --git a/example/oauthclient.cpp b/example/oauthclient.cpp +index adfcabf..328e8b7 100644 +--- a/example/oauthclient.cpp ++++ b/example/oauthclient.cpp +@@ -47,10 +47,10 @@ OAuthClient::~OAuthClient() + void OAuthClient::authenticate() + { + SignOn::AuthSession *m_session = m_identity->createSession("oauth2"); +- QObject::connect(m_session, SIGNAL(response(const SignOn::SessionData &)), +- this, SLOT(onResponse(const SignOn::SessionData &))); +- QObject::connect(m_session, SIGNAL(error(const SignOn::Error &)), +- this, SLOT(onError(const SignOn::Error &))); ++ QObject::connect(m_session, &SignOn::AuthSession::response, ++ this, &OAuthClient::onResponse); ++ QObject::connect(m_session, &SignOn::AuthSession::error, ++ this, &OAuthClient::onError); + + OAuth2PluginData data; + data.setHost("www.facebook.com"); +diff --git a/src/base-plugin.cpp b/src/base-plugin.cpp +index aa2d639..d5ce81c 100644 +--- a/src/base-plugin.cpp ++++ b/src/base-plugin.cpp +@@ -124,12 +124,12 @@ void BasePlugin::postRequest(const QNetworkRequest &request, + Q_D(BasePlugin); + + d->m_reply = d->m_networkAccessManager->post(request, data); +- connect(d->m_reply, SIGNAL(finished()), +- this, SLOT(onPostFinished())); +- connect(d->m_reply, SIGNAL(error(QNetworkReply::NetworkError)), +- this, SLOT(onNetworkError(QNetworkReply::NetworkError))); +- connect(d->m_reply, SIGNAL(sslErrors(QList<QSslError>)), +- this, SLOT(handleSslErrors(QList<QSslError>))); ++ connect(d->m_reply, &QNetworkReply::finished, ++ this, &BasePlugin::onPostFinished); ++ connect(d->m_reply, &QNetworkReply::error, ++ this, &BasePlugin::onNetworkError); ++ connect(d->m_reply, &QNetworkReply::sslErrors, ++ this, &BasePlugin::handleSslErrors); + } + + void BasePlugin::serverReply(QNetworkReply *reply) +diff --git a/src/plugin.cpp b/src/plugin.cpp +index e6af807..c764609 100644 +--- a/src/plugin.cpp ++++ b/src/plugin.cpp +@@ -107,18 +107,12 @@ void Plugin::process(const SignOn::SessionData &inData, + impl->setNetworkAccessManager(m_networkAccessManager); + + // Forward the signals from the implementation +- connect(impl, SIGNAL(result(const SignOn::SessionData &)), +- SIGNAL(result(const SignOn::SessionData &))); +- connect(impl, SIGNAL(store(const SignOn::SessionData &)), +- SIGNAL(store(const SignOn::SessionData &))); +- connect(impl, SIGNAL(error(const SignOn::Error &)), +- SIGNAL(error(const SignOn::Error &))); +- connect(impl, SIGNAL(userActionRequired(const SignOn::UiSessionData &)), +- SIGNAL(userActionRequired(const SignOn::UiSessionData &))); +- connect(impl, SIGNAL(refreshed(const SignOn::UiSessionData &)), +- SIGNAL(refreshed(const SignOn::UiSessionData &))); +- connect(impl, SIGNAL(statusChanged(const AuthPluginState, const QString&)), +- SIGNAL(statusChanged(const AuthPluginState, const QString&))); ++ connect(impl, &BasePlugin::result, this, &Plugin::result); ++ connect(impl, &BasePlugin::store, this, &Plugin::store); ++ connect(impl, &BasePlugin::error, this, &Plugin::error); ++ connect(impl, &BasePlugin::userActionRequired, this, &Plugin::userActionRequired); ++ connect(impl, &BasePlugin::refreshed, this, &Plugin::refreshed); ++ connect(impl, &BasePlugin::statusChanged, this, &Plugin::statusChanged); + + impl->process(inData, mechanism); + } +diff --git a/tests/oauth2plugintest.cpp b/tests/oauth2plugintest.cpp +index b257dc7..9e16950 100644 +--- a/tests/oauth2plugintest.cpp ++++ b/tests/oauth2plugintest.cpp +@@ -142,8 +142,8 @@ public: + open(ReadOnly | Unbuffered); + setHeader(QNetworkRequest::ContentLengthHeader, QVariant(content.size())); + +- QTimer::singleShot(0, this, SIGNAL(readyRead())); +- QTimer::singleShot(10, this, SLOT(finish())); ++ QTimer::singleShot(0, this, &TestNetworkReply::readyRead); ++ QTimer::singleShot(10, this, &TestNetworkReply::finish); + } + + public Q_SLOTS: +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0003-Port-away-from-deprecated-error-signal.patch b/net-libs/signon-oauth2/files/0003-Port-away-from-deprecated-error-signal.patch new file mode 100644 index 000000000000..5c7979b7e754 --- /dev/null +++ b/net-libs/signon-oauth2/files/0003-Port-away-from-deprecated-error-signal.patch @@ -0,0 +1,51 @@ +From 8211fd4a3ca31370069c6953db1589c1110dca90 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 18:59:12 +0200 +Subject: [PATCH 03/10] Port away from deprecated error() signal + +--- + src/base-plugin.cpp | 7 ++++++- + tests/oauth2plugintest.cpp | 8 +++++++- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/src/base-plugin.cpp b/src/base-plugin.cpp +index d5ce81c..ffc8ad5 100644 +--- a/src/base-plugin.cpp ++++ b/src/base-plugin.cpp +@@ -126,8 +126,13 @@ void BasePlugin::postRequest(const QNetworkRequest &request, + d->m_reply = d->m_networkAccessManager->post(request, data); + connect(d->m_reply, &QNetworkReply::finished, + this, &BasePlugin::onPostFinished); +- connect(d->m_reply, &QNetworkReply::error, ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++ connect(d->m_reply, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), + this, &BasePlugin::onNetworkError); ++#else ++ connect(d->m_reply, &QNetworkReply::errorOccurred, ++ this, &BasePlugin::onNetworkError); ++#endif + connect(d->m_reply, &QNetworkReply::sslErrors, + this, &BasePlugin::handleSslErrors); + } +diff --git a/tests/oauth2plugintest.cpp b/tests/oauth2plugintest.cpp +index 9e16950..f5221cc 100644 +--- a/tests/oauth2plugintest.cpp ++++ b/tests/oauth2plugintest.cpp +@@ -148,7 +148,13 @@ public: + + public Q_SLOTS: + void finish() { setFinished(true); Q_EMIT finished(); } +- void fail() { Q_EMIT error(error()); } ++ void fail() { ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++ Q_EMIT error(error()); ++#else ++ Q_EMIT errorOccurred(error()); ++#endif ++ } + + protected: + void abort() Q_DECL_OVERRIDE {} +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0004-Port-away-from-deprecated-qrand.patch b/net-libs/signon-oauth2/files/0004-Port-away-from-deprecated-qrand.patch new file mode 100644 index 000000000000..ef7804995346 --- /dev/null +++ b/net-libs/signon-oauth2/files/0004-Port-away-from-deprecated-qrand.patch @@ -0,0 +1,69 @@ +From 039dab8db2e16d02872c6e12c698157e05dc43e2 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:02:04 +0200 +Subject: [PATCH 04/10] Port away from deprecated qrand + +--- + src/oauth1plugin.cpp | 7 +++++++ + src/oauth2plugin.cpp | 6 ++++++ + 2 files changed, 13 insertions(+) + +diff --git a/src/oauth1plugin.cpp b/src/oauth1plugin.cpp +index 8ec7645..6c38cbb 100644 +--- a/src/oauth1plugin.cpp ++++ b/src/oauth1plugin.cpp +@@ -94,8 +94,10 @@ public: + { + TRACE(); + ++#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + // Initialize randomizer + qsrand(QTime::currentTime().msec()); ++#endif + } + + ~OAuth1PluginPrivate() +@@ -437,8 +439,13 @@ QString OAuth1Plugin::createOAuth1Header(const QString &aUrl, + .arg(urlEncode(inData.ConsumerKey()))); + authHeader.append(DELIMITER); + // Nonce ++#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + unsigned long nonce1 = (unsigned long) qrand(); + unsigned long nonce2 = (unsigned long) qrand(); ++#else ++ unsigned long nonce1 = QRandomGenerator::global()->generate64(); ++ unsigned long nonce2 = QRandomGenerator::global()->generate64(); ++#endif + QString oauthNonce = QString("%1%2").arg(nonce1).arg(nonce2); + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_NONCE) + .arg(urlEncode(oauthNonce))); +diff --git a/src/oauth2plugin.cpp b/src/oauth2plugin.cpp +index 418e7db..8763f00 100644 +--- a/src/oauth2plugin.cpp ++++ b/src/oauth2plugin.cpp +@@ -84,8 +84,10 @@ public: + { + TRACE(); + ++#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + // Initialize randomizer + qsrand(QTime::currentTime().msec()); ++#endif + } + + ~OAuth2PluginPrivate() +@@ -180,7 +182,11 @@ void OAuth2Plugin::sendOAuth2AuthRequest() + QString redirectUri = d->m_oauth2Data.RedirectUri(); + query.addQueryItem(REDIRECT_URI, QUrl::toPercentEncoding(redirectUri)); + if (!d->m_oauth2Data.DisableStateParameter()) { ++#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + d->m_state = QString::number(qrand()); ++#else ++ d->m_state = QString::number(QRandomGenerator::global()->generate()); ++#endif + query.addQueryItem(STATE, d->m_state); + } + QStringList responseType = d->m_oauth2Data.ResponseType(); +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0005-Fix-string-concatenation-in-Qt6.patch b/net-libs/signon-oauth2/files/0005-Fix-string-concatenation-in-Qt6.patch new file mode 100644 index 000000000000..daadd43423e8 --- /dev/null +++ b/net-libs/signon-oauth2/files/0005-Fix-string-concatenation-in-Qt6.patch @@ -0,0 +1,181 @@ +From 47ff5a950e54ae2a570183be21312bcaa5271396 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:04:44 +0200 +Subject: [PATCH 05/10] Fix string concatenation in Qt6 + +--- + src/oauth1plugin.cpp | 33 ++++++++++++++++----------------- + src/oauth1plugin.h | 2 +- + src/oauth2plugin.cpp | 4 ++-- + src/oauth2plugin.h | 2 +- + 4 files changed, 20 insertions(+), 21 deletions(-) + +diff --git a/src/oauth1plugin.cpp b/src/oauth1plugin.cpp +index 6c38cbb..3a1bbd5 100644 +--- a/src/oauth1plugin.cpp ++++ b/src/oauth1plugin.cpp +@@ -60,7 +60,6 @@ const QString TIMESTAMP = QString("timestamp"); + const QString AUTH_ERROR = QString("error"); + + const QString EQUAL = QString("="); +-const QString AMPERSAND = QString("&"); + const QString EQUAL_WITH_QUOTES = QString("%1=\"%2\""); + const QString DELIMITER = QString(", "); + const QString SPACE = QString(" "); +@@ -321,7 +320,7 @@ void OAuth1Plugin::process(const SignOn::SessionData &inData, + sendOAuth1PostRequest(); + } + +-QString OAuth1Plugin::urlEncode(QString strData) ++QByteArray OAuth1Plugin::urlEncode(QString strData) + { + return QUrl::toPercentEncoding(strData).constData(); + } +@@ -399,7 +398,7 @@ QByteArray OAuth1Plugin::constructSignatureBaseString(const QString &aUrl, + bool first = true; + for (i = oAuthHeaderMap.begin(); i != oAuthHeaderMap.end(); ++i) { + if(!first) { +- oAuthHeaderString.append(AMPERSAND); ++ oAuthHeaderString.append(QLatin1Char('&')); + } else { + first = false; + } +@@ -411,9 +410,9 @@ QByteArray OAuth1Plugin::constructSignatureBaseString(const QString &aUrl, + + QByteArray signatureBase; + signatureBase.append("POST"); +- signatureBase.append(AMPERSAND); ++ signatureBase.append('&'); + signatureBase.append(urlEncode(urlWithHostAndPath)); +- signatureBase.append(AMPERSAND); ++ signatureBase.append('&'); + signatureBase.append(urlEncode(oAuthHeaderString)); + return signatureBase; + } +@@ -427,16 +426,16 @@ QString OAuth1Plugin::createOAuth1Header(const QString &aUrl, + QString authHeader = OAUTH + SPACE; + if (!inData.Realm().isEmpty()) { + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_REALM) +- .arg(urlEncode(inData.Realm()))); ++ .arg(urlEncode(inData.Realm()).constData())); + authHeader.append(DELIMITER); + } + if (!inData.Callback().isEmpty()) { + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_CALLBACK) +- .arg(urlEncode(inData.Callback()))); ++ .arg(urlEncode(inData.Callback()).constData())); + authHeader.append(DELIMITER); + } + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_CONSUMERKEY) +- .arg(urlEncode(inData.ConsumerKey()))); ++ .arg(urlEncode(inData.ConsumerKey()).constData())); + authHeader.append(DELIMITER); + // Nonce + #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) +@@ -448,32 +447,32 @@ QString OAuth1Plugin::createOAuth1Header(const QString &aUrl, + #endif + QString oauthNonce = QString("%1%2").arg(nonce1).arg(nonce2); + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_NONCE) +- .arg(urlEncode(oauthNonce))); ++ .arg(urlEncode(oauthNonce).constData())); + authHeader.append(DELIMITER); + // Timestamp + QString oauthTimestamp = + QString("%1").arg(QDateTime::currentDateTime().toSecsSinceEpoch()); + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_TIMESTAMP) +- .arg(urlEncode(oauthTimestamp))); ++ .arg(urlEncode(oauthTimestamp).constData())); + authHeader.append(DELIMITER); + if (!d->m_oauth1Token.isEmpty()) { + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_TOKEN) +- .arg(urlEncode(d->m_oauth1Token))); ++ .arg(urlEncode(d->m_oauth1Token).constData())); + authHeader.append(DELIMITER); + } + + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_SIGNATURE_METHOD) +- .arg(urlEncode(d->m_mechanism))); ++ .arg(urlEncode(d->m_mechanism).constData())); + authHeader.append(DELIMITER); + // Creating the signature + // PLAINTEXT signature method + QByteArray secretKey; +- secretKey.append(urlEncode(inData.ConsumerSecret()) + AMPERSAND + ++ secretKey.append(urlEncode(inData.ConsumerSecret()) + '&' + + urlEncode(d->m_oauth1TokenSecret)); + if (d->m_mechanism == PLAINTEXT) { + TRACE() << "Signature = " << secretKey; + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_SIGNATURE) +- .arg(urlEncode(secretKey))); ++ .arg(urlEncode(secretKey).constData())); + authHeader.append(DELIMITER); + } + // HMAC-SHA1 signature method +@@ -484,7 +483,7 @@ QString OAuth1Plugin::createOAuth1Header(const QString &aUrl, + QByteArray signature = hashHMACSHA1(secretKey, signatureBase); + TRACE() << "Signature = " << signature; + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_SIGNATURE) +- .arg(urlEncode(signature.toBase64()))); ++ .arg(urlEncode(signature.toBase64()).constData())); + authHeader.append(DELIMITER); + } + // TODO: RSA-SHA1 signature method should be implemented +@@ -494,11 +493,11 @@ QString OAuth1Plugin::createOAuth1Header(const QString &aUrl, + + if (!d->m_oauth1TokenVerifier.isEmpty()) { + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_VERIFIER) +- .arg(urlEncode(d->m_oauth1TokenVerifier))); ++ .arg(urlEncode(d->m_oauth1TokenVerifier).constData())); + authHeader.append(DELIMITER); + } + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_VERSION) +- .arg(urlEncode(OAUTH_VERSION_1))); ++ .arg(urlEncode(OAUTH_VERSION_1).constData())); + + return authHeader; + } +diff --git a/src/oauth1plugin.h b/src/oauth1plugin.h +index 3ff227a..aa37e26 100644 +--- a/src/oauth1plugin.h ++++ b/src/oauth1plugin.h +@@ -65,7 +65,7 @@ private: + const OAuth1PluginData &inData, + const QString ×tamp, + const QString &nonce); +- QString urlEncode(QString strData); ++ QByteArray urlEncode(QString strData); + QString createOAuth1Header(const QString &aUrl, OAuth1PluginData inData); + QByteArray hashHMACSHA1(const QByteArray &keyForHash ,const QByteArray &secret); + OAuth1PluginTokenData oauth1responseFromMap(const QVariantMap &map); +diff --git a/src/oauth2plugin.cpp b/src/oauth2plugin.cpp +index 8763f00..c7f7f84 100644 +--- a/src/oauth2plugin.cpp ++++ b/src/oauth2plugin.cpp +@@ -393,9 +393,9 @@ void OAuth2Plugin::process(const SignOn::SessionData &inData, + } + } + +-QString OAuth2Plugin::urlEncode(QString strData) ++QByteArray OAuth2Plugin::urlEncode(QString strData) + { +- return QUrl::toPercentEncoding(strData).constData(); ++ return QUrl::toPercentEncoding(strData); + } + + void OAuth2Plugin::userActionFinished(const SignOn::UiSessionData &data) +diff --git a/src/oauth2plugin.h b/src/oauth2plugin.h +index a16c316..389d3c3 100644 +--- a/src/oauth2plugin.h ++++ b/src/oauth2plugin.h +@@ -84,7 +84,7 @@ private: + QVariantMap parseJSONReply(const QByteArray &reply); + QVariantMap parseTextReply(const QByteArray &reply); + void handleOAuth2Error(const QByteArray &reply); +- QString urlEncode(QString strData); ++ QByteArray urlEncode(QString strData); + QUrl getAuthUrl(); + QUrl getTokenUrl(); + +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0006-Port-away-from-deprecated-QRegExp.patch b/net-libs/signon-oauth2/files/0006-Port-away-from-deprecated-QRegExp.patch new file mode 100644 index 000000000000..dc2ab505552d --- /dev/null +++ b/net-libs/signon-oauth2/files/0006-Port-away-from-deprecated-QRegExp.patch @@ -0,0 +1,43 @@ +From bef68f45e80c13501f836ec9d14aa3df682748e8 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:05:13 +0200 +Subject: [PATCH 06/10] Port away from deprecated QRegExp + +--- + tests/oauth2plugintest.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/oauth2plugintest.cpp b/tests/oauth2plugintest.cpp +index f5221cc..5cbbab2 100644 +--- a/tests/oauth2plugintest.cpp ++++ b/tests/oauth2plugintest.cpp +@@ -26,7 +26,7 @@ + #include <QNetworkAccessManager> + #include <QNetworkReply> + #include <QPointer> +-#include <QRegExp> ++#include <QRegularExpression> + #include <QScopedPointer> + #include <QSignalSpy> + #include <QTimer> +@@ -749,7 +749,7 @@ void OAuth2PluginTest::testPluginHmacSha1Process() + QString authorizationHeader = + QString::fromUtf8(nam->m_lastRequest.rawHeader("Authorization")); + QStringList authorizationHeaderParts = +- authorizationHeader.split(QRegExp(",?\\s+")); ++ authorizationHeader.split(QRegularExpression(",?\\s+")); + QCOMPARE(authorizationHeaderParts[0], QString("OAuth")); + + /* The rest of the header should be a mapping, let's parse it */ +@@ -1535,7 +1535,7 @@ void OAuth2PluginTest::testOauth1UserActionFinished() + QString authorizationHeader = + QString::fromUtf8(nam->m_lastRequest.rawHeader("Authorization")); + QStringList authorizationHeaderParts = +- authorizationHeader.split(QRegExp(",?\\s+")); ++ authorizationHeader.split(QRegularExpression(",?\\s+")); + QCOMPARE(authorizationHeaderParts[0], QString("OAuth")); + + /* The rest of the header should be a mapping, let's parse it */ +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0007-Build-with-C-17.patch b/net-libs/signon-oauth2/files/0007-Build-with-C-17.patch new file mode 100644 index 000000000000..193923a6612a --- /dev/null +++ b/net-libs/signon-oauth2/files/0007-Build-with-C-17.patch @@ -0,0 +1,26 @@ +From e9d3bdbd4eb8331a03b0c49d6b3a6c020db11c7f Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:06:05 +0200 +Subject: [PATCH 07/10] Build with C++17 + +Needed for Qt6 +--- + common-project-config.pri | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common-project-config.pri b/common-project-config.pri +index 1d5cdc6..dc9b95d 100644 +--- a/common-project-config.pri ++++ b/common-project-config.pri +@@ -8,7 +8,7 @@ + #----------------------------------------------------------------------------- + + CONFIG += \ +- c++11 \ ++ c++17 \ + link_pkgconfig + #MOC_DIR = .moc + #OBJECTS_DIR = .obj +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0008-Use-correct-signon-in-example.patch b/net-libs/signon-oauth2/files/0008-Use-correct-signon-in-example.patch new file mode 100644 index 000000000000..50635d936909 --- /dev/null +++ b/net-libs/signon-oauth2/files/0008-Use-correct-signon-in-example.patch @@ -0,0 +1,29 @@ +From a275d6eacc71a1c0ac6a95e2c77a29b13e6c189e Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:10:17 +0200 +Subject: [PATCH 08/10] Use correct signon in example + +--- + example/example.pro | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/example/example.pro b/example/example.pro +index 9b8ec65..1b2c6a8 100644 +--- a/example/example.pro ++++ b/example/example.pro +@@ -11,11 +11,7 @@ CONFIG += \ + link_pkgconfig + QT -= gui + +-lessThan(QT_MAJOR_VERSION, 5) { +- PKGCONFIG += libsignon-qt +-} else { +- PKGCONFIG += libsignon-qt5 +-} ++PKGCONFIG += libsignon-qt$$QT_MAJOR_VERSION + + HEADERS += \ + oauthclient.h +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0009-Port-away-from-deprecated-QString-SplitBehavior.patch b/net-libs/signon-oauth2/files/0009-Port-away-from-deprecated-QString-SplitBehavior.patch new file mode 100644 index 000000000000..67e4b07abc6d --- /dev/null +++ b/net-libs/signon-oauth2/files/0009-Port-away-from-deprecated-QString-SplitBehavior.patch @@ -0,0 +1,40 @@ +From 3ead61662e9b931ff2487869904c9be33cf97a85 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:13:10 +0200 +Subject: [PATCH 09/10] Port away from deprecated QString::SplitBehavior + +--- + src/oauth2plugin.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/oauth2plugin.cpp b/src/oauth2plugin.cpp +index c7f7f84..45510ad 100644 +--- a/src/oauth2plugin.cpp ++++ b/src/oauth2plugin.cpp +@@ -436,7 +436,11 @@ void OAuth2Plugin::userActionFinished(const SignOn::UiSessionData &data) + } else if (pair.first == STATE) { + state = pair.second; + } else if (pair.first == SCOPE) { ++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + respData.setScope(pair.second.split(' ', QString::SkipEmptyParts)); ++#else ++ respData.setScope(pair.second.split(' ', Qt::SkipEmptyParts)); ++#endif + } else { + extraFields.insert(pair.first, pair.second); + } +@@ -587,7 +591,11 @@ void OAuth2Plugin::serverReply(QNetworkReply *reply) + QStringList scope; + if (map.contains(SCOPE)) { + QString rawScope = QString::fromUtf8(map.take(SCOPE).toByteArray()); ++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + scope = rawScope.split(' ', QString::SkipEmptyParts); ++#else ++ scope = rawScope.split(' ', Qt::SkipEmptyParts); ++#endif + } else { + scope = d->m_oauth2Data.Scope(); + } +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0010-Port-away-from-deprecated-QList-toSet.patch b/net-libs/signon-oauth2/files/0010-Port-away-from-deprecated-QList-toSet.patch new file mode 100644 index 000000000000..59b3dd3700e4 --- /dev/null +++ b/net-libs/signon-oauth2/files/0010-Port-away-from-deprecated-QList-toSet.patch @@ -0,0 +1,34 @@ +From fab698862466994a8fdc9aa335c87b4f05430ce6 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:15:56 +0200 +Subject: [PATCH 10/10] Port away from deprecated QList::toSet + +--- + src/oauth2plugin.cpp | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/oauth2plugin.cpp b/src/oauth2plugin.cpp +index 45510ad..0c23b99 100644 +--- a/src/oauth2plugin.cpp ++++ b/src/oauth2plugin.cpp +@@ -256,9 +256,15 @@ bool OAuth2Plugin::respondWithStoredToken(const QVariantMap &token, + * we cannot use it now */ + if (!scopes.isEmpty()) { + if (!token.contains(SCOPES)) return false; +- QSet<QString> cachedScopes = +- token.value(SCOPES).toStringList().toSet(); ++ ++ QStringList scopesList = token.value(SCOPES).toStringList(); ++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) ++ QSet<QString> cachedScopes = scopesList.toSet(); + if (!cachedScopes.contains(scopes.toSet())) return false; ++#else ++ QSet<QString> cachedScopes(scopesList.begin(), scopesList.end()); ++ if (!cachedScopes.contains(QSet(scopes.begin(), scopes.end()))) return false; ++#endif + } + + if (token.contains(TOKEN)) { +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.25-drop-fno-rtti.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.25-drop-fno-rtti.patch new file mode 100644 index 000000000000..04aad5416941 --- /dev/null +++ b/net-libs/signon-oauth2/files/signon-oauth2-0.25-drop-fno-rtti.patch @@ -0,0 +1,26 @@ +From 94e7cdbe1b15455e932a2272fdf2284fecfb9204 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 11 Nov 2020 22:35:06 +0100 +Subject: [PATCH] Disable -fno-rtti + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + common-project-config.pri | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/common-project-config.pri b/common-project-config.pri +index e149d90..9c7801a 100644 +--- a/common-project-config.pri ++++ b/common-project-config.pri +@@ -17,8 +17,7 @@ + UI_HEADERS_DIR = ui/include + UI_SOURCES_DIR = ui/src + +-QMAKE_CXXFLAGS += -fno-exceptions \ +- -fno-rtti ++QMAKE_CXXFLAGS += -fno-exceptions + + TOP_SRC_DIR = $$PWD + +-- +2.29.2 diff --git a/net-libs/signon-oauth2/metadata.xml b/net-libs/signon-oauth2/metadata.xml index 8641e5bdd399..ff21736a4492 100644 --- a/net-libs/signon-oauth2/metadata.xml +++ b/net-libs/signon-oauth2/metadata.xml @@ -5,4 +5,7 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="gitlab">accounts-sso/signon-plugin-oauth2</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/signon-oauth2/signon-oauth2-0.25_p20210102.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.25_p20210102.ebuild new file mode 100644 index 000000000000..dd60c8ff1151 --- /dev/null +++ b/net-libs/signon-oauth2/signon-oauth2-0.25_p20210102.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=signon-plugin-oauth2 +MY_PV=VERSION_${PV} +MY_P=${MY_PN}-${MY_PV} +inherit qmake-utils + +if [[ ${PV} = *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/nicolasfella/${MY_PN}.git/" + EGIT_BRANCH="qt6" + inherit git-r3 +else + COMMIT=d759439066f0a34e5ad352ebab0b3bb2790d429e + if [[ -n ${COMMIT} ]] ; then + SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${COMMIT}/${MY_PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${MY_PN}-${COMMIT}" + else + SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${MY_P}" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="OAuth2 plugin for Signon daemon" +HOMEPAGE="https://gitlab.com/accounts-sso/signon-plugin-oauth2" + +LICENSE="LGPL-2.1" +SLOT="0" +# TODO: drop USE=qt5 and just have USE=qt6 to control which qt? +IUSE="+qt5 qt6 test" +REQUIRED_USE="|| ( qt5 qt6 )" +RESTRICT="!test? ( test )" + +RDEPEND=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtnetwork:5[ssl] + ) + qt6? ( dev-qt/qtbase:6[network,ssl] ) + >=net-libs/signond-8.61-r100[qt5=,qt6=] +" +DEPEND=" + ${RDEPEND} + test? ( + qt5? ( dev-qt/qttest:5 ) + ) +" + +PATCHES=( + "${FILESDIR}"/0001-Port-QSignalSpys-to-PMF-syntax.patch + "${FILESDIR}"/0002-Port-to-new-connection-syntax.patch + "${FILESDIR}"/0003-Port-away-from-deprecated-error-signal.patch + "${FILESDIR}"/0004-Port-away-from-deprecated-qrand.patch + "${FILESDIR}"/0005-Fix-string-concatenation-in-Qt6.patch + "${FILESDIR}"/0006-Port-away-from-deprecated-QRegExp.patch + "${FILESDIR}"/0007-Build-with-C-17.patch + "${FILESDIR}"/0008-Use-correct-signon-in-example.patch + "${FILESDIR}"/0009-Port-away-from-deprecated-QString-SplitBehavior.patch + "${FILESDIR}"/0010-Port-away-from-deprecated-QList-toSet.patch + # downstream patches + "${FILESDIR}/${PN}-0.24-dont-install-tests.patch" + "${FILESDIR}/${PN}-0.25-pkgconfig-libdir.patch" + "${FILESDIR}/${PN}-0.25-drop-fno-rtti.patch" +) + +src_prepare() { + default + sed -i "s|@LIBDIR@|$(get_libdir)|g" src/signon-oauth2plugin.pc || die +} + +src_configure() { + local myqmakeargs=( + LIBDIR=/usr/$(get_libdir) + ) + use test || myqmakeargs+=( CONFIG+=nomake_tests ) + + if use qt6 ; then + eqmake6 "${myqmakeargs[@]}" + else + eqmake5 "${myqmakeargs[@]}" + fi +} + +src_install() { + emake INSTALL_ROOT="${D}" install +} diff --git a/net-libs/signon-ui/Manifest b/net-libs/signon-ui/Manifest index 793581986825..966e4c4f1664 100644 --- a/net-libs/signon-ui/Manifest +++ b/net-libs/signon-ui/Manifest @@ -3,5 +3,7 @@ AUX signon-ui-0.15_p20171022-drop-fno-rtti.patch 758 BLAKE2B 6487c7b5e6365deebc3 AUX signon-ui-0.15_p20171022-fix-username-field-reading.patch 4338 BLAKE2B ef44759dde1e1f393ce6a6e6a30528049ef1ce480ae9721f006dd4a37ebfc0c0a36937472fcc74731072229894c1a280c2b50e92e059d000d1de5e91435d8fc3 SHA512 2414ffaacb13224bd4edb4beec1cb6c8e576401d2a3b3677b5aaa9140eeea99077c37fcb0115c2400987722d23f822844d3f4cc901adbc85be6d4e098072d28d AUX signon-ui-0.15_p20171022-webengine-cachedir-path.patch 925 BLAKE2B 5ead2d7a75d2dc011d84a476f0cd1b80c72a54dbb9d06a6d151f9940bbdbcb20494a2ad388aa0590b2148cf0d5d2e455d50425d0292bbeda7e41de366172227e SHA512 e21aafb1cb79033619dc50ee41a81efe8e02be7ce71382ab532beb48d720a514bb7d4abe588c117685b4b643865c4a11eb304a8e0107104393de08afa1d162f7 DIST signon-ui-0.15_p20171022.tar.bz2 55849 BLAKE2B 6b97b3f673fb4494c7e32dc345f6c4697acdb19305b9459fe954d88983e4666211926921dac70829435706cdd9a41f36d36241a73905b2a795873c2894ffa8d7 SHA512 d0a4ca222de00abf4000905d917799fc6f9e04a2c3f49d0d0882dc4e90fdbcde14da91f355d10f8a3feac03661febd321ea6de1df227fa5a3c404eaefa7c2d60 +DIST signon-ui-0.15_p20231016.tar.bz2 55078 BLAKE2B eff35b2b311c4b923148656ad7512418ee6e19607babd02f2bc8bff9d6f2f5cfdc37c7030fb842b65b25c310f6e44f76a73b9d0a4569af52f7661b0eb09da2f2 SHA512 c26be8921c5d2a559bd62793f3eca19184c236c2e2649728631d60d2781f4b4457f63bbd35238cb274ff3a7747220688688f0880df8db0e78ccaf6f126d6e86e EBUILD signon-ui-0.15_p20171022-r1.ebuild 1190 BLAKE2B 44c029a0c90791e9f41275584b79b453864d7f6b7c532382122bc423022788ec9ef844be5adaa9a2fd10fd5312a3bed2f74e709a6d4b791f2c8d9486666797b6 SHA512 34f55051f8d6ba93bfdf45b32eb99840bf72b69cfe0751b71bc8da02e5dea4deb29e4048cba1b58b140832fb5486f1a59deac7ee743f262b2fc59081a8aa497b -MISC metadata.xml 327 BLAKE2B 3d4e22824407767f6ff70bbe512c829e9da4e158a8e77dfb0db2b27dce22a0b577fa8199f05a85ba3e66249d846224a6219d44c47f149149db41851fe5fa78a7 SHA512 74822c602e0070afdfea797ae3ce5f9bae6a857e1ecd58e30b742a5584cd360ffa25bc72f5af99f934d80e9f296895df3dcd34ea3e7a64375519d6c102ccede1 +EBUILD signon-ui-0.15_p20231016.ebuild 1805 BLAKE2B 4950ac56a58a141533ece593e3edc3da4315ddc30d7975909b58168dd9ffa960e8bb0a78e04f5471b7d51840abc6a486e851b55f650df86ca45da796e2847f23 SHA512 af2a2f07a49ad5ce68dc1ede4d1c025856987248ba9a42e25b9f8aa595b7679ac6cd169e4d53886d84cb992c067ad9365a83373ef3d8205d5141f9a676c83526 +MISC metadata.xml 337 BLAKE2B 6329a58a1fb57e124a64deb6b3829fa06632cc323991540a322a4aecf4a07f129905d7ee393e2e105afb1a4fa8eadcb08d969b6ed497cb29ec1737437f0d6bca SHA512 3a85a0fce6d18ec8c2e029579ac851229dc56ec4fe3f6d9a19e11b875afc6b9c4da555884fcd49fc68b5e510a2306ae53d8e5f5c4600a0f987ee7a14735322f8 diff --git a/net-libs/signon-ui/metadata.xml b/net-libs/signon-ui/metadata.xml index fbd0d6ae95b8..634eccaeb0b9 100644 --- a/net-libs/signon-ui/metadata.xml +++ b/net-libs/signon-ui/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo KDE Project</name> </maintainer> <upstream> - <remote-id type="launchpad">signon-ui</remote-id> + <remote-id type="gitlab">accounts-sso/signon-ui</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/signon-ui/signon-ui-0.15_p20231016.ebuild b/net-libs/signon-ui/signon-ui-0.15_p20231016.ebuild new file mode 100644 index 000000000000..cf21243ff3c2 --- /dev/null +++ b/net-libs/signon-ui/signon-ui-0.15_p20231016.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils + +if [[ ${PV} = *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/accounts-sso/signon-ui.git/" + inherit git-r3 +else + COMMIT=eef943f0edf3beee8ecb85d4a9dae3656002fc24 + SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${PN}-${COMMIT}" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="Online accounts signon UI" +HOMEPAGE="https://gitlab.com/accounts-sso/signon-ui" + +LICENSE="GPL-2 GPL-3" +SLOT="0" +IUSE="qt6 test" + +RESTRICT="test" + +COMMON_DEPEND=" + dev-libs/glib:2 + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtwebengine:5 + dev-qt/qtwidgets:5 + >=net-libs/accounts-qt-1.16_p20220803[qt5] + >=net-libs/signond-8.61-r100[qt5] + ) + qt6? ( + dev-qt/qtbase:6[dbus,gui,network,ssl,widgets] + dev-qt/qtdeclarative:6 + dev-qt/qtwebengine:6 + >=net-libs/accounts-qt-1.16_p20220803[qt6] + >=net-libs/signond-8.61-r100[qt6] + ) + net-libs/libproxy + x11-libs/libnotify +" +RDEPEND="${COMMON_DEPEND} + !qt6? ( dev-qt/qtwebchannel:5 ) + qt6? ( dev-qt/qtwebchannel:6 ) +" +DEPEND="${COMMON_DEPEND} + test? ( + !qt6? ( dev-qt/qttest:5 ) + ) +" + +PATCHES=( + # thanks to openSUSE + "${FILESDIR}/${PN}-0.15_p20171022-webengine-cachedir-path.patch" + "${FILESDIR}/${PN}-0.15_p20171022-fix-username-field-reading.patch" + # downstream + "${FILESDIR}/${PN}-0.15_p20171022-drop-fno-rtti.patch" + "${FILESDIR}/${PN}-0.15_p20171022-disable-tests.patch" +) + +src_configure() { + if use qt6; then + eqmake6 PREFIX="${EPREFIX}"/usr + else + eqmake5 PREFIX="${EPREFIX}"/usr + fi +} + +src_compile() { + emake -j1 +} + +src_install() { + emake INSTALL_ROOT="${D}" -j1 install +} diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest index 3cc137862204..52e41685b128 100644 --- a/net-libs/signond/Manifest +++ b/net-libs/signond/Manifest @@ -1,6 +1,20 @@ +AUX 0001-Don-t-forward-declare-QStringList.patch 922 BLAKE2B 5b9f98a56b486687d412e019cd5fe571ec8dc7957026c425b8bc110d610004e6ef425423a9b59b318e2c0c0e3d51c3f3dbd7677d23effa02afcf33d7252a5c80 SHA512 8d7e96e6d6932bdf79ea06257065ad78ad62fdea00d920a83477667355e7e337f9bb2e69e7a224891da43db7a29a00b778aecb6b73a30188463e3dcdf61b67de +AUX 0002-Remove-usage-of-Q_EXTERN_C.patch 881 BLAKE2B 19dcd03bec6fee196ef95a0ed917bda4cdd455c46182ef94427676b6750534e1645c592531a52cf6377ebe2a69b8cf7f0ae74f99f203f315b7e5a0d1f793592b SHA512 b87bf6dec65dce1abf6bac356eb054d1e86299c52ab41e34793ba6d854d1e813012f2b761064aa5865c6386ff4ef32158120007f263a82349c63e38223682ad3 +AUX 0003-Port-from-QProcess-pid-to-processId.patch 1252 BLAKE2B 710e6c36c5ffe0d937c70e4279bca0f97850e7bdd984c581811bfe79ebc004eb5bb3aa8653c24d9e6575c5f278213cdd87c95461cd74b2038c0e9b7e2578ba1d SHA512 3512cecd02c40e214390ade363415ed7a7980391192a2666f054053568c115a138efdef3507cf80bd6ec500e6602a1d58b143168f741aeeafb105b995931f212 +AUX 0004-Port-away-from-deprecated-QString-SplitBehavior.patch 1206 BLAKE2B f1353bdb77bb1203651afc41f1412814fc0ac8f5019d062bea47133f260d9f1797de20b0d0b7bed0b545a6f10d313946893dbedeba39ac1db6d4e6c202bdcbf0 SHA512 83bbe883375322b07227e8ecd0a46dfc8904504663a36f7e95ad15bae41cdf653cebd5c71cfcc8bc75ada6ea6cc6643a9ca38628f5e50b05fd07f97c3c675e92 +AUX 0005-Port-away-from-QtContainer-toSet.patch 3541 BLAKE2B 4d3e9e448c8d5641cbb5291ec9fa41776bb28ad686604f2f22a81c4063c022c9e6d87ecda319fe5f650cd2e8112fa798ae18c6d53eda854ecececb07f1041c19 SHA512 f6d6b1e694d2a022915cb1eb944b4f1f6bbb81a3555e460c16c9e406dbd33e16ffe6d0640edb5e0d0f8139762b256443d8f12a98481a63ed74df50d2e8a96fc8 +AUX 0006-Port-away-from-deprecated-QMap-unite.patch 1898 BLAKE2B 73f5a5c7402d8086c7d62f6d6d57d23a953c14f43929d02165b0ea332756cf2c372449cdf0647622b07916c697185525bb0a8d93eacf6046f86573eb9a5a3ebd SHA512 e5282891209715c903417769dcff3e4d73d22c9c6019365d8d3e5f77f93331aa1a342d240e26e21898f7ba59cb211a0dec6dd45f5fa801886daa30cb3c4d4848 +AUX 0007-Add-Qt6-CI.patch 3165 BLAKE2B cea7b292791a0b6c2144c7384770e3c57e5f5e6284a98f5e24d7ea8e0b10a7c7166239d4ba3974d9f880da8012fd46f6b551bbdda494078efe6363c79a29e894 SHA512 3f12fe5295c89535da57ff7ab74cc5afa394370a11e3898b5a4913656027937243b58d5439f1ab177bca0977f55f7b6e873c7122892174a71235ab208d3b8c84 +AUX 0008-Use-return-instead-of-reference-for-DBus-output-para.patch 2234 BLAKE2B 99dc90bf2ef45e744c9208a1655dd76a42255572d560b55be34fc809ec4635484611a5910b4f735b0a500e3ee317d43724db6f2b441c0a18c4c4a61d3508d6fa SHA512 659e8d0d660f42fb165644eb8a507dbc7e18a2ac6c78c538b446530641eacfdf1f0999b251277179e4bbec2887c85b29c8721d1b4e7d36a7d350b197991aeb71 +AUX 0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch 8052 BLAKE2B c78f4a2ce0db9ba6e57c70c0c23af2debf1b892af40d71f128fc55820cd234bb2aafb61a7f9c93becc6e60d10c6ac723706f13e13d7275b0717fd52153be9baf SHA512 06e68df7689d7ce98672e5166e033633934a68eb126f93f0c0b3f7b58cd198a8afafe5a67719f1f0c26be1115b65db045c9338dc2b36890aad46ea9d66a5e883 +AUX 0010-Fix-plugin-datastream-in-Qt6.patch 1299 BLAKE2B 5262c989f40bb5c1a518cbb91eb361d54461c5441d81cdda000af69504c1c508f432668fa2fa8ab6e573f992bfabac6df2f0c04758b1be8ab572cbcb81c0ba6d SHA512 a90e5ef3b6b947efbd321f917c96d4318bbd191f53fff3fe15434b5140e7eb23170e321e7362c8f7ecfbbab409d69adaee1fe0c856298716a48e273a836e7c2f +AUX 0011-Port-away-from-deprecated-QProcess-signal.patch 1023 BLAKE2B 0452a1e31bb9d6178c208360a9c52435ccaa37a4309ca250d074c26b40a14f9e52f9c4419f9f4398232bc39f5dfcef9e20674f8a18dec599307ccda244ca1382 SHA512 317cfec1071f8ed693f308a1139b73b2da244a037e6380d9268436c61f7c3dd7dd3c7bacec73e11a8e9dcaab76efd00af4f2c25127708a2191c87f014574ec86 AUX signond-8.60-buildsystem.patch 1004 BLAKE2B 6a9ae7cc9c2750ffb5eb6495dc47c2118bb7d7babf8f253f168be73cf03934d00a875c99048b1985716d7c1f2ac3a2543bd988939e76631aff8e852a464b4589 SHA512 73ac6551d9c1bb37e331baad427d3770a913ab52833f3112f825a5a28647752f925a40c12bf72a79c0c9b93aacbaca5f357a21a48eae4f1f24341cfeb1ce5b57 AUX signond-8.60-consistent-paths.patch 10627 BLAKE2B 853cc9816469c0b47c8ecab941c1ade09aa2567a6cbe99012da42d479d35d304eeb869700e4fc9f0623191735c1e445aa2046b904ef151cbc048dda00e3c7cd4 SHA512 3c285e57843d458fb30e21f607dc7edf3009d7bcf68c2641188b1ded4cd44d589541b754803a687adf92b2de11417bf3411c0cf2bfdcd6c7375e32bc1948edfe AUX signond-8.60-unused-dep.patch 984 BLAKE2B 67ec450053f294eec1be87411ab11dd14d3e6c9895a794b0aa6f08a433763f2aa246908bf8c8345639b98cf5be3a06670dfc200a238ce9582e37e186f88759c0 SHA512 b54a59c580436dfac3e469dd733557ddd1857f78fb992693f19c58683baed99e91193ca5c62cda9e974b7db48791c46156427a1c0043a24ec03c4594018fe697 +AUX signond-8.61-consistent-paths.patch 11609 BLAKE2B 2ad71837dfd949b79b7a5e9501567027b552860be43d94176c19df7a551835e4f5cd00c7661ace881416a38faa61f6aa09c1dfff7ab1b56a063445c701fbf930 SHA512 7869361c25766fbbb2973cae38251c85d19a15fb0bb7c1c5d578c792c50e7b16006ecff889fb6a47d5c7ef9ebbaa2ec029859373e1ddbf19456ad4f56c77f839 +DIST signond-8.61.tar.bz2 203066 BLAKE2B 2f78e08143d346777ab3517ef6b76b54ab1b17efa6d15b2c5a16487c2e11f38c88cb2820bff8dd04deb334d0c178c16bd061c0eba694c5edfb0e31411581648a SHA512 95e83bc672792ec10493f1f456788af7e8051ce0bed6b047b6b6f5fa9ac019dd3392063152930be49cf68d590567fd7467c544d642cc58624b1aabdc0b405258 DIST signond-8.61.tar.gz 282965 BLAKE2B 8ab8f4ac3f8416ef9c1b8d8c73057ffcf0024a7e3cf6c2fa97a3119826f6c655b215e2530137c199e60e9e9518b0858fa1a23a3f107c71751f33d2a34898a610 SHA512 1652ee8e97d6aee036075f5416909649c5848e33c3c71f367176f3e5d6f9c360fd7a46c65ba877d58b3ae8fb8df0712938c5e073409ba945d66d8afeacfd6f72 -EBUILD signond-8.61.ebuild 1879 BLAKE2B ce22fc81dc02ecba686e0f8ebc488db1ea4902726f152e61ff3cc0c4b5b40a87779c87d33d004eedfc88303835129d2890497ad29be2bbadfe3ebebb07d3d22c SHA512 2f4ccfab279d57f209abb6747b85134c366a5a3e18fc8c627e3309f2dacd383fc55e6cd1df14214403532eba808dbb3b19a7040ef0d758f2da81ba1536bc36b0 -MISC metadata.xml 342 BLAKE2B 36843bfd50bb1f3e09556d60159cf3a352e8a7df8ae175c0c09f54a7e6f9256c31a2eb55b888eda8fddab8cf2052dec969be1cf521faf38c833d61b365d35957 SHA512 0f85a1d8b631a35b0a545f89d767c8c84407f2d0fe3f0350fb7276752e0fc268ffff559d705a415f7375112c6873a4a7d99acaea9d7b725233bcd9360adbc8b7 +EBUILD signond-8.61-r100.ebuild 4028 BLAKE2B bfbd9d1c6080f3146a29a8c6d112cb158ba8d672f065edda28670ba47f3a48a2ece84a146bec12eb730e0eefe61443c45eeb6151e08f9ce80ded514122e95382 SHA512 d9aeefea474c6f2d891224a4e12d5c6431c6de49150ee6c77fb59d789e78d7a32c09ec526cbcb387e6d1b45db3bba07ded0ce7489bcf1d495a2ab8b5e40dfc96 +EBUILD signond-8.61.ebuild 1880 BLAKE2B bfa2e3f0a9fae3aab6bd9411bb7b538178015ac0f6ed0f3a51f6167bb5ce5bc77297b17f35a04a07d19201a71452253862010fb55236e05a7354ca3f8deda4d6 SHA512 97e4fa0fe413f1555e503840ecc141ef3abd1e1352bdd0413471a831edd362cdd1ce1fc83fd8226b61ad8d30e99093e25cc91c310e6c95f0f57272a92c17f2c6 +MISC metadata.xml 402 BLAKE2B cbca0310ab027fc70e2c6f3c4fc84a4de8847d4899ed19e848796279c0b03b9ffcc59269487def4b3e6298adfb095a9cf3417a1c7bf083efa30a8894ecfa858f SHA512 1831ad67394a82c3839fb80196982f3252e2bc9c7cf116c782d731a7d315e97cc2e6a299e951f73f92d2a4598a33c7251d8a68c47102c6186344b61486a72515 diff --git a/net-libs/signond/files/0001-Don-t-forward-declare-QStringList.patch b/net-libs/signond/files/0001-Don-t-forward-declare-QStringList.patch new file mode 100644 index 000000000000..015280921652 --- /dev/null +++ b/net-libs/signond/files/0001-Don-t-forward-declare-QStringList.patch @@ -0,0 +1,35 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From 65a9af6663738c5e169a1779b8d0106c6223e96e Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 5 Jul 2022 17:36:19 +0200 +Subject: [PATCH 01/11] Don't forward-declare QStringList + +It doesn't work with Qt6 +--- + lib/plugins/SignOn/authpluginif.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/plugins/SignOn/authpluginif.h b/lib/plugins/SignOn/authpluginif.h +index 7b3243c..9cfc527 100644 +--- a/lib/plugins/SignOn/authpluginif.h ++++ b/lib/plugins/SignOn/authpluginif.h +@@ -31,6 +31,7 @@ + #include <QtCore/qobject.h> + #include <QtCore/qpointer.h> + #include <QtCore/qplugin.h> ++#include <QtCore/qstringlist.h> + + #include <QVariantMap> + #include <SignOn/sessiondata.h> +@@ -39,7 +40,6 @@ + + QT_BEGIN_NAMESPACE + class QString; +-class QStringList; + class QByteArray; + class QVariant; + QT_END_NAMESPACE +-- +2.43.0 + diff --git a/net-libs/signond/files/0002-Remove-usage-of-Q_EXTERN_C.patch b/net-libs/signond/files/0002-Remove-usage-of-Q_EXTERN_C.patch new file mode 100644 index 000000000000..6f0e11ef1da8 --- /dev/null +++ b/net-libs/signond/files/0002-Remove-usage-of-Q_EXTERN_C.patch @@ -0,0 +1,28 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From afef34ba90f525081226b49be76dd53aa158967d Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 5 Jul 2022 17:37:00 +0200 +Subject: [PATCH 02/11] Remove usage of Q_EXTERN_C + +It doesn't exist in Qt6 any more +--- + lib/plugins/SignOn/authpluginif.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/plugins/SignOn/authpluginif.h b/lib/plugins/SignOn/authpluginif.h +index 9cfc527..cad5d35 100644 +--- a/lib/plugins/SignOn/authpluginif.h ++++ b/lib/plugins/SignOn/authpluginif.h +@@ -73,7 +73,7 @@ enum AuthPluginState { + } + + #define SIGNON_DECL_AUTH_PLUGIN(pluginclass) \ +- Q_EXTERN_C AuthPluginInterface *auth_plugin_instance() \ ++ extern "C" AuthPluginInterface *auth_plugin_instance() \ + SIGNON_PLUGIN_INSTANCE(pluginclass) + + /*! +-- +2.43.0 + diff --git a/net-libs/signond/files/0003-Port-from-QProcess-pid-to-processId.patch b/net-libs/signond/files/0003-Port-from-QProcess-pid-to-processId.patch new file mode 100644 index 000000000000..ea1b7e715208 --- /dev/null +++ b/net-libs/signond/files/0003-Port-from-QProcess-pid-to-processId.patch @@ -0,0 +1,32 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From a089361356e73bcd721f14314ec9745bbf28c5be Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 5 Jul 2022 17:37:34 +0200 +Subject: [PATCH 03/11] Port from QProcess::pid to ::processId + +The former is deprecated +--- + src/signond/pluginproxy.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/signond/pluginproxy.cpp b/src/signond/pluginproxy.cpp +index d31c712..582aef4 100644 +--- a/src/signond/pluginproxy.cpp ++++ b/src/signond/pluginproxy.cpp +@@ -125,10 +125,10 @@ PluginProxy::~PluginProxy() + + if (!m_process->waitForFinished(PLUGINPROCESS_STOP_TIMEOUT)) + { +- if (m_process->pid()) { ++ if (m_process->processId()) { + qCritical() << "The signon plugin seems to ignore kill(), " + "killing it from command line"; +- QString killProcessCommand(QString::fromLatin1("kill -9 %1").arg(m_process->pid())); ++ QString killProcessCommand(QString::fromLatin1("kill -9 %1").arg(m_process->processId())); + QProcess::execute(killProcessCommand); + } + } +-- +2.43.0 + diff --git a/net-libs/signond/files/0004-Port-away-from-deprecated-QString-SplitBehavior.patch b/net-libs/signond/files/0004-Port-away-from-deprecated-QString-SplitBehavior.patch new file mode 100644 index 000000000000..7bf3fe2db650 --- /dev/null +++ b/net-libs/signond/files/0004-Port-away-from-deprecated-QString-SplitBehavior.patch @@ -0,0 +1,38 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From b48507f58d66356fbcdd349d14e6e145a4a60bbd Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 5 Jul 2022 17:38:08 +0200 +Subject: [PATCH 04/11] Port away from deprecated QString::SplitBehavior + +--- + src/signond/signonidentityinfo.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/signond/signonidentityinfo.cpp b/src/signond/signonidentityinfo.cpp +index a5ae15d..bf7985f 100644 +--- a/src/signond/signonidentityinfo.cpp ++++ b/src/signond/signonidentityinfo.cpp +@@ -27,6 +27,7 @@ + #include <QDBusArgument> + #include <QDataStream> + #include <QDebug> ++#include <QtGlobal> + + namespace SignonDaemonNS { + +@@ -104,7 +105,11 @@ bool SignonIdentityInfo::checkMethodAndMechanism(const QString &method, + * mechanisms is allowed. + */ + QStringList mechanisms = ++#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) ++ mechanism.split(QLatin1Char(' '), Qt::SkipEmptyParts); ++#else + mechanism.split(QLatin1Char(' '), QString::SkipEmptyParts); ++#endif + + /* if the list is empty of it has only one element, then we already know + * that it didn't pass the previous checks */ +-- +2.43.0 + diff --git a/net-libs/signond/files/0005-Port-away-from-QtContainer-toSet.patch b/net-libs/signond/files/0005-Port-away-from-QtContainer-toSet.patch new file mode 100644 index 000000000000..94927fecaaa0 --- /dev/null +++ b/net-libs/signond/files/0005-Port-away-from-QtContainer-toSet.patch @@ -0,0 +1,94 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From 728bda378878e505ac6b7977306b6f3ffe9f53d6 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 5 Jul 2022 17:39:20 +0200 +Subject: [PATCH 05/11] Port away from QtContainer::toSet + +it's deprecated +--- + src/signond/signonsessioncore.cpp | 12 ++++++++++-- + tests/signond-tests/databasetest.cpp | 24 +++++++++++++++++------- + 2 files changed, 27 insertions(+), 9 deletions(-) + +diff --git a/src/signond/signonsessioncore.cpp b/src/signond/signonsessioncore.cpp +index 93a7328..bebf934 100644 +--- a/src/signond/signonsessioncore.cpp ++++ b/src/signond/signonsessioncore.cpp +@@ -217,8 +217,16 @@ SignonSessionCore::queryAvailableMechanisms(const QStringList &wantedMechanisms) + if (!wantedMechanisms.size()) + return m_plugin->mechanisms(); + +- return m_plugin->mechanisms().toSet(). +- intersect(wantedMechanisms.toSet()).toList(); ++ const QStringList mechanisms = m_plugin->mechanisms(); ++#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) ++ QSet<QString> mechanismSet(mechanisms.begin(), mechanisms.end()); ++ QSet<QString> wantedMechanismSet(wantedMechanisms.begin(), wantedMechanisms.end()); ++#else ++ QSet<QString> mechanismSet = mechanisms.toSet(); ++ QSet<QString> wantedMechanismSet = wantedMechanisms.toSet(); ++#endif ++ ++ return mechanismSet.intersect(wantedMechanismSet).values(); + } + + void SignonSessionCore::process(const PeerContext &peerContext, +diff --git a/tests/signond-tests/databasetest.cpp b/tests/signond-tests/databasetest.cpp +index b5ee761..b22ba54 100644 +--- a/tests/signond-tests/databasetest.cpp ++++ b/tests/signond-tests/databasetest.cpp +@@ -32,6 +32,15 @@ + const QString dbFile = QLatin1String("/tmp/signon_test.db"); + const QString secretsDbFile = QLatin1String("/tmp/signon_test_secrets.db"); + ++static QSet<QString> toSet(const QStringList &list) ++{ ++#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) ++ return QSet<QString>(list.begin(), list.end()); ++#else ++ return list.toSet(); ++#endif ++} ++ + void TestDatabase::initTestCase() + { + QFile::remove(dbFile); +@@ -353,17 +362,18 @@ void TestDatabase::updateCredentialsTest() + + /* The sorting of the method's mechanisms might vary, so we cannot just + * compare the whole method map as a whole. */ +- QCOMPARE(retInfo.methods().keys().toSet(), +- updateInfo.methods().keys().toSet()); ++ QCOMPARE(toSet(retInfo.methods().keys()), ++ toSet(updateInfo.methods().keys())); ++ + QMapIterator<QString, QStringList> it(retInfo.methods()); + while (it.hasNext()) { + it.next(); +- QCOMPARE(it.value().toSet(), umethods.value(it.key()).toSet()); ++ QCOMPARE(toSet(it.value()), toSet(umethods.value(it.key()))); + } + +- QCOMPARE(retInfo.realms().toSet(), updateInfo.realms().toSet()); +- QCOMPARE(retInfo.accessControlList().toSet(), +- updateInfo.accessControlList().toSet()); ++ QCOMPARE(toSet(retInfo.realms()), toSet(updateInfo.realms())); ++ QCOMPARE(toSet(retInfo.accessControlList()), ++ toSet(updateInfo.accessControlList())); + } + + void TestDatabase::removeCredentialsTest() +@@ -658,8 +668,8 @@ void TestDatabase::credentialsOwnerSecurityTokenTest() + QString token = m_db->credentialsOwnerSecurityToken(id); + QCOMPARE(token, QLatin1String("AID::12345678")); + QStringList tokens = m_db->ownerList(id); +- QCOMPARE(tokens.toSet(), testAcl.toSet()); + ++ QCOMPARE(toSet(tokens), toSet(testAcl)); + } + + QTEST_MAIN(TestDatabase) +-- +2.43.0 + diff --git a/net-libs/signond/files/0006-Port-away-from-deprecated-QMap-unite.patch b/net-libs/signond/files/0006-Port-away-from-deprecated-QMap-unite.patch new file mode 100644 index 000000000000..b063361c243a --- /dev/null +++ b/net-libs/signond/files/0006-Port-away-from-deprecated-QMap-unite.patch @@ -0,0 +1,53 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From b1e63bd07f4fcf1a47f142674889b157b4d68af8 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 1 Aug 2022 19:27:34 +0200 +Subject: [PATCH 06/11] Port away from deprecated QMap::unite + +--- + src/signond/signonidentity.cpp | 3 +-- + src/signond/signonsessioncoretools.cpp | 6 ++++++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/signond/signonidentity.cpp b/src/signond/signonidentity.cpp +index 92ff476..aef4a97 100644 +--- a/src/signond/signonidentity.cpp ++++ b/src/signond/signonidentity.cpp +@@ -288,8 +288,7 @@ void SignonIdentity::verifyUser(const QVariantMap ¶ms, + } + + //create ui request to ask password +- QVariantMap uiRequest; +- uiRequest.unite(params); ++ QVariantMap uiRequest = params; + uiRequest.insert(SSOUI_KEY_QUERYPASSWORD, true); + uiRequest.insert(SSOUI_KEY_USERNAME, info.userName()); + uiRequest.insert(SSOUI_KEY_CAPTION, info.caption()); +diff --git a/src/signond/signonsessioncoretools.cpp b/src/signond/signonsessioncoretools.cpp +index 8b74840..e856d1a 100644 +--- a/src/signond/signonsessioncoretools.cpp ++++ b/src/signond/signonsessioncoretools.cpp +@@ -34,6 +34,7 @@ QVariantMap SignonDaemonNS::mergeVariantMaps(const QVariantMap &map1, + if (map1.isEmpty()) return map2; + if (map2.isEmpty()) return map1; + ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + QVariantMap map = map1; + //map2 values will overwrite map1 values for the same keys. + QMapIterator<QString, QVariant> it(map2); +@@ -43,6 +44,11 @@ QVariantMap SignonDaemonNS::mergeVariantMaps(const QVariantMap &map1, + map.remove(it.key()); + } + return map.unite(map2); ++#else ++ QVariantMap map = map1; ++ map.insert(map2); ++ return map; ++#endif + } + + /* --------------------- StoreOperation ---------------------- */ +-- +2.43.0 + diff --git a/net-libs/signond/files/0007-Add-Qt6-CI.patch b/net-libs/signond/files/0007-Add-Qt6-CI.patch new file mode 100644 index 000000000000..37891277d0de --- /dev/null +++ b/net-libs/signond/files/0007-Add-Qt6-CI.patch @@ -0,0 +1,91 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From 10f791a62e229bcb5e3975c752bcd5519758240f Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 1 Aug 2022 19:37:41 +0200 +Subject: [PATCH 07/11] Add Qt6 CI + +--- + .gitlab-ci.yml | 48 ++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 40 insertions(+), 8 deletions(-) + +diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml +index 409f6e2..c784909 100644 +--- a/.gitlab-ci.yml ++++ b/.gitlab-ci.yml +@@ -1,18 +1,14 @@ +-image: ubuntu:bionic +- + cache: + key: apt-cache + paths: + - apt-cache/ + +-before_script: +- - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR +- - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev +- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev +- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y lcov gcovr +- + build_amd64: + stage: build ++ image: ubuntu:bionic ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev + script: + - mkdir build + - cd build +@@ -24,6 +20,10 @@ build_amd64: + + test_amd64: + stage: test ++ image: ubuntu:bionic ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev + script: + - find build | xargs touch # Avoid rebuilding + - cd build +@@ -34,6 +34,38 @@ test_amd64: + paths: + - ./ + ++build_amd64_qt6: ++ stage: build ++ image: ubuntu:jammy ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make ++ script: ++ - mkdir build ++ - cd build ++ - qmake6 CONFIG+=debug CONFIG+=coverage CONFIG+=enable-backup CONFIG+=enable-p2p .. ++ - make -j 4 ++ artifacts: ++ paths: ++ - build/ ++ ++test_amd64_qt6: ++ stage: test ++ image: ubuntu:jammy ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - export DEBIAN_FRONTEND=noninteractive ++ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make ++ script: ++ - find build | xargs touch # Avoid rebuilding ++ - cd build ++ - make coverage-html ++ dependencies: ++ - build_amd64_qt6 ++ artifacts: ++ paths: ++ - ./ ++ + pages: + stage: deploy + script: +-- +2.43.0 + diff --git a/net-libs/signond/files/0008-Use-return-instead-of-reference-for-DBus-output-para.patch b/net-libs/signond/files/0008-Use-return-instead-of-reference-for-DBus-output-para.patch new file mode 100644 index 000000000000..38a92d1db289 --- /dev/null +++ b/net-libs/signond/files/0008-Use-return-instead-of-reference-for-DBus-output-para.patch @@ -0,0 +1,57 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From 929f34fb07e30e17fc6a6ec117207390675be03b Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sat, 6 Aug 2022 15:46:16 +0200 +Subject: [PATCH 08/11] Use return instead of reference for DBus output + parameter + +From a DBus perspective it's the same but it seems to work better that way with Qt6 +--- + src/signond/signondaemonadaptor.cpp | 7 ++++--- + src/signond/signondaemonadaptor.h | 3 +-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/signond/signondaemonadaptor.cpp b/src/signond/signondaemonadaptor.cpp +index a407175..0f01d34 100644 +--- a/src/signond/signondaemonadaptor.cpp ++++ b/src/signond/signondaemonadaptor.cpp +@@ -63,17 +63,18 @@ SignonDaemonAdaptor::registerObject(const QDBusConnection &connection, + return QDBusObjectPath(path); + } + +-void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext, +- QDBusObjectPath &objectPath) ++QDBusObjectPath SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext) + { + Q_UNUSED(applicationContext); + + SignonIdentity *identity = m_parent->registerNewIdentity(); + + QDBusConnection dbusConnection(parentDBusContext().connection()); +- objectPath = registerObject(dbusConnection, identity); ++ QDBusObjectPath objectPath = registerObject(dbusConnection, identity); + + SignonDisposable::destroyUnused(); ++ ++ return objectPath; + } + + void SignonDaemonAdaptor::securityErrorReply() +diff --git a/src/signond/signondaemonadaptor.h b/src/signond/signondaemonadaptor.h +index c51a6b8..639a135 100644 +--- a/src/signond/signondaemonadaptor.h ++++ b/src/signond/signondaemonadaptor.h +@@ -49,8 +49,7 @@ public: + { return *static_cast<QDBusContext *>(m_parent); } + + public Q_SLOTS: +- void registerNewIdentity(const QString &applicationContext, +- QDBusObjectPath &objectPath); ++ QDBusObjectPath registerNewIdentity(const QString &applicationContext); + void getIdentity(const quint32 id, const QString &applicationContext, + QDBusObjectPath &objectPath, + QVariantMap &identityData); +-- +2.43.0 + diff --git a/net-libs/signond/files/0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch b/net-libs/signond/files/0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch new file mode 100644 index 000000000000..dd180898cd34 --- /dev/null +++ b/net-libs/signond/files/0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch @@ -0,0 +1,202 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From 9b439d09712fe31cbb9b3f30a6cbc75cbbc11d20 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Fri, 7 Apr 2023 16:10:31 +0200 +Subject: [PATCH 09/11] Adjust buildsystem to include correct Qt Major version + number + +--- + common-project-config.pri | 4 ++-- + lib/SignOn/SignOnQt5Config.cmake.in | 2 +- + lib/SignOn/SignOnQt6Config.cmake.in | 7 +++++++ + lib/SignOn/SignOnQt6ConfigVersion.cmake.in | 10 ++++++++++ + lib/SignOn/libsignon-qt.pri | 2 +- + lib/SignOn/libsignon-qt6.pc.in | 11 +++++++++++ + .../signon-plugins-common/signon-plugins-common.pc.in | 2 +- + lib/plugins/signon-plugins.pc.in | 2 +- + lib/signond/SignOn/SignOnExtension.pc.in | 2 +- + tests/libsignon-qt-tests/libsignon-qt-tests.pro | 2 +- + tests/signond-tests/identity-tool.pro | 2 +- + .../mock-ac-plugin/identity-ac-helper.pro | 2 +- + tests/signond-tests/signond-tests.pri | 2 +- + 13 files changed, 39 insertions(+), 11 deletions(-) + create mode 100644 lib/SignOn/SignOnQt6Config.cmake.in + create mode 100644 lib/SignOn/SignOnQt6ConfigVersion.cmake.in + create mode 100644 lib/SignOn/libsignon-qt6.pc.in + +diff --git a/common-project-config.pri b/common-project-config.pri +index abe6cf6..af5f425 100644 +--- a/common-project-config.pri ++++ b/common-project-config.pri +@@ -29,8 +29,8 @@ DEFINES += DEBUG_ENABLED + DEFINES += NO_SIGNON_USER + + # Library name for CMake and pkg-config +-LIBSIGNON = libsignon-qt5 +-CMAKE_BASENAME = SignOnQt5 ++LIBSIGNON = libsignon-qt$${QT_MAJOR_VERSION} ++CMAKE_BASENAME = SignOnQt$${QT_MAJOR_VERSION} + + #----------------------------------------------------------------------------- + # setup the installation prefix +diff --git a/lib/SignOn/SignOnQt5Config.cmake.in b/lib/SignOn/SignOnQt5Config.cmake.in +index 523fffb..128ee8d 100644 +--- a/lib/SignOn/SignOnQt5Config.cmake.in ++++ b/lib/SignOn/SignOnQt5Config.cmake.in +@@ -4,4 +4,4 @@ + + set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) + set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a) +-set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) +\ No newline at end of file ++set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) +diff --git a/lib/SignOn/SignOnQt6Config.cmake.in b/lib/SignOn/SignOnQt6Config.cmake.in +new file mode 100644 +index 0000000..128ee8d +--- /dev/null ++++ b/lib/SignOn/SignOnQt6Config.cmake.in +@@ -0,0 +1,7 @@ ++# SIGNONQT_INCLUDE_DIRS - The libsignon-qt include directories ++# SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt ++# SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt ++ ++set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) ++set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a) ++set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) +diff --git a/lib/SignOn/SignOnQt6ConfigVersion.cmake.in b/lib/SignOn/SignOnQt6ConfigVersion.cmake.in +new file mode 100644 +index 0000000..616cd60 +--- /dev/null ++++ b/lib/SignOn/SignOnQt6ConfigVersion.cmake.in +@@ -0,0 +1,10 @@ ++set(PACKAGE_VERSION $${PROJECT_VERSION}) ++ ++if(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" ) ++ set(PACKAGE_VERSION_COMPATIBLE FALSE) ++else(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" ) ++ set(PACKAGE_VERSION_COMPATIBLE TRUE) ++ if( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\") ++ set(PACKAGE_VERSION_EXACT TRUE) ++ endif( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\") ++endif(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" ) +diff --git a/lib/SignOn/libsignon-qt.pri b/lib/SignOn/libsignon-qt.pri +index 1458c50..a318fe8 100644 +--- a/lib/SignOn/libsignon-qt.pri ++++ b/lib/SignOn/libsignon-qt.pri +@@ -2,7 +2,7 @@ include( ../../common-project-config.pri ) + include( ../../common-vars.pri ) + TEMPLATE = lib + +-TARGET = signon-qt5 ++TARGET = signon-qt$${QT_MAJOR_VERSION} + + # Input + public_headers += \ +diff --git a/lib/SignOn/libsignon-qt6.pc.in b/lib/SignOn/libsignon-qt6.pc.in +new file mode 100644 +index 0000000..6a1bcb1 +--- /dev/null ++++ b/lib/SignOn/libsignon-qt6.pc.in +@@ -0,0 +1,11 @@ ++prefix=$$INSTALL_PREFIX ++exec_prefix=${prefix} ++libdir=$$INSTALL_LIBDIR ++includedir=${prefix}/include ++ ++Name: libsignon-qt6 ++Description: Client library for the Single Sign On daemon, Qt6 bindings. ++Version: $$PROJECT_VERSION ++Libs: -L${libdir} -lsignon-qt6 ++Requires: Qt6Core ++Cflags: -I${includedir}/signon-qt6 -I${includedir}/signon-qt6/SignOn +diff --git a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in +index 3d7f3db..8cbc9d4 100644 +--- a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in ++++ b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in +@@ -6,5 +6,5 @@ plugin_includedir=${includedir}/signon-plugins/SignOn + Name: signon-plugins-common + Description: SignonPluginsCommon + Version: $$PROJECT_VERSION +-Libs.private: -L/usr/lib -lQt5Core ++Libs.private: -L/usr/lib -lQt$${QT_MAJOR_VERSION}Core + Cflags: -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn +diff --git a/lib/plugins/signon-plugins.pc.in b/lib/plugins/signon-plugins.pc.in +index 5be38df..8849e5a 100644 +--- a/lib/plugins/signon-plugins.pc.in ++++ b/lib/plugins/signon-plugins.pc.in +@@ -8,6 +8,6 @@ Name: signon-plugins + Description: SignonPlugins + Version: $$PROJECT_VERSION + Requires: $${LIBSIGNON} +-Libs.private: -L/usr/lib -lQt5Core ++Libs.private: -L/usr/lib -lQt$${QT_MAJOR_VERSION}Core + Cflags: -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn + Libs: -lsignon-plugins +diff --git a/lib/signond/SignOn/SignOnExtension.pc.in b/lib/signond/SignOn/SignOnExtension.pc.in +index e439284..ce7ad9c 100644 +--- a/lib/signond/SignOn/SignOnExtension.pc.in ++++ b/lib/signond/SignOn/SignOnExtension.pc.in +@@ -7,6 +7,6 @@ plugindir=$$SIGNOND_EXTENSIONS_DIR + Name: SignOnExtension + Description: SignOn extension development + Version: $$PROJECT_VERSION +-Requires: Qt5Core ++Requires: Qt$${QT_MAJOR_VERSION}Core + Libs: -L${libdir} -lsignon-extension + Cflags: -I${includedir}/signon-extension +diff --git a/tests/libsignon-qt-tests/libsignon-qt-tests.pro b/tests/libsignon-qt-tests/libsignon-qt-tests.pro +index 4dd6ce4..7e44272 100644 +--- a/tests/libsignon-qt-tests/libsignon-qt-tests.pro ++++ b/tests/libsignon-qt-tests/libsignon-qt-tests.pro +@@ -10,7 +10,7 @@ QT += \ + testlib + QT -= gui + +-LIBS *= -lsignon-qt5 ++LIBS *= -lsignon-qt$${QT_MAJOR_VERSION} + QMAKE_LIBDIR += $${TOP_BUILD_DIR}/lib/SignOn + QMAKE_RPATHDIR = $${QMAKE_LIBDIR} + +diff --git a/tests/signond-tests/identity-tool.pro b/tests/signond-tests/identity-tool.pro +index c90e046..3a99e9d 100644 +--- a/tests/signond-tests/identity-tool.pro ++++ b/tests/signond-tests/identity-tool.pro +@@ -6,7 +6,7 @@ TARGET = identity-tool + QT += core + QT -= gui + +-LIBS += -lsignon-qt5 ++LIBS += -lsignon-qt$${QT_MAJOR_VERSION} + + QMAKE_LIBDIR += \ + $${TOP_BUILD_DIR}/lib/signond/SignOn \ +diff --git a/tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro b/tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro +index 2dac5ad..b78e691 100644 +--- a/tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro ++++ b/tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro +@@ -6,7 +6,7 @@ TARGET = identity-ac-helper + QT += core + QT -= gui + +-LIBS += -lsignon-qt5 ++LIBS += -lsignon-qt$${QT_MAJOR_VERSION} + + QMAKE_LIBDIR += \ + $${TOP_BUILD_DIR}/lib/signond/SignOn \ +diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri +index cbdfae3..74fa5b4 100644 +--- a/tests/signond-tests/signond-tests.pri ++++ b/tests/signond-tests/signond-tests.pri +@@ -11,7 +11,7 @@ QT -= gui + + LIBS += \ + -lsignon-extension \ +- -lsignon-qt5 ++ -lsignon-qt$${QT_MAJOR_VERSION} + + QMAKE_LIBDIR += \ + $${TOP_BUILD_DIR}/lib/signond/SignOn \ +-- +2.43.0 + diff --git a/net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch b/net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch new file mode 100644 index 000000000000..0cc5a3f31925 --- /dev/null +++ b/net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch @@ -0,0 +1,33 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From f4e9e3b541027eb0a360d4e3de27ac48b67411eb Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 17:14:47 +0200 +Subject: [PATCH 10/11] Fix plugin datastream in Qt6 + +We send the size of the to-be-sent data to the datastream + +In Qt6 QByteArray::size() is 64 bit, but the other side reads it as int, breaking the communication + +Cast the size to int to avoid that +--- + lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp b/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp +index d156659..fe35031 100644 +--- a/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp ++++ b/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp +@@ -63,7 +63,8 @@ bool BlobIOHandler::sendData(const QVariantMap &map) + + QDataStream stream(m_writeChannel); + QByteArray ba = variantMapToByteArray(map); +- stream << ba.size(); ++ // in Qt6 QByteArray::size() is 64 bit, but the receiving side expects int ++ stream << static_cast<int>(ba.size()); + + QVector<QByteArray> pages = pageByteArray(ba); + for (int i = 0; i < pages.count(); ++i) +-- +2.43.0 + diff --git a/net-libs/signond/files/0011-Port-away-from-deprecated-QProcess-signal.patch b/net-libs/signond/files/0011-Port-away-from-deprecated-QProcess-signal.patch new file mode 100644 index 000000000000..d3948b55f29d --- /dev/null +++ b/net-libs/signond/files/0011-Port-away-from-deprecated-QProcess-signal.patch @@ -0,0 +1,30 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From c8ad98249af541514ff7a81634d3295e712f1a39 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 17:15:00 +0200 +Subject: [PATCH 11/11] Port away from deprecated QProcess signal + +--- + src/signond/pluginproxy.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/signond/pluginproxy.cpp b/src/signond/pluginproxy.cpp +index 582aef4..2b9b28d 100644 +--- a/src/signond/pluginproxy.cpp ++++ b/src/signond/pluginproxy.cpp +@@ -99,8 +99,9 @@ PluginProxy::PluginProxy(QString type, QObject *parent): + */ + connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), + this, SLOT(onExit(int, QProcess::ExitStatus))); +- connect(m_process, SIGNAL(error(QProcess::ProcessError)), +- this, SLOT(onError(QProcess::ProcessError))); ++ ++ connect(m_process, &PluginProcess::errorOccurred, ++ this, &PluginProxy::onError); + } + + PluginProxy::~PluginProxy() +-- +2.43.0 + diff --git a/net-libs/signond/files/signond-8.61-consistent-paths.patch b/net-libs/signond/files/signond-8.61-consistent-paths.patch new file mode 100644 index 000000000000..16e0276a4e02 --- /dev/null +++ b/net-libs/signond/files/signond-8.61-consistent-paths.patch @@ -0,0 +1,288 @@ +From 62ce2305081075a53836999441214f03d37b50b5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 28 Jun 2020 21:44:42 +0200 +Subject: [PATCH 3/3] Consistent overrideable install paths + +At least signon-plugins.pc and signon-plugins-common.pc were getting it wrong. + +This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath +INSTALL_PREFIX. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + common-installs-config.pri | 2 +- + common-pkgconfig.pri | 2 +- + common-project-config.pri | 30 +++++++++---------- + lib/SignOn/SignOnQt5Config.cmake.in | 6 ++-- + lib/SignOn/SignOnQt6Config.cmake.in | 6 ++-- + lib/SignOn/libsignon-qt.pc.in | 2 +- + lib/SignOn/libsignon-qt.pri | 2 +- + lib/SignOn/libsignon-qt5.pc.in | 2 +- + lib/SignOn/libsignon-qt6.pc.in | 2 +- + .../signon-plugins-common.pc.in | 4 +-- + lib/plugins/signon-plugins.pc.in | 4 +-- + lib/signond/SignOn/SignOnExtension.pc.in | 2 +- + lib/signond/signond.pc.in | 2 +- + src/extensions/cryptsetup/cryptsetup.pro | 2 +- + src/plugins/plugins.pri | 4 +-- + 13 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/common-installs-config.pri b/common-installs-config.pri +index 69c5ae8..b72477a 100644 +--- a/common-installs-config.pri ++++ b/common-installs-config.pri +@@ -18,7 +18,7 @@ contains( TEMPLATE, app ) { + # default installation target for libraries + #----------------------------------------------------------------------------- + contains( TEMPLATE, lib ) { +- target.path = $${INSTALL_LIBDIR} ++ target.path = $${INSTALL_PREFIX}/$${LIBDIR} + INSTALLS += target + message("====") + message("==== INSTALLS += target") +diff --git a/common-pkgconfig.pri b/common-pkgconfig.pri +index 975068a..9f010d3 100644 +--- a/common-pkgconfig.pri ++++ b/common-pkgconfig.pri +@@ -3,7 +3,7 @@ + !isEmpty(pkgconfig.files) { + QMAKE_SUBSTITUTES += $${pkgconfig.files}.in + pkgconfig.CONFIG = no_check_exist +- pkgconfig.path = $${INSTALL_LIBDIR}/pkgconfig ++ pkgconfig.path = $${INSTALL_PREFIX}/$${LIBDIR}/pkgconfig + QMAKE_EXTRA_TARGETS += pkgconfig + + QMAKE_CLEAN += $${pkgconfig.files} +diff --git a/common-project-config.pri b/common-project-config.pri +index 606f70b..1185559 100644 +--- a/common-project-config.pri ++++ b/common-project-config.pri +@@ -57,36 +57,36 @@ exists( meego-release ) { + ARCH = $$system(uname -m) + } + +-linux-g++-64|linux-icc-64: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64 +-else: linux-g++-32|linux-icc-32: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib32 +-else: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib ++linux-g++-64|linux-icc-64: DEFAULT_LIBDIR = lib64 ++else: linux-g++-32|linux-icc-32: DEFAULT_LIBDIR = lib32 ++else: DEFAULT_LIBDIR = lib + + # default library directory can be overriden by defining LIBDIR when + # running qmake + isEmpty( LIBDIR ) { ++ LIBDIR = $${DEFAULT_LIBDIR} + message("====") +- message("==== NOTE: To override the library installation path run: `qmake LIBDIR=/custom/path'") +- message("==== (current installation path is `$${INSTALL_LIBDIR}')") ++ message("==== NOTE: To override the library dir beneath INSTALL_PREFIX run: `qmake LIBDIR=customdir'") ++ message("==== (current library dir is `$${LIBDIR}`, install path `$${INSTALL_PREFIX}/$${LIBDIR}')") + } else { +- INSTALL_LIBDIR = $${LIBDIR} + message("====") +- message("==== library install path set to `$${INSTALL_LIBDIR}'") ++ message("==== library dir set to `$${LIBDIR}`, install path `$${INSTALL_PREFIX}/$${LIBDIR}'") + } + +-isEmpty ( CMAKE_CONFIG_PATH ) { +- CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake/$${CMAKE_BASENAME} ++isEmpty ( CMAKE_MODULE_DIR ) { ++ CMAKE_MODULE_DIR = $${LIBDIR}/cmake/$${CMAKE_BASENAME} + message("====") +- message("==== NOTE: To override the cmake module installation path run: `qmake CMAKE_CONFIG_PATH=/custom/path'") +- message("==== (current installation path is `$${CMAKE_CONFIG_PATH}')") ++ message("==== NOTE: To override the cmake module dir beneath INSTALL_PREFIX run: `qmake CMAKE_MODULE_DIR=customdir'") ++ message("==== (current cmake module dir is `$${CMAKE_MODULE_DIR}`, install path `$${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR}')") + } else { + message("====") +- message("==== cmake module install path set to `$${CMAKE_CONFIG_PATH}'") ++ message("==== cmake module dir set to `$${CMAKE_MODULE_DIR}', install path `$${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR}')") + } + + # Default directory for signond extensions + _EXTENSIONS = $$(SIGNOND_EXTENSIONS_DIR) + isEmpty(_EXTENSIONS) { +- SIGNOND_EXTENSIONS_DIR = $${INSTALL_LIBDIR}/signon/extensions ++ SIGNOND_EXTENSIONS_DIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon/extensions + } else { + SIGNOND_EXTENSIONS_DIR = $$_EXTENSIONS + } +@@ -94,7 +94,7 @@ SIGNOND_EXTENSIONS_DIR_QUOTED = \\\"$$SIGNOND_EXTENSIONS_DIR\\\" + + _PLUGINS = $$(SIGNOND_PLUGINS_DIR) + isEmpty(_PLUGINS) { +- SIGNOND_PLUGINS_DIR = $${INSTALL_LIBDIR}/signon ++ SIGNOND_PLUGINS_DIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon + } else { + SIGNOND_PLUGINS_DIR = $$_PLUGINS + } +@@ -102,7 +102,7 @@ SIGNOND_PLUGINS_DIR_QUOTED = \\\"$$SIGNOND_PLUGINS_DIR\\\" + + # Note that you have to CONFIG+=install_tests in order to install tests + isEmpty(TESTDIR) { +- INSTALL_TESTDIR = $${INSTALL_LIBDIR}/signon ++ INSTALL_TESTDIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon + } else { + INSTALL_TESTDIR = $${TESTDIR} + } +diff --git a/lib/SignOn/SignOnQt5Config.cmake.in b/lib/SignOn/SignOnQt5Config.cmake.in +index 523fffb..7105315 100644 +--- a/lib/SignOn/SignOnQt5Config.cmake.in ++++ b/lib/SignOn/SignOnQt5Config.cmake.in +@@ -2,6 +2,6 @@ + # SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt + # SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt + +-set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) +-set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a) +-set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) ++set(SIGNONQT_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so) ++set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.a) ++set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) +--- a/lib/SignOn/SignOnQt6Config.cmake.in ++++ b/lib/SignOn/SignOnQt6Config.cmake.in +@@ -2,6 +2,6 @@ + # SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt + # SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt + +-set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) +-set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a) ++set(SIGNONQT_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so) ++set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.a) + set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) + +diff --git a/lib/SignOn/libsignon-qt.pc.in b/lib/SignOn/libsignon-qt.pc.in +index 26f0f5b..c614541 100644 +--- a/lib/SignOn/libsignon-qt.pc.in ++++ b/lib/SignOn/libsignon-qt.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + + Name: libsignon-qt +diff --git a/lib/SignOn/libsignon-qt.pri b/lib/SignOn/libsignon-qt.pri +index 1458c50..d80f8bb 100644 +--- a/lib/SignOn/libsignon-qt.pri ++++ b/lib/SignOn/libsignon-qt.pri +@@ -79,6 +79,6 @@ QMAKE_SUBSTITUTES += $${CMAKE_BASENAME}Config.cmake.in \ + $${CMAKE_BASENAME}ConfigVersion.cmake.in + cmake_modules.files = $${CMAKE_BASENAME}Config.cmake \ + $${CMAKE_BASENAME}ConfigVersion.cmake +-cmake_modules.path = $${CMAKE_CONFIG_PATH} ++cmake_modules.path = $${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR} + + INSTALLS += cmake_modules +diff --git a/lib/SignOn/libsignon-qt5.pc.in b/lib/SignOn/libsignon-qt5.pc.in +index 2181359..5d98b6d 100644 +--- a/lib/SignOn/libsignon-qt5.pc.in ++++ b/lib/SignOn/libsignon-qt5.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + + Name: libsignon-qt5 +--- a/lib/SignOn/libsignon-qt6.pc.in ++++ b/lib/SignOn/libsignon-qt6.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + + Name: libsignon-qt6 +diff --git a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in +index 3d7f3db..2240789 100644 +--- a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in ++++ b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in +@@ -1,10 +1,10 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + plugin_includedir=${includedir}/signon-plugins/SignOn + Name: signon-plugins-common + Description: SignonPluginsCommon + Version: $$PROJECT_VERSION +-Libs.private: -L/usr/lib -lQt$${QT_MAJOR_VERSION}Core ++Libs.private: -L${libdir} -lQt$${QT_MAJOR_VERSION}Core + Cflags: -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn +diff --git a/lib/plugins/signon-plugins.pc.in b/lib/plugins/signon-plugins.pc.in +index 5be38df..2e3c087 100644 +--- a/lib/plugins/signon-plugins.pc.in ++++ b/lib/plugins/signon-plugins.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + plugin_includedir=${includedir}/signon-plugins/SignOn + plugindir=$$SIGNOND_PLUGINS_DIR +@@ -8,6 +8,6 @@ Name: signon-plugins + Description: SignonPlugins + Version: $$PROJECT_VERSION + Requires: $${LIBSIGNON} +-Libs.private: -L/usr/lib -lQt$${QT_MAJOR_VERSION}Core ++Libs.private: -L${libdir} -lQt$${QT_MAJOR_VERSION}Core + Cflags: -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn + Libs: -lsignon-plugins +diff --git a/lib/signond/SignOn/SignOnExtension.pc.in b/lib/signond/SignOn/SignOnExtension.pc.in +index e439284..8fc669c 100644 +--- a/lib/signond/SignOn/SignOnExtension.pc.in ++++ b/lib/signond/SignOn/SignOnExtension.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + plugindir=$$SIGNOND_EXTENSIONS_DIR + +diff --git a/lib/signond/signond.pc.in b/lib/signond/signond.pc.in +index a7b5036..9ec0b1a 100644 +--- a/lib/signond/signond.pc.in ++++ b/lib/signond/signond.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + + Name: signond-dev +diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro +index f4b6e53..2657b47 100644 +--- a/src/extensions/cryptsetup/cryptsetup.pro ++++ b/src/extensions/cryptsetup/cryptsetup.pro +@@ -41,6 +41,6 @@ LIBS += \ + + include( $${TOP_SRC_DIR}/common-installs-config.pri ) + +-target.path = $${INSTALL_LIBDIR}/signon/extensions ++target.path = $${INSTALL_PREFIX}/$${LIBDIR}/signon/extensions + INSTALLS += target + +diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri +index 2c03e74..ea2fcb2 100644 +--- a/src/plugins/plugins.pri ++++ b/src/plugins/plugins.pri +@@ -27,7 +27,7 @@ QMAKE_CXXFLAGS += -fno-exceptions \ + + headers.path = $${INSTALL_PREFIX}/include/signon-plugins + +-pkgconfig.path = $${INSTALL_LIBDIR}/pkgconfig ++pkgconfig.path = $${INSTALL_PREFIX}/$${LIBDIR}/pkgconfig + +-target.path = $${INSTALL_LIBDIR}/signon ++target.path = $${INSTALL_PREFIX}/$${LIBDIR}/signon + INSTALLS = target +-- +2.27.0 diff --git a/net-libs/signond/metadata.xml b/net-libs/signond/metadata.xml index 0f84f0aea6de..5fdf45f73ba9 100644 --- a/net-libs/signond/metadata.xml +++ b/net-libs/signond/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="cpe">cpe:/a:signond_project:signond</remote-id> + <remote-id type="gitlab">accounts-sso/signond</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/signond/signond-8.61-r100.ebuild b/net-libs/signond/signond-8.61-r100.ebuild new file mode 100644 index 000000000000..3a6494c050a6 --- /dev/null +++ b/net-libs/signond/signond-8.61-r100.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils multibuild + +if [[ ${PV} = *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/nicolasfella/signond.git/" + EGIT_BRANCH="qt6" + inherit git-r3 +else + SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${PN}-VERSION_${PV}" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Signon daemon for libaccounts-glib" +HOMEPAGE="https://gitlab.com/accounts-sso" + +LICENSE="LGPL-2.1" +SLOT="0" +# The qt5/qt6 situation is complicated: https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/merge_requests/28#note_1689621252 +# 1) the library is coinstallable for qt5/qt6 +# 2) signond (the daemon) must be built for only one Qt version, matching the +# Qt version of all consumer plugins. +IUSE="doc +qt5 qt6 test" +REQUIRED_USE="|| ( qt5 qt6 )" + +# tests are brittle; they all pass when stars align, bug 727666 +RESTRICT="test !test? ( test )" + +RDEPEND=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsql:5 + ) + qt6? ( dev-qt/qtbase:6[dbus,gui,network,sql] ) + net-libs/libproxy +" +DEPEND="${RDEPEND} + test? ( + qt5? ( dev-qt/qttest:5 ) + ) +" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + || ( + dev-qt/qttools:6[assistant] + dev-qt/qthelp:5 + ) + ) +" + +PATCHES=( + "${FILESDIR}"/0001-Don-t-forward-declare-QStringList.patch + "${FILESDIR}"/0002-Remove-usage-of-Q_EXTERN_C.patch + "${FILESDIR}"/0003-Port-from-QProcess-pid-to-processId.patch + "${FILESDIR}"/0004-Port-away-from-deprecated-QString-SplitBehavior.patch + "${FILESDIR}"/0005-Port-away-from-QtContainer-toSet.patch + "${FILESDIR}"/0006-Port-away-from-deprecated-QMap-unite.patch + "${FILESDIR}"/0007-Add-Qt6-CI.patch + "${FILESDIR}"/0008-Use-return-instead-of-reference-for-DBus-output-para.patch + "${FILESDIR}"/0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch + "${FILESDIR}"/0010-Fix-plugin-datastream-in-Qt6.patch + "${FILESDIR}"/0011-Port-away-from-deprecated-QProcess-signal.patch + "${FILESDIR}/${PN}-8.60-buildsystem.patch" + "${FILESDIR}/${PN}-8.60-unused-dep.patch" # bug 727346 + "${FILESDIR}/${PN}-8.61-consistent-paths.patch" # bug 701142 +) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_prepare() { + default + + local qhelpgeneratorpath + if has_version "dev-qt/qttools:6[assistant]"; then + qhelpgeneratorpath="$(qt6_get_libdir)/qt6/libexec" + elif has_version "dev-qt/qthelp:5"; then + qhelpgeneratorpath="$(qt5_get_bindir)" + else + eerror "dev-qt/qttools:6[assistant] nor dev-qt/qthelp:5 available even though in deps(?)" + fi + + sed -e "/QHG_LOCATION/s|qhelpgenerator|${qhelpgeneratorpath}/&|" \ + -i {lib/plugins/,lib/SignOn/,}doc/doxy.conf || die + + # install docs to correct location + sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \ + -i doc/doc.pri || die + sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/\$\${TARGET}/" \ + -i lib/plugins/doc/doc.pri || die + sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/libsignon-qt/" \ + -i lib/SignOn/doc/doc.pri || die + + use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" \ + -i signon.pro lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die + + use test || sed -e '/^SUBDIRS/s/tests//' \ + -i signon.pro || die "couldn't disable tests" + + multibuild_copy_sources +} + +src_configure() { + my_src_configure() { + cd "${BUILD_DIR}" || die + + local myqmakeargs=( + PREFIX="${EPREFIX}"/usr + LIBDIR=$(get_libdir) + ) + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + eqmake6 "${myqmakeargs[@]}" + else + eqmake5 "${myqmakeargs[@]}" + fi + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + my_src_compile() { + emake -C "${BUILD_DIR}" + } + + multibuild_foreach_variant my_src_compile +} + +src_install() { + my_src_install() { + emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install + } + + multibuild_foreach_variant my_src_install +} diff --git a/net-libs/signond/signond-8.61.ebuild b/net-libs/signond/signond-8.61.ebuild index ced161610711..e1079e2ed2f8 100644 --- a/net-libs/signond/signond-8.61.ebuild +++ b/net-libs/signond/signond-8.61.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 @@ -31,7 +31,7 @@ DEPEND="${RDEPEND} " BDEPEND=" doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] dev-qt/qthelp:5 ) " diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest index 7d1bd3642ac3..00505c5f85bb 100644 --- a/net-libs/wvstreams/Manifest +++ b/net-libs/wvstreams/Manifest @@ -6,5 +6,5 @@ AUX wvstreams-4.6.1_p14-llvm.patch 11598 BLAKE2B a7f4019da421702ecfedc461079ad39 AUX wvstreams-4.6.1_p14-xplc-module.patch 806 BLAKE2B 066262f3e42617dbae0ff982af21933b1567f23119f9f83152afb1f8da8ea79fdc09f6b01a01ecb03626c7007b70d52f921f1f637089a9813d061dcc9de3dc9c SHA512 e1b74f6481cc55b1f6750d08c2f4ae4d11575e99cfd94b5bcc658f54ac4756e885dac98a82eb7f2b6e02d33f1b4ac75b91087640e3195deff8887d752ee2e0c0 DIST wvstreams_4.6.1-14.debian.tar.xz 21124 BLAKE2B 2af6ec180c3130dd7def733e5ea569fd0a81cd2c2411daca25e6042dcbe78792bafc4b13f1c1fffddb6cd66273f11c62f54b415c975cbea0af052b18ff0955d1 SHA512 93ea7c4fbab542bd552d6e91ae0c49a27ad8aded177ae6474943acb08d204ab31eac49b3f416b4d90a38ea697f3641c09651a64f9c40d12543d454aadf2ad9e4 DIST wvstreams_4.6.1.orig.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a -EBUILD wvstreams-4.6.1_p14-r2.ebuild 2176 BLAKE2B 27d1b9e5888dc061980f118e85e7c6fe3dda6691bcbcae94a35dd87c806019c913b91b06348aee64d502cb3b02f991e48e4ba0afe60ba6b72053f3efa98023d3 SHA512 5a91d1dadccc40b8dc63407edc39451c7d197c69c76b1a76650057ad8558f1801df4629355f2dd16e383c050066b3f42f2ed72aa7b9fe986072634a4b2d118cf +EBUILD wvstreams-4.6.1_p14-r2.ebuild 2177 BLAKE2B e0b706d155333521bb188375d0244b06e153564713f742393f91cf964bd1b4ebdd37ec815ca6a0ed757f73ea9c51ac008bd4836ac7f03ad0d238a2a1b0842c2c SHA512 eef2101c102b625b333e1d840820b160a27fa8cece91f2706cde04d70cf2600ecb9b3dbf2eca0e5898a47d7d126fce7d7a3d1fb36c0028a17cadd85ab2df0e89 MISC metadata.xml 528 BLAKE2B e30c854d59e1aaa844f2c81878b50c0a1c1cd23e59f9b6e34574ebafaf44ef132ef5c84ff8c3cc6cf5c44cbccb8b82f07ce4f26bd60cc5f4a685fe4197117380 SHA512 f85b523e42867bf939b4afc264300e182382ed426912c9b42a2eb1d9e05a186d7a75803deef6f8977188336042d2cd543ccd64356ac802be69ca5bca027a2b13 diff --git a/net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild b/net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild index 01d43cd9ed9a..41938e8d821f 100644 --- a/net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild +++ b/net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) boost? ( dev-libs/boost:= ) " DOCS="ChangeLog README*" |