From 4851b8682230a0d40995a6f9ad4d3ae2bb03a12e Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 7 Jun 2020 23:29:20 +0200 Subject: app-crypt/pinentry: Drop 1.0.0-r2, 1.0.0-r3, 1.1.0-r1 and 1.1.0-r2 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner --- app-crypt/pinentry/Manifest | 1 - ...isable-tooltips-in-keyboard-grabbing-mode.patch | 47 ----- .../pinentry/files/pinentry-1.0.0-build.patch | 218 --------------------- ...nentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch | 47 ----- app-crypt/pinentry/pinentry-1.0.0-r2.ebuild | 102 ---------- app-crypt/pinentry/pinentry-1.0.0-r3.ebuild | 103 ---------- app-crypt/pinentry/pinentry-1.1.0-r1.ebuild | 100 ---------- app-crypt/pinentry/pinentry-1.1.0-r2.ebuild | 102 ---------- 8 files changed, 720 deletions(-) delete mode 100644 app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch delete mode 100644 app-crypt/pinentry/files/pinentry-1.0.0-build.patch delete mode 100644 app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch delete mode 100644 app-crypt/pinentry/pinentry-1.0.0-r2.ebuild delete mode 100644 app-crypt/pinentry/pinentry-1.0.0-r3.ebuild delete mode 100644 app-crypt/pinentry/pinentry-1.1.0-r1.ebuild delete mode 100644 app-crypt/pinentry/pinentry-1.1.0-r2.ebuild diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest index e8e43f0ce1b3..96c7370bde23 100644 --- a/app-crypt/pinentry/Manifest +++ b/app-crypt/pinentry/Manifest @@ -1,2 +1 @@ -DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch b/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch deleted file mode 100644 index 7724d1beae8c..000000000000 --- a/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1590b664d88be8386a4664c2994b685187d1eb25 Mon Sep 17 00:00:00 2001 -From: Damien Goutte-Gattat -Date: Thu, 3 Aug 2017 22:56:49 +0200 -Subject: [PATCH 1/6] gtk: Disable tooltips in keyboard-grabbing mode. - -* gtk+-2:/pinentry-gtk-2.c (show_hide_button): Do not show the -tooltip if we attempt to grab the keyboard. -(create_window): Likewise. --- - -For unclear reasons, those tooltips may interfere with grabbing -under some tiling window managers. - -GnuPG-bug-id: 3297 -Signed-off-by: Damien Goutte-Gattat ---- - gtk+-2/pinentry-gtk-2.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c -index d467ec5..f17a702 100644 ---- a/gtk+-2/pinentry-gtk-2.c -+++ b/gtk+-2/pinentry-gtk-2.c -@@ -516,7 +516,10 @@ show_hide_button_toggled (GtkWidget *widget, gpointer data) - } - - gtk_label_set_markup (GTK_LABEL(label), text); -- gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip); -+ if (!pinentry->grab) -+ { -+ gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip); -+ } - g_free (tooltip); - } - -@@ -736,7 +739,7 @@ create_window (pinentry_t ctx) - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (qualitybar), - QUALITYBAR_EMPTY_TEXT); - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (qualitybar), 0.0); -- if (pinentry->quality_bar_tt) -+ if (pinentry->quality_bar_tt && !pinentry->grab) - { - #if !GTK_CHECK_VERSION (2, 12, 0) - gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), qualitybar, --- -2.13.6 - diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-build.patch b/app-crypt/pinentry/files/pinentry-1.0.0-build.patch deleted file mode 100644 index e367b8566450..000000000000 --- a/app-crypt/pinentry/files/pinentry-1.0.0-build.patch +++ /dev/null @@ -1,218 +0,0 @@ -From c5c7bee68730c9f66a27f9bb0d023480623a2bfb Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Thu, 1 Dec 2016 09:10:08 +0100 -Subject: [PATCH] Fix linkage problem in tty and emacs pinentries. - -* emacs/pinentry-emacs.c (curses_cmd_handler): Remove var. -* tty/pinentry-tty.c (curses_cmd_handler): Remove var. -* pinentry/pinentry.c (flavor_flag): New local var. -(pinentry_set_flavor_flag): New function. -(cmd_getinfo): Use FLAVOR_FLAG for the "flavor" sub-command. -* gnome3/pinentry-gnome3.c (main): Call pinentry_set_flavor_flag. -* gtk+-2/pinentry-gtk-2.c (main): Ditto. -* pinentry/pinentry-emacs.c (initial_emacs_cmd_handler): Ditto. -* qt/main.cpp (main): Ditto. --- - -Fixes-commit: e4e3a9cc88704dcffac660d0b92fd1ed8abecc11 -Fixes-commit: d126036671e7dd631babc118cb4113f723f15748 -Signed-off-by: Werner Koch ---- - emacs/pinentry-emacs.c | 4 ---- - gnome3/pinentry-gnome3.c | 3 +++ - gtk+-2/pinentry-gtk-2.c | 10 ++++++++-- - pinentry/pinentry-emacs.c | 5 ++++- - pinentry/pinentry.c | 34 ++++++++++++++++++---------------- - pinentry/pinentry.h | 4 ++++ - qt/main.cpp | 1 + - tty/pinentry-tty.c | 3 --- - 8 files changed, 38 insertions(+), 26 deletions(-) - -diff --git a/emacs/pinentry-emacs.c b/emacs/pinentry-emacs.c -index b6b3eb8..3c39a96 100644 ---- a/emacs/pinentry-emacs.c -+++ b/emacs/pinentry-emacs.c -@@ -29,10 +29,6 @@ - - pinentry_cmd_handler_t pinentry_cmd_handler = emacs_cmd_handler; - --/* needed to link cleanly; should never be used except for comparison -- * in pinentry/pinentry.c's cmd_getinfo(): */ --pinentry_cmd_handler_t curses_cmd_handler = NULL; -- - - - int -diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c -index a040f9b..d5a49d6 100644 ---- a/gnome3/pinentry-gnome3.c -+++ b/gnome3/pinentry-gnome3.c -@@ -517,18 +517,21 @@ main (int argc, char *argv[]) - fprintf (stderr, "No $DBUS_SESSION_BUS_ADDRESS found," - " falling back to curses\n"); - pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); - } - else if (!pe_gcr_system_prompt_available ()) - { - fprintf (stderr, "No Gcr System Prompter available," - " falling back to curses\n"); - pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); - } - else if (pe_gnome_screen_locked ()) - { - fprintf (stderr, "GNOME screensaver is locked," - " falling back to curses\n"); - pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); - } - #endif - -diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c -index 6037533..473c4aa 100644 ---- a/gtk+-2/pinentry-gtk-2.c -+++ b/gtk+-2/pinentry-gtk-2.c -@@ -938,10 +938,16 @@ main (int argc, char *argv[]) - if (pinentry_have_display (argc, argv)) - { - if (! gtk_init_check (&argc, &argv)) -- pinentry_cmd_handler = curses_cmd_handler; -+ { -+ pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); -+ } - } - else -- pinentry_cmd_handler = curses_cmd_handler; -+ { -+ pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); -+ } - #else - gtk_init (&argc, &argv); - #endif -diff --git a/pinentry/pinentry-emacs.c b/pinentry/pinentry-emacs.c -index df12f1b..50ba406 100644 ---- a/pinentry/pinentry-emacs.c -+++ b/pinentry/pinentry-emacs.c -@@ -644,7 +644,10 @@ initial_emacs_cmd_handler (pinentry_t pe) - if (emacs_socket < 0) - pinentry_cmd_handler = fallback_cmd_handler; - else -- pinentry_cmd_handler = emacs_cmd_handler; -+ { -+ pinentry_cmd_handler = emacs_cmd_handler; -+ pinentry_set_flavor_flag ("emacs"); -+ } - - return (* pinentry_cmd_handler) (pe); - } -diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c -index 322a651..a198fb3 100644 ---- a/pinentry/pinentry.c -+++ b/pinentry/pinentry.c -@@ -67,6 +67,10 @@ static char this_pgmname[50]; - - struct pinentry pinentry; - -+ -+static const char *flavor_flag; -+ -+ - static void - pinentry_reset (int use_defaults) - { -@@ -793,6 +797,16 @@ pinentry_parse_opts (int argc, char *argv[]) - } - } - -+ -+/* Set the optional flag used with getinfo. */ -+void -+pinentry_set_flavor_flag (const char *string) -+{ -+ flavor_flag = string; -+} -+ -+ -+ - - static gpg_error_t - option_handler (assuan_context_t ctx, const char *key, const char *value) -@@ -1444,27 +1458,15 @@ cmd_getinfo (assuan_context_t ctx, char *line) - } - else if (!strcmp (line, "flavor")) - { -- const char *flags; -- - if (!strncmp (this_pgmname, "pinentry-", 9) && this_pgmname[9]) - s = this_pgmname + 9; - else - s = this_pgmname; - -- if (0) -- ; --#ifdef INSIDE_EMACS -- else if (pinentry_cmd_handler == emacs_cmd_handler) -- flags = ":emacs"; --#endif --#ifdef FALLBACK_CURSES -- else if (pinentry_cmd_handler == curses_cmd_handler) -- flags = ":curses"; --#endif -- else -- flags = ""; -- -- snprintf (buffer, sizeof buffer, "%s%s", s, flags); -+ snprintf (buffer, sizeof buffer, "%s%s%s", -+ s, -+ flavor_flag? ":":"", -+ flavor_flag? flavor_flag : ""); - buffer[sizeof buffer -1] = 0; - rc = assuan_send_data (ctx, buffer, strlen (buffer)); - } -diff --git a/pinentry/pinentry.h b/pinentry/pinentry.h -index 01fb373..45d35ad 100644 ---- a/pinentry/pinentry.h -+++ b/pinentry/pinentry.h -@@ -275,6 +275,10 @@ int pinentry_have_display (int argc, char **argv); - or version output is requested. */ - void pinentry_parse_opts (int argc, char *argv[]); - -+/* Set the optional flag used with getinfo. */ -+void pinentry_set_flavor_flag (const char *string); -+ -+ - - /* The caller must define this variable to process assuan commands. */ - extern pinentry_cmd_handler_t pinentry_cmd_handler; -diff --git a/qt/main.cpp b/qt/main.cpp -index 8284960..225c06b 100644 ---- a/qt/main.cpp -+++ b/qt/main.cpp -@@ -308,6 +308,7 @@ main(int argc, char *argv[]) - #ifdef FALLBACK_CURSES - if (!pinentry_have_display(argc, argv)) { - pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); - } else - #endif - { -diff --git a/tty/pinentry-tty.c b/tty/pinentry-tty.c -index 3d6cd5a..a509d79 100644 ---- a/tty/pinentry-tty.c -+++ b/tty/pinentry-tty.c -@@ -556,9 +556,6 @@ tty_cmd_handler(pinentry_t pinentry) - - pinentry_cmd_handler_t pinentry_cmd_handler = tty_cmd_handler; - --/* needed to link cleanly; should never be used except for comparison -- * in pinentry/pinentry.c's cmd_getinfo(): */ --pinentry_cmd_handler_t curses_cmd_handler = NULL; - - - int --- -2.8.0.rc3 - diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch b/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch deleted file mode 100644 index f7476de1ff67..000000000000 --- a/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b0e0bdeac5d40ca645afc9017778b39a26303523 Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Wed, 11 Jan 2017 18:40:17 +0100 -Subject: [PATCH 01/25] gtk2: Fix a problem with fvwm - -* gtk+-2/pinentry-gtk-2.c (grab_pointer): Take care of -GDK_GRAB_ALREADY_GRABBED. --- - -Debian-bug-id: 850708 -Co-authored-by: Vincent Lefevre -Signed-off-by: Werner Koch ---- - gtk+-2/pinentry-gtk-2.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c -index 473c4aa..e37601f 100644 ---- a/gtk+-2/pinentry-gtk-2.c -+++ b/gtk+-2/pinentry-gtk-2.c -@@ -203,7 +203,12 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data) - (void)data; - - /* Change the cursor for the duration of the grab to indicate that -- something is going on. */ -+ * something is going on. The fvwm window manager grabs the pointer -+ * for a short time and thus we may end up with the already grabbed -+ * error code. Actually this error code should be used to detect a -+ * malicious grabbing application but with fvwm this renders -+ * Pinentry only unusable. Thus we try again several times also for -+ * that error code. See Debian bug 850708 for details. */ - /* XXX: It would be nice to have a key cursor, unfortunately there - is none readily available. */ - cursor = gdk_cursor_new_for_display (gtk_widget_get_display (win), -@@ -215,7 +220,8 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data) - NULL /* confine to */, - cursor, - gdk_event_get_time (event)); -- while (tries++ < max_tries && err == GDK_GRAB_NOT_VIEWABLE); -+ while (tries++ < max_tries && (err == GDK_GRAB_NOT_VIEWABLE -+ || err == GDK_GRAB_ALREADY_GRABBED)); - - if (err) - { --- -2.13.6 - diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild deleted file mode 100644 index a27f7a37b90c..000000000000 --- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2/index.html" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps emacs gnome-keyring gtk ncurses qt5 static" - -CDEPEND=" - app-eselect/eselect-pinentry - >=dev-libs/libassuan-2.1 - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - caps? ( sys-libs/libcap ) - gnome-keyring? ( app-crypt/libsecret ) - gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) -" -DEPEND="${CDEPEND} - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - gnome-keyring? ( app-crypt/gcr ) -" - -REQUIRED_USE=" - gtk? ( !static ) - qt5? ( !static ) -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-0.8.2-ncurses.patch" - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${P}-Disable-tooltips-in-keyboard-grabbing-mode.patch" - "${FILESDIR}/${P}-gtk2-Fix-a-problem-with-fvwm.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - export QTLIB="$(qt5_get_libdir)" - - econf \ - --enable-pinentry-tty \ - $(use_with caps libcap) \ - $(use_enable emacs pinentry-emacs) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gnome-keyring pinentry-gnome3) \ - $(use_enable gtk pinentry-gtk2) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable qt5 pinentry-qt) \ - MOC="$(qt5_get_bindir)"/moc -} - -src_install() { - default - rm -f "${ED}"/usr/bin/pinentry || die - - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 -} - -pkg_postinst() { - if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." - elog "The soft resource limit for memory locking specifies the limit an" - elog "unprivileged process may lock into memory. You can also use POSIX" - elog "capabilities to allow pinentry to lock memory. To do so activate the caps" - elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" - elog "your users." - fi - - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -} diff --git a/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild deleted file mode 100644 index f58c3ec17977..000000000000 --- a/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2/index.html" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps emacs gnome-keyring gtk ncurses qt5 static" - -CDEPEND=" - app-eselect/eselect-pinentry - >=dev-libs/libassuan-2.1 - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - caps? ( sys-libs/libcap ) - gnome-keyring? ( app-crypt/libsecret ) - gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) -" -DEPEND="${CDEPEND} - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - gnome-keyring? ( app-crypt/gcr ) -" - -REQUIRED_USE=" - gtk? ( !static ) - qt5? ( !static ) -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-0.8.2-ncurses.patch" - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${P}-Disable-tooltips-in-keyboard-grabbing-mode.patch" - "${FILESDIR}/${P}-gtk2-Fix-a-problem-with-fvwm.patch" - "${FILESDIR}/${P}-make-icon-work-under-Plasma-Wayland.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - export QTLIB="$(qt5_get_libdir)" - - econf \ - --enable-pinentry-tty \ - $(use_with caps libcap) \ - $(use_enable emacs pinentry-emacs) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gnome-keyring pinentry-gnome3) \ - $(use_enable gtk pinentry-gtk2) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable qt5 pinentry-qt) \ - MOC="$(qt5_get_bindir)"/moc -} - -src_install() { - default - rm -f "${ED}"/usr/bin/pinentry || die - - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 -} - -pkg_postinst() { - if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." - elog "The soft resource limit for memory locking specifies the limit an" - elog "unprivileged process may lock into memory. You can also use POSIX" - elog "capabilities to allow pinentry to lock memory. To do so activate the caps" - elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" - elog "your users." - fi - - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -} diff --git a/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild deleted file mode 100644 index eafaf2f416e5..000000000000 --- a/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2/index.html" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps emacs gnome-keyring gtk ncurses qt5 static" - -CDEPEND=" - app-eselect/eselect-pinentry - >=dev-libs/libassuan-2.1 - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - caps? ( sys-libs/libcap ) - gnome-keyring? ( app-crypt/libsecret ) - gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) -" -DEPEND="${CDEPEND} - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - gnome-keyring? ( app-crypt/gcr ) -" - -REQUIRED_USE=" - gtk? ( !static ) - qt5? ( !static ) -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch" - "${FILESDIR}/${PN}-0.8.2-ncurses.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - export QTLIB="$(qt5_get_libdir)" - - econf \ - --enable-pinentry-tty \ - $(use_with caps libcap) \ - $(use_enable emacs pinentry-emacs) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gnome-keyring pinentry-gnome3) \ - $(use_enable gtk pinentry-gtk2) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable qt5 pinentry-qt) \ - MOC="$(qt5_get_bindir)"/moc -} - -src_install() { - default - rm -f "${ED}"/usr/bin/pinentry || die - - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 -} - -pkg_postinst() { - if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." - elog "The soft resource limit for memory locking specifies the limit an" - elog "unprivileged process may lock into memory. You can also use POSIX" - elog "capabilities to allow pinentry to lock memory. To do so activate the caps" - elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" - elog "your users." - fi - - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -} diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild deleted file mode 100644 index b8cada19a72e..000000000000 --- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2/index.html" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static" - -CDEPEND=" - app-eselect/eselect-pinentry - >=dev-libs/libassuan-2.1 - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - caps? ( sys-libs/libcap ) - fltk? ( x11-libs/fltk ) - gnome-keyring? ( app-crypt/libsecret ) - gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) -" -DEPEND="${CDEPEND} - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - gnome-keyring? ( app-crypt/gcr ) -" - -REQUIRED_USE=" - gtk? ( !static ) - qt5? ( !static ) -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch" - "${FILESDIR}/${PN}-0.8.2-ncurses.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - export QTLIB="$(qt5_get_libdir)" - - econf \ - --enable-pinentry-tty \ - $(use_with caps libcap) \ - $(use_enable emacs pinentry-emacs) \ - $(use_enable fltk pinentry-fltk) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gnome-keyring pinentry-gnome3) \ - $(use_enable gtk pinentry-gtk2) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable qt5 pinentry-qt) \ - MOC="$(qt5_get_bindir)"/moc -} - -src_install() { - default - rm -f "${ED}"/usr/bin/pinentry || die - - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 -} - -pkg_postinst() { - if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." - elog "The soft resource limit for memory locking specifies the limit an" - elog "unprivileged process may lock into memory. You can also use POSIX" - elog "capabilities to allow pinentry to lock memory. To do so activate the caps" - elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" - elog "your users." - fi - - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -} -- cgit v1.2.3-65-gdbad