From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF47515808B for ; Fri, 4 Oct 2024 21:04:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EAD3E29F7; Fri, 4 Oct 2024 21:04:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F554E29F7 for ; Fri, 4 Oct 2024 21:04:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41DE234309B for ; Fri, 4 Oct 2024 21:04:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9FAA2801 for ; Fri, 4 Oct 2024 21:04:07 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1728075797.b0711247d6637ff1bb483708a0849a4bd21a9532.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/signond/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/signond/signond-8.61-r101.ebuild X-VCS-Directories: net-libs/signond/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b0711247d6637ff1bb483708a0849a4bd21a9532 X-VCS-Branch: master Date: Fri, 4 Oct 2024 21:04:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b28c1139-5141-4a15-9648-1144ec0f8475 X-Archives-Hash: f95b661a57ac50e67b65f31f8458e6d1 commit: b0711247d6637ff1bb483708a0849a4bd21a9532 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Oct 4 19:11:02 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Oct 4 21:03:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0711247 net-libs/signond: Drop IUSE qt6, don't enable qt5 by default Signed-off-by: Andreas Sturmlechner gentoo.org> net-libs/signond/signond-8.61-r101.ebuild | 150 ++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/net-libs/signond/signond-8.61-r101.ebuild b/net-libs/signond/signond-8.61-r101.ebuild new file mode 100644 index 000000000000..1f6aa38aae06 --- /dev/null +++ b/net-libs/signond/signond-8.61-r101.ebuild @@ -0,0 +1,150 @@ +# 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 test" + +# tests are brittle; they all pass when stars align, bug 727666 +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 ) ) +" +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}"/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) 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 +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] && \ + ! has_version "kde-apps/signon-kwallet-extension:*"; then + ewarn "Without kde-apps/signon-kwallet-extension installed, passwords" + ewarn "will be saved in plaintext!" + fi +}