diff options
Diffstat (limited to 'net-libs')
30 files changed, 284 insertions, 932 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex 5e4273bc9ea6..608a381dc28c 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 6b4326e8c39a..e548615dfcfc 100644 --- a/net-libs/accounts-qml/Manifest +++ b/net-libs/accounts-qml/Manifest @@ -1,4 +1,3 @@ DIST accounts-qml-0.7_p20231028.tar.bz2 50521 BLAKE2B 6704557e50b40d0be6e706c05ce888f959fd2028c7fa9aea9d3f2064828b6869bee454cd88189e70abe483b0809ec857634b0b8fa5f989fca05ae7af55efb80a SHA512 0d366b526873bdeecb9a5582992b8d659777beff3b5449745141a3c8156e130714acd81343440a2edcff7ed7bfeed2ce1afdb89188c8be2a2737491278b44253 -EBUILD accounts-qml-0.7_p20231028-r1.ebuild 2709 BLAKE2B ef6ee1a4326c15c027b6102c4beac00b5bb082d9e4569ea28b01cdbd6e478a56ebc1f6a341c6c6198cca0e28d9a137408d17ed70792b989ade34eb80d543b94f SHA512 4db822c074ce51733a51b608f129098cd1b206fb07ae89f904fd339f29cdf4b03b791bb0c4558bbf910707ecc02547ac211a33c7e2be67d6136045b321b14699 -EBUILD accounts-qml-0.7_p20231028-r2.ebuild 2636 BLAKE2B 43a02850bc48e730c6fce0c79ab680fc407f700c593c19bbffb131078447fa414b501898ec5fa53dfb6d5e251b4d6127d726ce89b7c780d9fb3bd71542ca78cf SHA512 e04895f149b82613965fb12113aed2f67bdcb31556e57f9812287a492dc2d1bcfea3bb4bddad0ee280b70f74e7f26a10df1302c1001447ee0fdc2857953624eb +EBUILD accounts-qml-0.7_p20231028-r3.ebuild 1701 BLAKE2B faa12f791cec1ffacd7a0bb334b634e5ef454be3f5d1e960de48645b5ef379980cf2c72abe02dde183ba8e33cc09789348a92af51ebf970b8d1508428cf520bc SHA512 af612abce5a5e1e175b950f0fa92a81613388a793d4e9fdd2114120abbb4db579e248787efcf2451fc9d71b17388b453f86b93c72781ea71ef591915ad1deb97 MISC metadata.xml 347 BLAKE2B 755e5ea43cad3783e4cb0e4f981a70a02cc25a344de46fe29923edcf5737778312017ddb7be004fc7cc075a6ffd206133952f07aeac30f9bf84277c3ea00eff2 SHA512 adbed6a6a004dc5a83adb510ca9ea5a8c2d43639452cc0c7ca28a2bff6a3680bb7a190c3e78d85008ae3cb444d07cf9d34f7e1b296cf2789e49e682fac970456 diff --git a/net-libs/accounts-qml/accounts-qml-0.7_p20231028-r1.ebuild b/net-libs/accounts-qml/accounts-qml-0.7_p20231028-r1.ebuild deleted file mode 100644 index b69415b2fefd..000000000000 --- a/net-libs/accounts-qml/accounts-qml-0.7_p20231028-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# 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)/qt6/bin/" - 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 - } - - local QT_QPA_PLATFORM=offscreen - multibuild_foreach_variant my_src_install - use doc && local HTML_DOCS=( doc ) - einstalldocs -} diff --git a/net-libs/accounts-qml/accounts-qml-0.7_p20231028-r2.ebuild b/net-libs/accounts-qml/accounts-qml-0.7_p20231028-r2.ebuild deleted file mode 100644 index 0369409c2d20..000000000000 --- a/net-libs/accounts-qml/accounts-qml-0.7_p20231028-r2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# 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 test" - -# dbus problems -RESTRICT="test" - -RDEPEND=" - dev-qt/qtbase:6 - dev-qt/qtdeclarative:6 - >=net-libs/accounts-qt-1.17[qt5(-)?,qt6(+)] - >=net-libs/signond-8.61-r100[qt5(-)?,qt6(+)] - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - ) -" -DEPEND="${RDEPEND} - test? ( - dev-qt/qtbase:6[gui] - qt5? ( - dev-qt/qtgui:5 - dev-qt/qttest:5 - ) - ) -" -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) 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)/qt6/bin/" - 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 - } - - local QT_QPA_PLATFORM=offscreen - multibuild_foreach_variant my_src_install - use doc && local HTML_DOCS=( doc ) - einstalldocs -} diff --git a/net-libs/accounts-qml/accounts-qml-0.7_p20231028-r3.ebuild b/net-libs/accounts-qml/accounts-qml-0.7_p20231028-r3.ebuild new file mode 100644 index 000000000000..05ebb1e4e20a --- /dev/null +++ b/net-libs/accounts-qml/accounts-qml-0.7_p20231028-r3.ebuild @@ -0,0 +1,80 @@ +# 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/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 test" + +# dbus problems +RESTRICT="test" + +RDEPEND=" + dev-qt/qtbase:6 + dev-qt/qtdeclarative:6 + >=net-libs/accounts-qt-1.17-r2 + >=net-libs/signond-8.61-r102 +" +DEPEND="${RDEPEND} + test? ( dev-qt/qtbase:6[gui] ) +" +BDEPEND=" + doc? ( + app-text/doxygen + dev-qt/qttools:6[assistant,qdoc] + ) +" + +DOCS=( README.md ) + +src_prepare() { + default + rm -v doc/html/.gitignore || die +} + +src_configure() { + local myqmakeargs=( + CONFIG+=no_docs \ + PREFIX="${EPREFIX}"/usr + ) + + eqmake6 "${myqmakeargs[@]}" +} + +src_compile() { + default + if use doc; then + $(qt6_get_libdir)/qt6/bin/qdoc doc/accounts-qml-module.qdocconf || die + fi +} + +src_install() { + local QT_QPA_PLATFORM=offscreen + emake INSTALL_ROOT="${D}" install_subtargets + use doc && local HTML_DOCS=( doc ) + einstalldocs +} diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest index ec35ab06e0e9..0ac935c9fb3a 100644 --- a/net-libs/accounts-qt/Manifest +++ b/net-libs/accounts-qt/Manifest @@ -1,5 +1,4 @@ AUX accounts-qt-1.16-libdir.patch 4809 BLAKE2B 50c73a04be62a4748278f7cf46a8c06286363b9929324863af079e4da2c487d36194231a06d15ccb159d0a1f668fcf1a1ad80330730bebc08f53d29bbaa499f0 SHA512 dde1e34655952e8ae0ade756d8ff8559b4049eed0d273c078043eafe24751edf57e66b6300ee875c28b56978ed502bef79186605b3bc73b752fb226ae2bda90d DIST accounts-qt-1.17.tar.bz2 55907 BLAKE2B e13debd3f7bc9a17cf73c55777b62e904a6bf7791fe3ad0e1af25a72622a8c21cb56bf033afb50d17a1dd703be0af88de9e557d0947d9b7c12e1ac241b45b743 SHA512 ceab67d5db1acb68e391be0557e5fd4b9675f1401b1fe81ff431d5d1eb1d7124cd5170fde44658d7db8b46f721e9d3f7db719c5b727aa681a9e35ea026a71908 -EBUILD accounts-qt-1.17-r1.ebuild 2345 BLAKE2B a368545010f41e939b75e349b65506addc0191392867ee420178328181fcf680268d0af008d95e3999fb796152738000e363ecd3e95f48c19574685df545e231 SHA512 5d51a891d04e78496a165b9695157c952d4e442ee581b0937ef03960c9f43a30261fe4bf338fe020cfdcd0576c003491b38373e83da0437d358825e1ae4c994c -EBUILD accounts-qt-1.17.ebuild 2397 BLAKE2B 36ec7157d3cebb1d9ec5faba8affab3994fba9237ffc2d5f334787fefe3980d7e9d4a34bdd61555bdea0962ab39d3ca2f347b8de653810f9b693f687ecea7560 SHA512 73d2b11d481ece53c32f05afdc702abb23a4648683253ee460d7b889eba22dba1cf1ebf875940fd518c095a329247ea69e6f8587bce86f755168576885ce216d +EBUILD accounts-qt-1.17-r2.ebuild 1411 BLAKE2B 3b2d5b422dd6d09c98d5514b32224f959b9c8069942933b047e961ccc0de1a99668963a86f4b265353acf3571e19be8d07a4a564bf61d599d9eee6491f484ce2 SHA512 13daf75759aeeee7d92704fa74d1f91a73dbf95fedcbffd6b251861ce5a77f0ccd87ed245400df72eaf13e5dd814162ea383d21cefb789cdfe90f6383f23d967 MISC metadata.xml 342 BLAKE2B 220884a62a67c3bc3417a30099191a253c3af9144d30fb04bc6b495c9a665e167392d96421a707bdc9d7d3737781650e48839ec9db12047590a69e8b1704730f SHA512 2525b4cab71fe0a925d2acea96ec7a164f1df175f7699b9b26d30a2642559627790d264b147c40365162ce3dda67fbbde2ed8115bc42e4ed284b970658bb3779 diff --git a/net-libs/accounts-qt/accounts-qt-1.17-r1.ebuild b/net-libs/accounts-qt/accounts-qt-1.17-r1.ebuild deleted file mode 100644 index f0b6ab716f0d..000000000000 --- a/net-libs/accounts-qt/accounts-qt-1.17-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# 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/lib${PN}.git/" - inherit git-r3 -else - SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/VERSION_${PV}/lib${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}/lib${PN}-VERSION_${PV}" - 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 test" - -# dbus problems -RESTRICT="test" - -RDEPEND=" - dev-libs/glib:2 - dev-qt/qtbase:6[xml] - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtxml:5 - ) - >=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}/${PN}-1.16-libdir.patch" ) - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt5) 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/accounts-qt-1.17-r2.ebuild b/net-libs/accounts-qt/accounts-qt-1.17-r2.ebuild new file mode 100644 index 000000000000..417918c1e7eb --- /dev/null +++ b/net-libs/accounts-qt/accounts-qt-1.17-r2.ebuild @@ -0,0 +1,64 @@ +# 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/lib${PN}.git/" + inherit git-r3 +else + SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/VERSION_${PV}/lib${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/lib${PN}-VERSION_${PV}" + 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 test" + +# dbus problems +RESTRICT="test" + +RDEPEND=" + dev-libs/glib:2 + dev-qt/qtbase:6[xml] + >=net-libs/libaccounts-glib-1.23:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + dev-qt/qttools:6[assistant] + ) +" + +PATCHES=( "${FILESDIR}/${PN}-1.16-libdir.patch" ) + +src_prepare() { + default + + sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \ + -i doc/doc.pri || die + sed -e "/QHG_LOCATION/s|qhelpgenerator|$(qt6_get_libdir)/qt6/libexec/&|" \ + -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 +} + +src_configure() { + eqmake6 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) +} + +src_install() { + emake INSTALL_ROOT="${D}" install +} diff --git a/net-libs/accounts-qt/accounts-qt-1.17.ebuild b/net-libs/accounts-qt/accounts-qt-1.17.ebuild deleted file mode 100644 index 9ef807a5dea9..000000000000 --- a/net-libs/accounts-qt/accounts-qt-1.17.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# 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/lib${PN}.git/" - inherit git-r3 -else - SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/VERSION_${PV}/lib${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}/lib${PN}-VERSION_${PV}" - 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}/${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/kdsoap-ws-discovery-client/Manifest b/net-libs/kdsoap-ws-discovery-client/Manifest index a5b269679bce..955938fb421e 100644 --- a/net-libs/kdsoap-ws-discovery-client/Manifest +++ b/net-libs/kdsoap-ws-discovery-client/Manifest @@ -1,6 +1,4 @@ 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.4.0.tar.xz 30692 BLAKE2B f8d65a23731c9f56c75bdf678842b815512d5e15a28b3e37acc4d02cf0b10ec2d11876ff751dfd93321c7d3af3e422bec563ed6abd33c514f5537dbec9e39b46 SHA512 485e0319d986743183e82dd3a7576f0fc473122867e5e820a57f63b2fa2fde0721d8a7ee30d4399c01b11b51634db452174841a887b6685db9ab33e310866dda -EBUILD kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild 1287 BLAKE2B abeea4047a653f5fd3125b5ba0704e87f77b110ca46c557af7e90c4265a256c8cc1221ae736b67598c4b9ac9b408c933e79d160ed79f91dcb811b5fb67126c6b SHA512 bd7718dc7a3f54c5269d37f93c10918a7f31bac78ff03285ffd90f7241f6313296c9a8f104e87606b9a8ae45eb49b82be477dcbf518f7b1eb08d167293d0b4a3 EBUILD kdsoap-ws-discovery-client-0.4.0.ebuild 1088 BLAKE2B 5672b62846f75420687afb72383f3c16bfc87aa3d0d520df7afa5d549b223cb08859b8aeefbba3c28a48f98dae2186da3dd610059fd1c8efb67b75fdd4f41cdc SHA512 11435e3d2fe78424d92eaeec80e176f6676a827aa11232df33ff9ca632ad6d21cd0fe3b9764533025619881ab26af51fdbbf724434c81e6044aa815ef5969af5 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 deleted file mode 100644 index 2edc08a9eea2..000000000000 --- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -COMMIT=dcefb65c88e76f1f9eda8b0318006e93d15a0e1e -ECM_QTHELP="false" -ECM_TEST="true" -inherit ecm - -DESCRIPTION="WS-Discovery client library based on KDSoap" -HOMEPAGE="https://invent.kde.org/libraries/kdsoap-ws-discovery-client -https://gitlab.com/caspermeijn/kdsoap-ws-discovery-client -https://caspermeijn.gitlab.io/kdsoap-ws-discovery-client" -SRC_URI="https://gitlab.com/caspermeijn/${PN}/repository/${COMMIT}/archive.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT}-${COMMIT}" - -LICENSE="CC0-1.0 GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="doc" - -RESTRICT="test" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - >=net-libs/kdsoap-1.9.0:=[qt5(+)] -" -DEPEND="${RDEPEND} - test? ( dev-qt/qtxml:5 ) -" -BDEPEND="doc? ( app-text/doxygen[dot] )" - -PATCHES=( "${FILESDIR}"/${PN}-0.2_pre20200317-no-install-docs.patch ) - -src_prepare() { - ecm_src_prepare - use test || ecm_punt_bogus_dep Qt5 Xml -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package doc Doxygen) - -DBUILD_QCH=OFF # does not use ecm_add_qch from ECMAddQch - ) - ecm_src_configure -} - -src_install() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. ) - ecm_src_install -} diff --git a/net-libs/nghttp3/Manifest b/net-libs/nghttp3/Manifest index 305fd4bd8a34..a967117b0470 100644 --- a/net-libs/nghttp3/Manifest +++ b/net-libs/nghttp3/Manifest @@ -3,5 +3,5 @@ DIST nghttp3-1.5.0.tar.xz 391668 BLAKE2B cbafd1e927bc39db78e238c0a7330170ec8e7a6 DIST nghttp3-1.7.0.tar.xz 395808 BLAKE2B 2a13747518883a0f11005ee1189dc6a32a73fdf390416f6e3c352a7be76cccd68522581c2148c6a86c24f14ba13fc21a7c6d6815ab3ad724c08a8088d1421d3b SHA512 77510e2056206e3e149bc3535a0e7e6095afb0a0358a9dda48c8be82199eaefd0dadbba7e027c5c14eb46572d2dbc929a99c3b9c6d27c83a1c80428263ccecab EBUILD nghttp3-1.5.0.ebuild 958 BLAKE2B ad076ae8c16c3d5bb071a0eaeca6dcd8e50346a2004e058f7cb6974dcf40dc96ff3bebba87e90347a6ef5bc7419e9d532aaf4e91974c44d50c66e7aef2f0e6a3 SHA512 fe607a954531eba7c467bf58903a2e0400b2396076426ed8b8466a7cd953885573f0b29e6b183d4d33aea4fa95a17d656517b45676f97290adbdd6c9401b65ce EBUILD nghttp3-1.7.0.ebuild 1037 BLAKE2B 9ccda00946f4118bc93fddc3b0b9a83a3df401094cbe878b1f9b50b06e21db969783370873d628e0eb9ca3c30f8354f8f753f477a3e1e80aec99b6c7fe7c8c1e SHA512 eecc3e7b4bdf8771ff3ee4ad599723fb35198e198786a9b46fbe803d69880a1cc427aab0d0973c6878b03f7180f5c9f0a53af0454227796de398b1c4805ba17d -EBUILD nghttp3-9999.ebuild 1040 BLAKE2B 17e3e65e2ee4f717edddb01bdaf2f6d6dded715e2080b746b674b91acfdacefbcb85a7c65a59cbe8d12da430e9452ab7179e5f608b7b60ac7374e702152aecef SHA512 baf915564151d952a4aa4be69fba90bcfd203d512d427a9098284aededbbf3da4afec2bf6e15edf81340928d6da3a58b4986872534ea9313f71083341719a9a4 +EBUILD nghttp3-9999.ebuild 984 BLAKE2B 0d40265ad80a7de0188d97018c466fe0ebf95da3aece4c2e47fae75b296eb852a5db16b99c471fc30c903bdf96a0decf6108dc055627494c61fe37ceb6778b6a SHA512 998b287ae1ed0f033ec4a2633b2a304d0463af2c80f8896341a208397ec607c89b0980d01157594f0a17d8024971e4cb5d47ba3cfa8dc54d68658d5137be053f MISC metadata.xml 328 BLAKE2B 6f0147cead329ef6b779485417ff33e5814b0cd86e99b571b0dc5653a7ca8f80f65fddb8b1b58fe249b7b86c0aecd32a446d415065fc70a0c72bf69651b19d25 SHA512 54e49a9c82c6a7f7a50daf557416845fa5c548f11ca243ff236105ad97903ea983436e94067c831b93ca95da154dd2561e314e96e8bde6d4678efd1adaf02f11 diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild index 75bde0f87eca..9e1fdeb754e4 100644 --- a/net-libs/nghttp3/nghttp3-9999.ebuild +++ b/net-libs/nghttp3/nghttp3-9999.ebuild @@ -27,10 +27,6 @@ REQUIRED_USE=" BDEPEND="virtual/pkgconfig" -PATCHES=( - "${FILESDIR}"/${PN}-1.7.0-munit-c23.patch -) - multilib_src_configure() { local mycmakeargs=( -DENABLE_LIB_ONLY=ON diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest index d10a366bb144..62a7cdf51edf 100644 --- a/net-libs/ngtcp2/Manifest +++ b/net-libs/ngtcp2/Manifest @@ -1,7 +1,9 @@ +AUX ngtcp2-1.10.0-gcc15-uninit.patch 1686 BLAKE2B 8122058a83c28c4eae25ed592c60b32bdaaf8259fbc8ee6d50d82da7c6a175b897c5231ba82589e7cd8e45606f1857314c542c52e853b79b816d48262cef5428 SHA512 ae8ef45cf943ca8c73b76407a1fc3548989f536d4944687b37830fbd0a873952364bbd4e51d08cf5c7eb83381bf79b0895f742c63fa829cbdde148aba8e3f700 AUX ngtcp2-1.10.0-munit-c23.patch 961 BLAKE2B 30f969117b8f8a74747d5c6d466ec9be7b35ef852d5b05d7f2900fdc8867a9859289ccadfe071262f5d45838da3282666f012a581c08640e26d3893d88fe08cb SHA512 815c47f9bcc600de920e81a7630104b0a3875123831b131b7d95fc8a022d4c38a42b0a9681e6cfc941a0bd71093e960b1f608a84df7cf5289c7fad77a2ecc7a0 DIST ngtcp2-1.10.0.tar.xz 636296 BLAKE2B 21ca85ed0652d9c3721f1a8dcb890bc21ea37bb49095c3fcc418e818462629463f4410e169465ff19960b09e47684e99b9fc713919f114c3ef765cc2d754aadb SHA512 de61f9c2b8135d0d08740215002a3e1688f93825ce6ab6d074ce36569bde0e789d4f1a2abd708773c4ab123c4584e94f0eeee8f7e8ef238891f9bb36be001f9b DIST ngtcp2-1.7.0.tar.xz 631072 BLAKE2B 1a1ce134c54974418c0cf0bacc09a770e29cd7c7bfc44a2b5420f3bef3e70502f610bee4e9bb5ed9b87024153aa9390d5a233d2d6e2689166e1079e0e4f52600 SHA512 6efa42d17772fde00d9d0a67f2cbcf0704a8462c7305a5e3f213d1e98c9302a1ceee847081ecef358c7a421db56236e571a1ad9ff7fa5f5037987c5cb14e517d EBUILD ngtcp2-1.10.0-r1.ebuild 1465 BLAKE2B bf05b9ed99b701418dd5ab393187dd03964e388531a04405be060ca12187ccdb5169d2c8337f63b2175215bd4f7c8b605d9ab7ac9c24c25e32a5de076bded031 SHA512 38e373966a5cb0d2d0dca6a1d94a561f733e22471df688601936253e5440d4dc64d0e3111f76011466752cf6481d7619015e9dfb4a9cfdbfc76788cab3101a87 +EBUILD ngtcp2-1.10.0-r2.ebuild 1504 BLAKE2B 003c0df1661166cc16f2a574820798c62d6f30213dbda34340c541a2bcf67edb674250958b8234b4835ca06702d2804357bfc6e05ac85b87f776dd61a2869c4b SHA512 7c7ff84469145a9ffb33b68f1c3a1d1dfd928e992ab63ca379a7fc131f30fed58d75e5b748da74790b04fc871f8a13dd496dd5a2e5f02d655eee63fda1fbaca0 EBUILD ngtcp2-1.7.0-r1.ebuild 1332 BLAKE2B 023b18e726148cf593bdee277a5094dd4539699f96ab814a373e9188fe730603a49f81211ce98a7ffc75cbd7963616e44020055db18c5f37f2ce4f57622f29c5 SHA512 9d83417bd659bccd8cb9b32dfe9154b8cc545d8e9ec509fae5a2607cec8d29557150dabb9534cf46bea0015b3ade1f49e5604926d9bd1d1533137848a9ce6b77 -EBUILD ngtcp2-9999.ebuild 1465 BLAKE2B bf05b9ed99b701418dd5ab393187dd03964e388531a04405be060ca12187ccdb5169d2c8337f63b2175215bd4f7c8b605d9ab7ac9c24c25e32a5de076bded031 SHA512 38e373966a5cb0d2d0dca6a1d94a561f733e22471df688601936253e5440d4dc64d0e3111f76011466752cf6481d7619015e9dfb4a9cfdbfc76788cab3101a87 +EBUILD ngtcp2-9999.ebuild 1408 BLAKE2B abe1b71efcc67cf088ef4f50faa625485b8445f08866cbd08abddbcfc46c90d47de62ff57162c088c7e665a70b1106751064ca2928b3cca26883ff391bd42859 SHA512 5136bcde44dd0a5ba3037ce7d48ad009a614f78592f01755c09633934c7cbc44db1052d978c93e437bf0279df8c8326c4fb3e76e4ea5d2b69468ce5d6308a017 MISC metadata.xml 445 BLAKE2B d27a34331ff5bd772b6228ff26ca20440a3bf932ccc88720a33409f329d41165d5fad6750221bae1fed3386d6e8244458c1c5073df8b36251156598e599bb15e SHA512 c09f5ac61f3c3b16bda0f12c2f31188aaaba469fbfde31e71d4f9834609b4c8d0cb7152a688934ba0b90c491da4e8b707e6ad5e54d5965b4109cbdc29ee0a4a2 diff --git a/net-libs/ngtcp2/files/ngtcp2-1.10.0-gcc15-uninit.patch b/net-libs/ngtcp2/files/ngtcp2-1.10.0-gcc15-uninit.patch new file mode 100644 index 000000000000..7ce0cf2b6c3c --- /dev/null +++ b/net-libs/ngtcp2/files/ngtcp2-1.10.0-gcc15-uninit.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/947300 +https://github.com/ngtcp2/ngtcp2/pull/1464 +https://github.com/ngtcp2/ngtcp2/commit/60ab2b73aa02e6c99597b975724c6b58008c4869 +https://github.com/ngtcp2/ngtcp2/commit/416698347d60968eba635182dfdedc44d1aa7c3b + +From 60ab2b73aa02e6c99597b975724c6b58008c4869 Mon Sep 17 00:00:00 2001 +From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> +Date: Fri, 3 Jan 2025 10:05:55 +0900 +Subject: [PATCH] tests: Fix uninitialized variable reference + +--- a/tests/ngtcp2_transport_params_test.c ++++ b/tests/ngtcp2_transport_params_test.c +@@ -419,11 +419,16 @@ void test_ngtcp2_transport_params_convert_to_latest(void) { + ngtcp2_cid rcid, scid, dcid; + uint8_t available_versions[sizeof(uint32_t) * 3]; + ngtcp2_sockaddr_in6 *sa_in6; ++ size_t i; + + rcid_init(&rcid); + scid_init(&scid); + dcid_init(&dcid); + ++ for (i = 0; i < sizeof(available_versions); i += sizeof(uint32_t)) { ++ ngtcp2_put_uint32be(&available_versions[i], (uint32_t)(0xff000000u + i)); ++ } ++ + ngtcp2_transport_params_default_versioned(NGTCP2_TRANSPORT_PARAMS_V1, + &srcbuf); + + +From 416698347d60968eba635182dfdedc44d1aa7c3b Mon Sep 17 00:00:00 2001 +From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> +Date: Fri, 3 Jan 2025 10:13:56 +0900 +Subject: [PATCH] Fix uninitialized connection close frame_type + +--- a/lib/ngtcp2_conn.c ++++ b/lib/ngtcp2_conn.c +@@ -13765,6 +13765,7 @@ ngtcp2_ssize ngtcp2_pkt_write_connection_close( + + fr.type = NGTCP2_FRAME_CONNECTION_CLOSE; + fr.connection_close.error_code = error_code; ++ fr.connection_close.frame_type = 0; + fr.connection_close.reasonlen = reasonlen; + fr.connection_close.reason = (uint8_t *)reason; + + diff --git a/net-libs/ngtcp2/ngtcp2-1.10.0-r2.ebuild b/net-libs/ngtcp2/ngtcp2-1.10.0-r2.ebuild new file mode 100644 index 000000000000..b88f76b1fbc3 --- /dev/null +++ b/net-libs/ngtcp2/ngtcp2-1.10.0-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git" + inherit git-r3 +else + SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DESCRIPTION="Implementation of the IETF QUIC Protocol" +HOMEPAGE="https://github.com/ngtcp2/ngtcp2/" + +LICENSE="MIT" +SLOT="0/0" +IUSE="+gnutls openssl +ssl static-libs test" +# Without static-libs, src_test just won't run any tests and "pass". +REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? ( static-libs )" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + ssl? ( + gnutls? ( >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.1.1:=[${MULTILIB_USEDEP}] ) + ) +" +DEPEND=" + ${RDEPEND} + test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] ) +" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.0-munit-c23.patch + "${FILESDIR}"/${P}-gcc15-uninit.patch +) + +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_STATIC_LIB=$(usex static-libs) + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_OPENSSL=$(usex openssl) + -DENABLE_BORINGSSL=OFF + -DENABLE_PICOTLS=OFF + -DENABLE_WOLFSSL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +} + +multilib_src_test() { + cmake_build check +} diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild index f59f2eb6f3a2..0f374b9abbda 100644 --- a/net-libs/ngtcp2/ngtcp2-9999.ebuild +++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild @@ -35,10 +35,6 @@ DEPEND=" " RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}"/${PN}-1.10.0-munit-c23.patch -) - multilib_src_configure() { local mycmakeargs=( -DENABLE_STATIC_LIB=$(usex static-libs) diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index a53a7dd16646..a5646c4bf1d9 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -14,16 +14,16 @@ DIST node-v22.4.1.tar.xz 46125104 BLAKE2B 7e54a7e01f821d752abbec03212c5be838b2e1 DIST node-v22.7.0.tar.xz 46875872 BLAKE2B f0dcd07d3040ddc0df335b51da82bce8a963ce7848892cda5f593b7fa954a61d0b789f0f70d6b2d4ca80716fcabf70268ac94297c2acd3886ac8172eb5fdf6df SHA512 6d5b751a03b68beec3f046697a806918571b04799a0c5fbb0374026729cc2e88fb1787bef6235c19e0bfda4e7545a618bf375410553c7d9e1eb149c6d43c0c3b DIST node-v22.8.0.tar.xz 46899840 BLAKE2B 04dc53ad42c6a913335ecd9b5bfd5bf2f2a8d3429f28d5eba59ebde62fd76be5dea90f12212bfa9dfaa6698000da6bfec08cb1f0e1e3d3b9e8af70cab005268e SHA512 c2942c65dc9909b1f412489a54d16afae7be46a5c2a8bd292cde75e4c56ec763ccee6572fd72774c3f9d94796cfff6edbd9e93976893873cc182548225ac162a EBUILD nodejs-18.20.4.ebuild 7507 BLAKE2B 6e919faef6743e9ff1f96dd249207c080a0006ed6569956d9c17d25c050c394c9a327a1b0e1b9da58d04131d201fd004987227b56ba12e42c7ff21abcd721856 SHA512 8af99c94533729c968a6a76cadc10c5a7a9bb724b1433857f3c984a7ab1ba5604ea95229326e6eb8c71dc1692ed22f7a31f26364dc9375132a456a3c96c40f0d -EBUILD nodejs-18.20.5.ebuild 7540 BLAKE2B 21cb2048884c548746e740463875aaf9cadf45f0f1973484d694908409cb7408376e0dc3d37595ddaf17d4f437eb4ed32e73240db148cf1a9190cf9125d70e05 SHA512 998b38c94a162867a456bb7a420eecfbf338dd67dd60c3437723c2523802fdc80e9dc33fbc3d7bb7dedf6a4337466362af6c8096f93112890da906ab744bea56 +EBUILD nodejs-18.20.5.ebuild 7538 BLAKE2B 2d7604d461cdbe90e3fa7f7c9f0fe045306d4ebecaf9406805e58503a8485b61f125cfc7c9ef4dd93ea9bae4eb843ba698791fb4ff06e4b00f450412ceecb515 SHA512 cdecdb866252b17e3a26edea5250430f74fe1459e8343fe43ba5d1504e141ad7dc0a4448dbd5604f8fb62740c5debc8cf9d974950cf750f091351cc92f80b36e EBUILD nodejs-20.15.1.ebuild 7686 BLAKE2B 3b1894f6883937b1008aad7e19fea971b0be60ba6f6a754f999d30444538ad35b2b9ad6384d2fda1a75e9a37cabefff07a25f1e66a2e5f8dbfc70df48b094a7a SHA512 564a4259e66762149296570adbf50b6aef998ecdf1e7ef3146c6d993b2cd4807ad3c2aac27f93944f0cb54a882545be7e88fe903c48c81bc4b9eb88ed6c11d70 -EBUILD nodejs-20.17.0.ebuild 7836 BLAKE2B 8973c50ea0734561505a225fce2751fcdc4876931b36ccfa849fcb34eca48c6230191fa9fe6b0aa40adaeccba74b1d81405a3071f1da7122f8c1a0fd982dc0ea SHA512 b1994df6ed1cdc26b58bb37d14796b913934e5634d96a0e9c0a53e5e0ff1cfb131331b6cb7d49c3909209728835e3cf4dd5d8c25894e753b06442eb00d76ba2c +EBUILD nodejs-20.17.0.ebuild 7834 BLAKE2B 1a8c89db2e4061e0a68bf7530b81aaffd793732104325628ba12a85b5bba0c24b99beeefa33d3e44ef3defdd60c82e575552168ec5f87bd3c2510212ed75aeb5 SHA512 03a3779fdab76eb9541185f363a5684cfaed77d57c145daf042fce68819474ce2d1c50c6b6ff61b68f46a55e6d35a454c63503f951fd07fb5187e22d8b388b53 EBUILD nodejs-20.18.0.ebuild 8165 BLAKE2B 2723d1bdeabbc8bc72af7ec9c11cc1583a1a3b012d3f81a23c5470b8598259217ea90a8591712f123ae6258f2c2d4d15547621f1095dba49ef41cb8a19dcf407 SHA512 9b33b0744cbff2fc0ad68dd5d272a0970e3c39ce226ec09b546100bfe7f5e2cf83cfb25650d3572f723997a37ea53c8613b8c0ce777f103eb06ca2f8440c5d86 -EBUILD nodejs-20.18.1.ebuild 8165 BLAKE2B 2723d1bdeabbc8bc72af7ec9c11cc1583a1a3b012d3f81a23c5470b8598259217ea90a8591712f123ae6258f2c2d4d15547621f1095dba49ef41cb8a19dcf407 SHA512 9b33b0744cbff2fc0ad68dd5d272a0970e3c39ce226ec09b546100bfe7f5e2cf83cfb25650d3572f723997a37ea53c8613b8c0ce777f103eb06ca2f8440c5d86 +EBUILD nodejs-20.18.1.ebuild 8163 BLAKE2B b5b0d9bb09f5a6aa1644bbbd02f076157c7d0b8995e68e21be1bf45e3dd27453683b435af963e68cd4646a5bfeb128690f36a9e840e826204b43b182f354f87c SHA512 84e1ec0dcfe019b7aa286d07ffa3362a250a9a449058ffa8206c160082b634f12f832e47e29d0d4c9e24637987821a155d61b28a86b6b6c1a5fa1a0dd9b8ec2a EBUILD nodejs-22.10.0.ebuild 8696 BLAKE2B 972c0b5e456c6a654cd91c5f7fd8db0dba7d10348c16fec01f53c1f0d84a99ab676cf25951e66a3f150ea8cacdf4ee00db503711a7c97de490a314459f3125c4 SHA512 cc150b924fc4f1dac86b6c9ac7f2c2ec2c49248f5cd21d5de37553e96678eb0b318e40d1423becee7fa79679708555e7939cbe980c5595e0cd23a366db94a3b2 -EBUILD nodejs-22.12.0-r1.ebuild 8697 BLAKE2B 28eb6204acb9429b592756db5db76a04ededba8667d61b76ae88221ce621b8d8a3c0e83505ccad5a02aace6c1898897b021c991478c1d54047b506b520fc14a5 SHA512 fe45bead7f4860cbdb91cc8e2378c8e2ce61fc22eb2cf3809fa413a843cf66460c6c47401a47ae63cf35cd1269874c938ce8b9cd5e70f2d0f91f659014e32027 +EBUILD nodejs-22.12.0-r1.ebuild 8695 BLAKE2B 898b5151bfd2fb2546803ffb30b4b51bd7af230a9cf4b682a6d7e68625b6f05faba0fcf533302603b1b671b9b8467e04901e4a8f3594cd42d92607cbf78ef3ab SHA512 4ccd84708c10d7ac37e30462d66f811cdd36af3fd4807cf40fe3d7dbf4add30a49a48e57fc2be5eebe5b010a3bf1e409366a8f7089da792d44c4a24a5d40fb5c EBUILD nodejs-22.12.0.ebuild 8696 BLAKE2B 972c0b5e456c6a654cd91c5f7fd8db0dba7d10348c16fec01f53c1f0d84a99ab676cf25951e66a3f150ea8cacdf4ee00db503711a7c97de490a314459f3125c4 SHA512 cc150b924fc4f1dac86b6c9ac7f2c2ec2c49248f5cd21d5de37553e96678eb0b318e40d1423becee7fa79679708555e7939cbe980c5595e0cd23a366db94a3b2 EBUILD nodejs-22.4.1-r1.ebuild 8589 BLAKE2B 4c06dded4d861d1184a9169f59aef42e4ad9d775dfd15dafae0d8c91205088a3d686f8bdc556046cfc4f0823076a036d9ddff591d1b142b8ec86bea0eabff1fd SHA512 9d3e4cbd98189c7182f774a662774747c0ed9b1e509a3041080f528441bb4e1f0591c549b8a8649a72335add2fced4236dc7aca75982a4a7dd821f180ba68301 -EBUILD nodejs-22.7.0.ebuild 8674 BLAKE2B 715d5cd0f7822c29eefaca580cd5682c3c7a0488780f1778d2f712ef87427d7f0f1068245eaa21bc211dcc3bc9699f3afec6aaa5cf8c161f2b64b0b667e53b22 SHA512 607177121eec1c69bddb49c08ab3899cc279f318381be0f88c90ac9cae2c2318e0e8e266b1e92fe0880a808a6b74f1ac0a51745f899510a6b61ce7200612e1d6 +EBUILD nodejs-22.7.0.ebuild 8672 BLAKE2B 53cb924b169a4621e9b86896d34a20e2436115fb51760c334beb567404763532c941fa7bb6ed467827df8b68680bbe244048ac1fce1bee884a997a19718855a7 SHA512 c9cf331248a244e8c35dd69d82d6ea2c0b928410fc78afba23a28f8cf8d66dbcbee36d2e3d2f5d97bde5af0d486651c0dec93168df970e2037ab2e267038d5db EBUILD nodejs-22.8.0.ebuild 8676 BLAKE2B 78b791e80633c9e55746105ba8187145e0379798b941d9fa6b1e7277058027ec5710c1131eaf104d422eb7fd8329779ae85b3ca45346d68951c97a7293f86710 SHA512 ea2fe21133b2258271a360261a35e1e05d2d65b160da340479739a0fc9f9c6bf019b95018f655c0312dddbd6c768877f7abefeb45022858f8cba7de22d86d413 EBUILD nodejs-99999999.ebuild 8696 BLAKE2B 972c0b5e456c6a654cd91c5f7fd8db0dba7d10348c16fec01f53c1f0d84a99ab676cf25951e66a3f150ea8cacdf4ee00db503711a7c97de490a314459f3125c4 SHA512 cc150b924fc4f1dac86b6c9ac7f2c2ec2c49248f5cd21d5de37553e96678eb0b318e40d1423becee7fa79679708555e7939cbe980c5595e0cd23a366db94a3b2 MISC metadata.xml 983 BLAKE2B 61908ba329bb50767f9a366c75acbedfb59da75a3e9966923af3fd4c686960115bfa53564e9dff19c1e5c3085a79ab5f5ca9a631da77ec4700fa2b663623d96e SHA512 471ee30d82ac553f975fe1e1e68ffcc79e8c709274ed6794a1c9fd2acee301734d36b6e607cc7b2cd386ed1e4621eb4a725efe440cb76d4dd6a2af4b76cdbd45 diff --git a/net-libs/nodejs/nodejs-18.20.5.ebuild b/net-libs/nodejs/nodejs-18.20.5.ebuild index f82847e3508a..cf73513ca02b 100644 --- a/net-libs/nodejs/nodejs-18.20.5.ebuild +++ b/net-libs/nodejs/nodejs-18.20.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi diff --git a/net-libs/nodejs/nodejs-20.17.0.ebuild b/net-libs/nodejs/nodejs-20.17.0.ebuild index 190648817a15..abfda469ca0a 100644 --- a/net-libs/nodejs/nodejs-20.17.0.ebuild +++ b/net-libs/nodejs/nodejs-20.17.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi diff --git a/net-libs/nodejs/nodejs-20.18.1.ebuild b/net-libs/nodejs/nodejs-20.18.1.ebuild index a06c32bdae99..72a3cf5fdc7d 100644 --- a/net-libs/nodejs/nodejs-20.18.1.ebuild +++ b/net-libs/nodejs/nodejs-20.18.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi diff --git a/net-libs/nodejs/nodejs-22.12.0-r1.ebuild b/net-libs/nodejs/nodejs-22.12.0-r1.ebuild index 01bca3eaf966..31ac08005b1e 100644 --- a/net-libs/nodejs/nodejs-22.12.0-r1.ebuild +++ b/net-libs/nodejs/nodejs-22.12.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi diff --git a/net-libs/nodejs/nodejs-22.7.0.ebuild b/net-libs/nodejs/nodejs-22.7.0.ebuild index 51e02b2bcfe1..e1a3079e81af 100644 --- a/net-libs/nodejs/nodejs-22.7.0.ebuild +++ b/net-libs/nodejs/nodejs-22.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest index deb60b671455..bafe01cdfe60 100644 --- a/net-libs/signon-oauth2/Manifest +++ b/net-libs/signon-oauth2/Manifest @@ -12,6 +12,5 @@ AUX signon-oauth2-0.24-dont-install-tests.patch 352 BLAKE2B 6dfa625f68f017894741 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_p20210102.tar.bz2 34873 BLAKE2B 4e53f6d19cf0e9c8513afef44ab640dcd3ed811a9830acff65abd997691926388015b35e6f010c6a0bc25cc257e22a4b8e359ec690bbc35182cd1cf87c716b85 SHA512 5b371e6230c9ed4352ff151626dfaf40d2ecb41e389ee3a753fc41be3937191d416b864d555fd85cecbfe1615233a063db881adae3ea29aefb652a36d46633b5 -EBUILD signon-oauth2-0.25_p20210102-r1.ebuild 2398 BLAKE2B 7eac97ef3af6e3701f35d85fea9ea3333553ec7f6ce9911f3b3d2928a64510b3d2bfdad9907c38d6599d02a95cb30d65946c9aa889fcbf40f905da4474d5f0d4 SHA512 ebf9953916badebd4cd201c57665593e8767e7c5f427aa0586cf8066a31215e3e2b543656552eb0cb9e1757c34d0bc87a32aad2aa609a33c0f5212ad2330a87b EBUILD signon-oauth2-0.25_p20210102-r2.ebuild 2121 BLAKE2B 0dda54a88f66624f9214aaa32a5e7601149acc9055f8476e2f04d7eba5fd51bcc4aee4cc81d465b40d222570afd0d620549fb3fc6cd45e44d99bda193758f151 SHA512 5ef8744ed9fc417fa896d9544e6af7a44144cdfe7b45aad56c65b5cf44fd2bc263dbf9f275ff36f042f69bff14044e709cfd092d616b5b2e9f845d2606dd9c3b MISC metadata.xml 348 BLAKE2B 223f85a8556cf010e028dcfe0fffc9d524d38f591aa07af45cb992f9095651113deeb18bb5a2a90b363b4dc62307a19e410c9ccc51b6d87de1b98a1e457ab8b7 SHA512 00f32e7e48f5bd2cad3286636d35f6d328a100eb555fed58b2ce49447a14a0fcc20a087f3fb0227e56669bd5873551532b4e3d36772fd5fae7f4d11dc0c84f68 diff --git a/net-libs/signon-oauth2/signon-oauth2-0.25_p20210102-r1.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.25_p20210102-r1.ebuild deleted file mode 100644 index 064c9dfa4fd9..000000000000 --- a/net-libs/signon-oauth2/signon-oauth2-0.25_p20210102-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# 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 ef781f1a810d..10cd215ba5a1 100644 --- a/net-libs/signon-ui/Manifest +++ b/net-libs/signon-ui/Manifest @@ -1,8 +1,6 @@ AUX signon-ui-0.15_p20171022-disable-tests.patch 518 BLAKE2B 6e15293f2f402db0193a5c25be03a62c93999f05ed889973d3058d4de143193f3e0b3d51f869c4b58fd56c963454fef537bf4bd65a22470d32f08020e2038264 SHA512 18ec01616e468a11c30b2a98689b2a0eddaee3ffe7073e7c1a035f210b70f5ccc0f5b5feaa95ffc608875bf3a68e17c60760f4008d179c5e722afc4068b7e256 AUX signon-ui-0.15_p20171022-drop-fno-rtti.patch 758 BLAKE2B 6487c7b5e6365deebc301fba24422775f7c45805af734cc0f234cac69734d93cc0a80c9ff2c9456560fe797f1185b91c1e973288a208148d20cffc396d78b632 SHA512 d3d19046e2ccd55f6921a8ae75f970b36d552df3dd789857f9657e5ddd0501c4547960fbbce3ca7849ee0081f351abbf04faf859827db2f7e2dad0d3a4957904 -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_p20231016.tar.bz2 55078 BLAKE2B eff35b2b311c4b923148656ad7512418ee6e19607babd02f2bc8bff9d6f2f5cfdc37c7030fb842b65b25c310f6e44f76a73b9d0a4569af52f7661b0eb09da2f2 SHA512 c26be8921c5d2a559bd62793f3eca19184c236c2e2649728631d60d2781f4b4457f63bbd35238cb274ff3a7747220688688f0880df8db0e78ccaf6f126d6e86e -EBUILD signon-ui-0.15_p20231016-r1.ebuild 1792 BLAKE2B 135a9667f7e19cb937acf3100ec4a404ea16ca86c155cc0b4033581e9aee3cdb2921cc38c435135d1f25365fbe0f2e6fe67058640e165a06679dfaf777c32ed8 SHA512 8f7000eb37fa403337dcefa9e53d4cfd4a6fb3f3fd2ae6f0f97094ddcb6808124f8650e2fc061abce260f7841fe23de9bed2b088b6561cfed119d2c777ecdf1d EBUILD signon-ui-0.15_p20231016-r2.ebuild 1276 BLAKE2B 64fece620d4d74d78ddc57def87d8506657b102b46acfc3941956a846e778e49e224b2d2ecd9bc850471add0100de97bf02f3e0af04f3ac0eaf16fd3e6c68c79 SHA512 13c0adfcc3e1139db78d4481b2bea5aa25873b9fe8ce4120490fc3416ebfb41d41d9d74a8ca8f7cc188eef7efb26e8fd9dad7a5872da816703e447e50a78978d MISC metadata.xml 337 BLAKE2B 6329a58a1fb57e124a64deb6b3829fa06632cc323991540a322a4aecf4a07f129905d7ee393e2e105afb1a4fa8eadcb08d969b6ed497cb29ec1737437f0d6bca SHA512 3a85a0fce6d18ec8c2e029579ac851229dc56ec4fe3f6d9a19e11b875afc6b9c4da555884fcd49fc68b5e510a2306ae53d8e5f5c4600a0f987ee7a14735322f8 diff --git a/net-libs/signon-ui/files/signon-ui-0.15_p20171022-fix-username-field-reading.patch b/net-libs/signon-ui/files/signon-ui-0.15_p20171022-fix-username-field-reading.patch deleted file mode 100644 index accc8d92d91e..000000000000 --- a/net-libs/signon-ui/files/signon-ui-0.15_p20171022-fix-username-field-reading.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 90890e7d27c544e3557bed2f6624614141db0fc4 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Sat, 29 Sep 2018 15:34:43 +0200 -Subject: [PATCH] Reintroduce the username field reading with webkit-options.d - -Use WebChannel to spy on the input fields. -Use the old UserAgent to make sure the selectors match. ---- - src/browser-request.cpp | 11 +++++++++++ - src/qml/WebView.qml | 36 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 47 insertions(+) - -diff --git a/src/browser-request.cpp b/src/browser-request.cpp -index 1895d59..e58f302 100644 ---- a/src/browser-request.cpp -+++ b/src/browser-request.cpp -@@ -31,6 +31,7 @@ - #include <QStandardPaths> - #include <QTimer> - #include <SignOn/uisessiondata_priv.h> -+#include <QSettings> - - using namespace SignOnUi; - using namespace SignOnUi::QQuick; -@@ -43,8 +44,10 @@ class BrowserRequestPrivate: public QObject - Q_DECLARE_PUBLIC(BrowserRequest) - Q_PROPERTY(QUrl pageComponentUrl READ pageComponentUrl CONSTANT) - Q_PROPERTY(QUrl currentUrl READ currentUrl WRITE setCurrentUrl) -+ Q_PROPERTY(QString username MEMBER m_username) - Q_PROPERTY(QUrl startUrl READ startUrl CONSTANT) - Q_PROPERTY(QUrl finalUrl READ finalUrl CONSTANT) -+ Q_PROPERTY(QString usernameSelector READ usernameSelector CONSTANT) - - public: - BrowserRequestPrivate(BrowserRequest *request); -@@ -58,6 +61,7 @@ public: - QUrl startUrl() const { return m_startUrl; } - QUrl finalUrl() const { return m_finalUrl; } - QUrl responseUrl() const { return m_responseUrl; } -+ QString usernameSelector() const { return m_settings->value("UsernameField").toString(); } - - public Q_SLOTS: - void cancel(); -@@ -77,6 +81,8 @@ private: - QUrl m_startUrl; - QUrl m_finalUrl; - QUrl m_responseUrl; -+ QString m_username; -+ QSettings *m_settings; - QTimer m_failTimer; - mutable BrowserRequest *q_ptr; - }; -@@ -116,6 +122,9 @@ void BrowserRequestPrivate::start() - - m_finalUrl = params.value(SSOUI_KEY_FINALURL).toString(); - m_startUrl = params.value(SSOUI_KEY_OPENURL).toString(); -+ -+ m_settings = new QSettings("signon-ui/webkit-options.d/" + m_startUrl.host(), QString(), this); -+ - buildDialog(params); - - QObject::connect(m_dialog, SIGNAL(finished(int)), -@@ -231,6 +240,8 @@ void BrowserRequestPrivate::onFinished() - QVariantMap reply; - QUrl url = m_responseUrl.isEmpty() ? m_currentUrl : m_responseUrl; - reply[SSOUI_KEY_URLRESPONSE] = url.toString(); -+ if (!m_username.isEmpty()) -+ reply[SSOUI_KEY_USERNAME] = m_username; - - m_dialog->close(); - -diff --git a/src/qml/WebView.qml b/src/qml/WebView.qml -index 33462b8..3af0239 100644 ---- a/src/qml/WebView.qml -+++ b/src/qml/WebView.qml -@@ -1,4 +1,5 @@ - import QtQuick 2.0 -+import QtWebChannel 1.0 - import QtWebEngine 1.1 - - WebEngineView { -@@ -25,8 +26,43 @@ WebEngineView { - profile: WebEngineProfile { - cachePath: rootDir - persistentStoragePath: rootDir -+ // For compatibility with the webkit-options.d values -+ httpUserAgent: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) Safari/537.21" - } - -+ QtObject { -+ id: commProxy -+ WebChannel.id: "comm" -+ property string username: "" -+ property string selector: signonRequest.usernameSelector -+ onUsernameChanged: signonRequest.username = username -+ } -+ -+ WebChannel { -+ id: chan -+ registeredObjects: [commProxy] -+ } -+ webChannel: chan -+ -+ WebEngineScript { -+ id: qwebchannel -+ injectionPoint: WebEngineScript.DocumentCreation -+ sourceUrl: "qrc:/qtwebchannel/qwebchannel.js" -+ worldId: WebEngineScript.MainWorld -+ } -+ -+ WebEngineScript { -+ id: commScript -+ injectionPoint: WebEngineScript.DocumentReady -+ sourceCode: "new QWebChannel(window.qt.webChannelTransport, function(channel) {" + -+ " var elem = document.querySelector(channel.objects.comm.selector);" + -+ " elem.addEventListener('keyup', function() { channel.objects.comm.username = elem.value; });" + -+ "});" -+ worldId: WebEngineScript.MainWorld -+ } -+ -+ userScripts: [qwebchannel, commScript] -+ - ProgressBar { - anchors.top: parent.top - anchors.left: parent.left --- -2.18.0 diff --git a/net-libs/signon-ui/signon-ui-0.15_p20231016-r1.ebuild b/net-libs/signon-ui/signon-ui-0.15_p20231016-r1.ebuild deleted file mode 100644 index 6f5529cd9816..000000000000 --- a/net-libs/signon-ui/signon-ui-0.15_p20231016-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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" -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[qml] - >=net-libs/accounts-qt-1.17[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 7b916f6ababc..e4221a623575 100644 --- a/net-libs/signond/Manifest +++ b/net-libs/signond/Manifest @@ -12,5 +12,5 @@ AUX signond-8.60-buildsystem.patch 1004 BLAKE2B 6a9ae7cc9c2750ffb5eb6495dc47c211 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 -EBUILD signond-8.61-r101.ebuild 4172 BLAKE2B 309578bb52d8c53d0601b286bb84656223c4cdd6f2f3e0968b799198e5d628d8bdea910d25d7ef364ecdd946746702cde559a55bba0963ef998790e8636abf2c SHA512 1fb781cf81f5f30b7d3a4afb6fcfd7d3e1a845d4d3cc532b218e56263c7710ce2ab88b7b470b479aaa8d7e43ce9aebfdb2a38f6932a1245e5a31325382d96592 +EBUILD signond-8.61-r102.ebuild 3040 BLAKE2B 67837b5f7f4db2ebf98f42b13c65f0d46dfca987d6a0ef805180b2b39b4c029f6aa30c9144845688fbb4195238b525ca600c0a88db8275735f22869f0b875076 SHA512 e162ee33ba12b344baff9480f4ca1dc1a812d7cad13333910fd5f8ce0130f1ad6c0659e36ab3fbd96c99472186f26d90cc4becd5ed0c2d0c9e072be8d5c6a2a9 MISC metadata.xml 402 BLAKE2B cbca0310ab027fc70e2c6f3c4fc84a4de8847d4899ed19e848796279c0b03b9ffcc59269487def4b3e6298adfb095a9cf3417a1c7bf083efa30a8894ecfa858f SHA512 1831ad67394a82c3839fb80196982f3252e2bc9c7cf116c782d731a7d315e97cc2e6a299e951f73f92d2a4598a33c7251d8a68c47102c6186344b61486a72515 diff --git a/net-libs/signond/signond-8.61-r101.ebuild b/net-libs/signond/signond-8.61-r102.ebuild index fc2ba59a52dd..1c7706ad5d07 100644 --- a/net-libs/signond/signond-8.61-r101.ebuild +++ b/net-libs/signond/signond-8.61-r102.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit qmake-utils multibuild +inherit qmake-utils if [[ ${PV} = *9999* ]] ; then EGIT_REPO_URI="https://gitlab.com/nicolasfella/signond.git/" @@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]] ; then 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" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86" fi DESCRIPTION="Signon daemon for libaccounts-glib" @@ -22,10 +22,7 @@ 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 test" +IUSE="doc test" # tests are brittle; they all pass when stars align, bug 727666 RESTRICT="test !test? ( test )" @@ -33,24 +30,12 @@ RESTRICT="test !test? ( test )" RDEPEND=" dev-qt/qtbase:6[dbus,gui,network,sql] net-libs/libproxy - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - ) -" -DEPEND="${RDEPEND} - test? ( qt5? ( dev-qt/qttest:5 ) ) " +DEPEND="${RDEPEND}" BDEPEND=" doc? ( app-text/doxygen[dot] - || ( - dev-qt/qttools:6[assistant] - dev-qt/qthelp:5 - ) + dev-qt/qttools:6[assistant] ) " @@ -70,23 +55,10 @@ PATCHES=( "${FILESDIR}/${PN}-8.61-consistent-paths.patch" # bug 701142 ) -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt5) 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}/&|" \ + sed -e "/QHG_LOCATION/s|qhelpgenerator|$(qt6_get_libdir)/qt6/libexec/&|" \ -i {lib/plugins/,lib/SignOn/,}doc/doxy.conf || die # install docs to correct location @@ -102,43 +74,18 @@ src_prepare() { 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 + local myqmakeargs=( + PREFIX="${EPREFIX}"/usr + LIBDIR=$(get_libdir) + ) + eqmake6 "${myqmakeargs[@]}" } src_install() { - my_src_install() { - emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install - } - - multibuild_foreach_variant my_src_install + emake INSTALL_ROOT="${D}" install } pkg_postinst() { |