commit: 08805e6d237058912c319c69af2beffc950a888a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jun 28 20:39:06 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jun 29 16:33:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08805e6d
net-libs/signond: drop 8.61 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-libs/signond/Manifest | 1 - .../files/signond-8.60-consistent-paths.patch | 266 --------------------- net-libs/signond/signond-8.61.ebuild | 80 ------- 3 files changed, 347 deletions(-) diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest index f62f3f43ee5a..6c69363a696f 100644 --- a/net-libs/signond/Manifest +++ b/net-libs/signond/Manifest @@ -1,2 +1 @@ DIST signond-8.61.tar.bz2 203066 BLAKE2B 2f78e08143d346777ab3517ef6b76b54ab1b17efa6d15b2c5a16487c2e11f38c88cb2820bff8dd04deb334d0c178c16bd061c0eba694c5edfb0e31411581648a SHA512 95e83bc672792ec10493f1f456788af7e8051ce0bed6b047b6b6f5fa9ac019dd3392063152930be49cf68d590567fd7467c544d642cc58624b1aabdc0b405258 -DIST signond-8.61.tar.gz 282965 BLAKE2B 8ab8f4ac3f8416ef9c1b8d8c73057ffcf0024a7e3cf6c2fa97a3119826f6c655b215e2530137c199e60e9e9518b0858fa1a23a3f107c71751f33d2a34898a610 SHA512 1652ee8e97d6aee036075f5416909649c5848e33c3c71f367176f3e5d6f9c360fd7a46c65ba877d58b3ae8fb8df0712938c5e073409ba945d66d8afeacfd6f72 diff --git a/net-libs/signond/files/signond-8.60-consistent-paths.patch b/net-libs/signond/files/signond-8.60-consistent-paths.patch deleted file mode 100644 index 6743a92678af..000000000000 --- a/net-libs/signond/files/signond-8.60-consistent-paths.patch +++ /dev/null @@ -1,266 +0,0 @@ -From 62ce2305081075a53836999441214f03d37b50b5 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -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 <[email protected]> ---- - common-installs-config.pri | 2 +- - common-pkgconfig.pri | 2 +- - common-project-config.pri | 30 +++++++++---------- - lib/SignOn/SignOnQt5Config.cmake.in | 6 ++-- - lib/SignOn/libsignon-qt.pc.in | 2 +- - lib/SignOn/libsignon-qt.pri | 2 +- - lib/SignOn/libsignon-qt5.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}) -\ No newline at end of file -+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 -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 -lQt5Core -+Libs.private: -L${libdir} -lQt5Core - 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 -lQt5Core -+Libs.private: -L${libdir} -lQt5Core - 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/signond-8.61.ebuild b/net-libs/signond/signond-8.61.ebuild deleted file mode 100644 index 6f21b1bec048..000000000000 --- a/net-libs/signond/signond-8.61.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qmake-utils - -DESCRIPTION="Signon daemon for libaccounts-glib" -HOMEPAGE="https://gitlab.com/accounts-sso"; -SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-VERSION_${PV}" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="doc test" - -# tests are brittle; they all pass when stars align, bug 727666 -RESTRICT="test !test? ( test )" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - net-libs/libproxy -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" -BDEPEND=" - doc? ( - app-text/doxygen[dot] - dev-qt/qthelp:5 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-8.60-buildsystem.patch" - "${FILESDIR}/${PN}-8.60-consistent-paths.patch" # bug 701142 - "${FILESDIR}/${PN}-8.60-unused-dep.patch" # bug 727346 -) - -src_prepare() { - default - - sed -e "/QHG_LOCATION/s|qhelpgenerator|$(qt5_get_bindir)/&|" \ - -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" -} - -src_configure() { - eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) -} - -src_install() { - emake INSTALL_ROOT="${D}" 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 -}
