commit: 8d0c32bb4c7c67540956c7a2ce4d9751105a858e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 2 21:39:39 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 3 21:10:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d0c32bb
app-crypt/pinentry: drop 1.3.0-r3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-crypt/pinentry/Manifest | 2 - .../pinentry/files/pinentry-1.3.0-ifdef-qt.patch | 125 ------------------ app-crypt/pinentry/pinentry-1.3.0-r3.ebuild | 144 --------------------- 3 files changed, 271 deletions(-) diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest index 48c3c169c493..766326e43ae8 100644 --- a/app-crypt/pinentry/Manifest +++ b/app-crypt/pinentry/Manifest @@ -1,4 +1,2 @@ -DIST pinentry-1.3.0.tar.bz2 610363 BLAKE2B a55b80754ef37d18ebdf0bd50e134a7b1bf6362b859b7069a9e4ebd86cd7e733d51f3c21a16779a18aa0d0dfab1f7a3df070d4f7e39e0840339078c4e9cb58bc SHA512 1bbac81c6811cffc8969a46494e6daa6b8447802f47ff6fa3e4dc9ac244cf6e5f629834c9b6a60770d06bff6c9932ad4059f10d2fdf93fd9e26fd5d21c0e3732 -DIST pinentry-1.3.0.tar.bz2.sig 119 BLAKE2B 0f11126761b2a06f8b08cf971f5d610cacbde1a5ee419523a6e704ac21fef4cce26495a160a51bee5ed5f68eca7d6864dfa03efa48030ba2cf783e767b925e1c SHA512 77a61877adf241d67caeea3af4c12a2c7c13ddc423ac001fab79bcec463a5853d8806052d61504fae0c67e0a9d1edf6a12d24b560ff7b4083eea5e86f9b54a90 DIST pinentry-1.3.1.tar.bz2 611233 BLAKE2B 47a510b3746fc8cdd83b56302132f4f4d9c61324fc857ce0867387f70f79490dad375bca4dc72e5d1cdca707bf89a16e1c9a20bf1aa0e857d69e59dc59403afd SHA512 3b72034dc1792b1475acb6d605ff7c1bd7647a0f02d1b6bdcd475acdef24bc802f49e275055436c3271261c4b7a64168477a698aab812a145962146b2f67a0e2 DIST pinentry-1.3.1.tar.bz2.sig 119 BLAKE2B ca562d2903c88c4297e641ddc39f6cd99db3e3fd40cf5d69e7b4335f006c7717c874fa4b5e47920af3ec97385a96c0c96aafb849cf399d11a7f9f1a6b693f479 SHA512 22bd94f74486300eb84c1c9c371a43b05fb6179118518004fba0d42b6d3e6731f94d79b37c2a3a6b0c5886578c4575f75d2460accd36cd4874342e7239521be9 diff --git a/app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch b/app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch deleted file mode 100644 index 4fc724287515..000000000000 --- a/app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch +++ /dev/null @@ -1,125 +0,0 @@ -https://dev.gnupg.org/D596 - -From 762346c5d1877cde6b37b191cd3c2469e1c7ddbb Mon Sep 17 00:00:00 2001 -From: Heiko Becker <[email protected]> -Date: Mon, 18 Mar 2024 20:38:09 +0100 -Subject: [PATCH] qt5: Add a '5' to adjust defines - -They were changed from PINENTRY_QT_FOO to PINENTRY_QT5_FOO in -1e79123c389584b8240387914b193be41b823e92. ---- a/qt5/capslock.cpp -+++ b/qt5/capslock.cpp -@@ -32,7 +32,7 @@ - CapsLockWatcher::Private::Private(CapsLockWatcher *q) - : q{q} - { --#ifdef PINENTRY_QT_WAYLAND -+#ifdef PINENTRY_QT5_WAYLAND - if (qApp->platformName() == QLatin1String("wayland")) { - watchWayland(); - } -@@ -44,7 +44,7 @@ CapsLockWatcher::CapsLockWatcher(QObject *parent) - , d{new Private{this}} - { - if (qApp->platformName() == QLatin1String("wayland")) { --#ifndef PINENTRY_QT_WAYLAND -+#ifndef PINENTRY_QT5_WAYLAND - qWarning() << "CapsLockWatcher was compiled without support for Wayland"; - #endif - } ---- a/qt5/capslock_p.h -+++ b/qt5/capslock_p.h -@@ -23,7 +23,7 @@ - - #include "capslock.h" - --#ifdef PINENTRY_QT_WAYLAND -+#ifdef PINENTRY_QT5_WAYLAND - namespace KWayland - { - namespace Client -@@ -38,12 +38,12 @@ class CapsLockWatcher::Private - { - public: - explicit Private(CapsLockWatcher *); --#ifdef PINENTRY_QT_WAYLAND -+#ifdef PINENTRY_QT5_WAYLAND - void watchWayland(); - #endif - - private: --#ifdef PINENTRY_QT_WAYLAND -+#ifdef PINENTRY_QT5_WAYLAND - void registry_seatAnnounced(quint32, quint32); - void seat_hasKeyboardChanged(bool); - void keyboard_modifiersChanged(quint32); -@@ -52,7 +52,7 @@ private: - private: - CapsLockWatcher *const q; - --#ifdef PINENTRY_QT_WAYLAND -+#ifdef PINENTRY_QT5_WAYLAND - KWayland::Client::Registry *registry = nullptr; - KWayland::Client::Seat *seat = nullptr; - #endif ---- a/qt5/capslock_unix.cpp -+++ b/qt5/capslock_unix.cpp -@@ -25,7 +25,7 @@ - #include "capslock.h" - #include "capslock_p.h" - --#ifdef PINENTRY_QT_WAYLAND -+#ifdef PINENTRY_QT5_WAYLAND - # include <KWayland/Client/connection_thread.h> - # include <KWayland/Client/keyboard.h> - # include <KWayland/Client/registry.h> -@@ -34,7 +34,7 @@ - - #include <QGuiApplication> - --#ifdef PINENTRY_QT_X11 -+#ifdef PINENTRY_QT5_X11 - # include <QX11Info> - # include <X11/XKBlib.h> - # undef Status -@@ -42,25 +42,25 @@ - - #include <QDebug> - --#ifdef PINENTRY_QT_WAYLAND -+#ifdef PINENTRY_QT5_WAYLAND - using namespace KWayland::Client; - #endif - --#ifdef PINENTRY_QT_WAYLAND -+#ifdef PINENTRY_QT5_WAYLAND - static bool watchingWayland = false; - #endif - - LockState capsLockState() - { - static bool reportUnsupportedPlatform = true; --#ifdef PINENTRY_QT_X11 -+#ifdef PINENTRY_QT5_X11 - if (qApp->platformName() == QLatin1String("xcb")) { - unsigned int state; - XkbGetIndicatorState(QX11Info::display(), XkbUseCoreKbd, &state); - return (state & 0x01) == 1 ? LockState::On : LockState::Off; - } - #endif --#ifdef PINENTRY_QT_WAYLAND -+#ifdef PINENTRY_QT5_WAYLAND - if (qApp->platformName() == QLatin1String("wayland")) { - if (!watchingWayland && reportUnsupportedPlatform) { - qDebug() << "Use CapsLockWatcher for checking for Caps Lock on Wayland"; -@@ -74,7 +74,7 @@ LockState capsLockState() - return LockState::Unknown; - } - --#ifdef PINENTRY_QT_WAYLAND -+#ifdef PINENTRY_QT5_WAYLAND - void CapsLockWatcher::Private::watchWayland() - { - watchingWayland = true; --- -2.44.0 diff --git a/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild deleted file mode 100644 index 7801015f9ed2..000000000000 --- a/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc -inherit autotools qmake-utils verify-sig - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/related_software/pinentry/"; -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" -SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="caps efl emacs gtk keyring ncurses qt5 qt6 wayland X" - -DEPEND=" - >=dev-libs/libassuan-2.1:= - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - efl? ( dev-libs/efl[X] ) - keyring? ( app-crypt/libsecret ) - ncurses? ( sys-libs/ncurses:= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - wayland? ( kde-plasma/kwayland:5 ) - X? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - ) - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets] - wayland? ( - kde-frameworks/kguiaddons:6 - kde-frameworks/kwindowsystem:6 - ) - ) -" -RDEPEND=" - ${DEPEND} - gtk? ( app-crypt/gcr:4[gtk] ) -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-gnupg ) -" -PDEPEND="emacs? ( app-emacs/pinentry )" -IDEPEND=">=app-eselect/eselect-pinentry-0.7.4" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-AR.patch" - "${FILESDIR}/${PN}-1.3.0-automagic.patch" # bug #819939, bug #837719 - "${FILESDIR}/${PN}-1.3.0-ifdef-qt.patch" -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - unset FLTK_CONFIG - - local myeconfargs=( - $(use_enable efl pinentry-efl) - $(use_enable emacs pinentry-emacs) - $(use_enable keyring libsecret) - $(use_enable gtk pinentry-gnome3) - $(use_enable ncurses fallback-curses) - $(use_enable ncurses pinentry-curses) - $(use_enable qt5 pinentry-qt5) - $(use_enable qt6 pinentry-qt) - # TODO: could split this up into qt5/qt6? - $(use_enable X qtx11extras) - $(use_with X x) - - --enable-pinentry-tty - --disable-pinentry-fltk - --disable-pinentry-gtk2 - - ac_cv_path_GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config" - - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') - ) - - if use qt5 ; then - export PATH="$(qt5_get_bindir):${PATH}" - export QTLIB="$(qt5_get_libdir):${QTLIB}" - export MOC5="$(qt5_get_bindir)"/moc - - myeconfargs+=( - $(use_enable wayland kf5-wayland) - ) - else - myeconfargs+=( - --disable-kf5-wayland - ) - fi - - if use qt6 ; then - export PATH="$(qt6_get_bindir):${PATH}" - export QTLIB="$(qt6_get_libdir):${QTLIB}" - export MOC="$(qt6_get_libdir)/qt6/libexec/moc" - - myeconfargs+=( - $(use_enable wayland kf6-wayland) - ) - else - myeconfargs+=( - --disable-kf6-wayland - ) - fi - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - rm "${ED}"/usr/bin/pinentry || die - - # The preferred Qt implementation upstream gets installed as just 'qt'. - # Make a symlink for eselect-pinentry and friends. - if use qt6 ; then - dosym pinentry-qt /usr/bin/pinentry-qt6 - fi -} - -pkg_postinst() { - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -}
