commit: e3cc0be1ad912ef46d4d9770c76518c4db39418e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Dec 29 21:47:13 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Dec 30 14:20:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3cc0be1
net-libs/signond: drop 8.61-r100 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-libs/signond/files/0007-Add-Qt6-CI.patch | 91 ---------------- net-libs/signond/signond-8.61-r100.ebuild | 153 --------------------------- 2 files changed, 244 deletions(-) diff --git a/net-libs/signond/files/0007-Add-Qt6-CI.patch b/net-libs/signond/files/0007-Add-Qt6-CI.patch deleted file mode 100644 index 37891277d0de..000000000000 --- a/net-libs/signond/files/0007-Add-Qt6-CI.patch +++ /dev/null @@ -1,91 +0,0 @@ -https://gitlab.com/accounts-sso/signond/-/merge_requests/36 - -From 10f791a62e229bcb5e3975c752bcd5519758240f Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <[email protected]> -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/signond-8.61-r100.ebuild b/net-libs/signond/signond-8.61-r100.ebuild deleted file mode 100644 index 37f08f7263f0..000000000000 --- a/net-libs/signond/signond-8.61-r100.ebuild +++ /dev/null @@ -1,153 +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/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 -} - -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 -}
