summaryrefslogtreecommitdiff
path: root/app-crypt/pinentry
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt/pinentry')
-rw-r--r--app-crypt/pinentry/Manifest7
-rw-r--r--app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch25
-rw-r--r--app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch52
-rw-r--r--app-crypt/pinentry/pinentry-1.2.0-r1.ebuild89
-rw-r--r--app-crypt/pinentry/pinentry-1.2.0.ebuild88
-rw-r--r--app-crypt/pinentry/pinentry-1.2.1-r1.ebuild (renamed from app-crypt/pinentry/pinentry-1.2.1.ebuild)2
6 files changed, 2 insertions, 261 deletions
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 433d3bf32ef6..c300fcdfe358 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,10 +1,5 @@
-AUX pinentry-0.8.2-ncurses.patch 824 BLAKE2B 922bb9a7079d4a3bc307a441f3f884f764f78819a16b57cde3dcb000ae7a23b592b390f53c528358818087c2c313716289b829c307f07dbee3c9580bd174cd0d SHA512 415ad55fd7a4ab66e87e5db76b1314b00f5a86552804f1f431a533ba1e7ec3f2c7136096106688b572639ceb637fdf0c3e25d96aa2e07fd1f6f295d39e1d4901
AUX pinentry-1.0.0-AR.patch 326 BLAKE2B 2a05565287d2a3ff9423db1365af6ac1d2d0e0e5b3b7db49ee927eacd480cfbd29abd2313d84eb764e9d7eccd4654e2173fbf8be4508dd88f14bf12f0f9dab39 SHA512 3a8b13ddaa2af8c793586cd73e44b59828e769c3861b2d328273bac991e7e171c8714e2098674a9ae8a77c9a68098012d217e67dde8872df154a1e499837de52
-AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7
-DIST pinentry-1.2.0.tar.bz2 498390 BLAKE2B 6e97b55fe39e9c17f8a87fa669d23fca56c1095c2533a9eebe459fafc95a3fcb0a5ea502077aae5480b5259a3096c5f85e05d4872c0b19ad33f3d9084a220cc7 SHA512 19cea79aa3982d1f0d75220c8e24ca38d6c49475c6f4c5aa7101151b4690db23ed316096a4a411136e716ba4eb471f48f9b09556e5c9837533c2356b9b384b63
DIST pinentry-1.2.1.tar.bz2 547698 BLAKE2B aa47612aa3a6f74c3676bf4018780356cb22ed4078792c1f466f9e0465199428c151c0e20dfbe6c784ef93c2b42b673daff0b6adc74c8c98fed9921e65ed42ea SHA512 a665315628f4dcf07e16a22db3f3be15d7e7e93b3deec0546c7275b71b0e3bd65535a08af5e12d6339fd6595132df86529401d9d12bd17c428a3466e8dfafab6
DIST pinentry-1.2.1.tar.bz2.sig 119 BLAKE2B 6a9fc12a09b5122bf531e875977f63fa7caa75d39afcb4e9a9a957df87ba0a6f6156ad9799cdde8625debe0b7c3cb9482616b0ab57c133ffd2f9120ddf47815f SHA512 b14525f6ace3d1fc3dc9e1173de8821fa2a960b870876beb10b98f41222378c1e3f4f79481f3f3854c1753e8dc9a7eb92862ffa583c7be0788ec25045a4e1176
-EBUILD pinentry-1.2.0-r1.ebuild 2239 BLAKE2B 79e38d3ae2d23c3a395bdb7a96efbf34ec878dd1903b3aba45105387f3ab025251430232950547502cd8837eb7dfd83342f946d221de66243d802c4af051704c SHA512 908514da6e595944c7f9d23a32e7f298981072b20e034a32351a9b337d8bc0d8afe845d8b21df3cf9bbb63155997bdf19b00dee8d22dea4c6be74401058f8064
-EBUILD pinentry-1.2.0.ebuild 2221 BLAKE2B 5f7e6fce95850c1fef610f6264d3017cdb3dcb0c1aa757e9ed03ef38e0cdd98fc043ad3ecc4f1642a8a008101b8abcd84d8510d0046006e5a87830c83d05aaab SHA512 a48d09a21fb76e60db0d65ef351c93b0e842b937f33433ddad3b662420f5a43dba4641dfa061719b5651d7be7de01133ef39e700ea0205098841260527da8ced
-EBUILD pinentry-1.2.1.ebuild 2324 BLAKE2B 86ce5f6970c118a098dbc3e37231a37929fa312aaf5b5e6f32aa216e6c52df6ab0f58a696bbdc0561085de6b49f3cac45c2cdde32ba79ed7cc77ce65bb5a4ef2 SHA512 242b262795b2e865c1ce8a901d67239e87fce9d2cde8b9ce6973af098f4fa8e911b232a8c297791b97aef9ae855f7185db4d960108bbafa3b103ca006314650e
+EBUILD pinentry-1.2.1-r1.ebuild 2326 BLAKE2B a80f098eb330b21d7b6e9b1ac2fe00cf12eba8cc7d4fd047f2edcbe4fdb2c3d54ff74af1693370239a815cb24cde45ed90ef1425c94d2c2db731e8768e444a14 SHA512 95b3b22f54810ffbcf7401f30e08e7642f127cfd04c7c80a45f075b81c2916c5ed3865615e67c80c05931a15a41ad42627b3b34234d806f7eb21bd26b318c0e9
MISC metadata.xml 452 BLAKE2B a2aef88d14b75ddb8f8cced6ee2dc1d0d66ac52ac5c686bd8d230bd9291146fa3fc0411682488e0a45c05b20640cf8b4093ee71a0ec60e02fe507dda2910c5fa SHA512 0517e56cd5cb905f4951205f4f7db6d01a14d28e1578612f91bfaee5dfc93a56eff4896201cf3c02f9ca02329b8597d6469187f60f429f7c5f6995fa0023aaf7
diff --git a/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch b/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch
deleted file mode 100644
index 3bb92c63d00c..000000000000
--- a/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bafe8608fc525ef103b3d1f3048ca28958bef596 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sun, 5 May 2013 02:23:08 +0300
-Subject: [PATCH] ncurses: link with optional tinfo
-
----
- m4/curses.m4 | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/m4/curses.m4 b/m4/curses.m4
-index 3a01881..ffb6bd1 100644
---- a/m4/curses.m4
-+++ b/m4/curses.m4
-@@ -36,6 +36,8 @@ AC_DEFUN([IU_LIB_NCURSES], [
- have_ncursesw=no
- fi
- if test "$LIBNCURSES"; then
-+ AC_CHECK_LIB(tinfow, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfow",
-+ AC_CHECK_LIB(tinfo, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfo"))
- # Use ncurses header files instead of the ordinary ones, if possible;
- # is there a better way of doing this, that avoids looking in specific
- # directories?
---
-1.8.1.5
-
diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch b/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch
deleted file mode 100644
index 646df1963760..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 7218becac7132c2508d4e8f42c693d69c406795a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
-Date: Wed, 7 Mar 2018 15:14:22 +0100
-Subject: [PATCH] Make pinentry-qt icon work under Plasma Wayland.
-
----
- qt/Makefile.am | 2 ++
- qt/main.cpp | 2 ++
- qt/org.gnupg.pinentry-qt.desktop | 5 +++++
- 3 files changed, 9 insertions(+)
- create mode 100644 qt/org.gnupg.pinentry-qt.desktop
-
-diff --git a/qt/Makefile.am b/qt/Makefile.am
-index 698005e..bbf39d1 100644
---- a/qt/Makefile.am
-+++ b/qt/Makefile.am
-@@ -24,6 +24,8 @@ bin_PROGRAMS = pinentry-qt
-
- EXTRA_DIST = document-encrypt.png pinentry.qrc
-
-+desktopdir = $(datadir)/applications
-+dist_desktop_DATA = org.gnupg.pinentry-qt.desktop
-
- if FALLBACK_CURSES
- ncurses_include = $(NCURSES_INCLUDE)
-diff --git a/qt/main.cpp b/qt/main.cpp
-index fe88d26..b767cb4 100644
---- a/qt/main.cpp
-+++ b/qt/main.cpp
-@@ -372,6 +372,8 @@ main(int argc, char *argv[])
- i = argc;
- app = new QApplication(i, new_argv);
- app->setWindowIcon(QIcon(QLatin1String(":/document-encrypt.png")));
-+ app->setOrganizationDomain(QStringLiteral("gnupg.org"));
-+ app->setDesktopFileName(QStringLiteral("org.gnupg.pinentry-qt"));
- }
-
- pinentry_parse_opts(argc, argv);
-diff --git a/qt/org.gnupg.pinentry-qt.desktop b/qt/org.gnupg.pinentry-qt.desktop
-new file mode 100644
-index 0000000..0ac89aa
---- /dev/null
-+++ b/qt/org.gnupg.pinentry-qt.desktop
-@@ -0,0 +1,5 @@
-+[Desktop Entry]
-+Type=Application
-+Name=Pinentry dialog
-+Icon=document-encrypt
-+NoDisplay=true
---
-2.16.1
-
diff --git a/app-crypt/pinentry/pinentry-1.2.0-r1.ebuild b/app-crypt/pinentry/pinentry-1.2.0-r1.ebuild
deleted file mode 100644
index f3494a8189a9..000000000000
--- a/app-crypt/pinentry/pinentry-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools qmake-utils
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
-
-DEPEND="
- >=dev-libs/libassuan-2.1
- >=dev-libs/libgcrypt-1.6.3
- >=dev-libs/libgpg-error-1.17
- caps? ( sys-libs/libcap )
- efl? ( dev-libs/efl[X] )
- gnome-keyring? ( app-crypt/libsecret )
- ncurses? ( sys-libs/ncurses:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}
- gtk? ( app-crypt/gcr[gtk] )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
-"
-IDEPEND=">=app-eselect/eselect-pinentry-0.7.2"
-
-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"
- "${FILESDIR}/${PN}-1.0.0-AR.patch"
-)
-
-src_prepare() {
- default
- unset FLTK_CONFIG
- eautoreconf
-}
-
-src_configure() {
- export QTLIB="$(qt5_get_libdir)"
-
- econf \
- $(use_enable efl pinentry-efl) \
- $(use_enable emacs pinentry-emacs) \
- $(use_enable gnome-keyring libsecret) \
- $(use_enable gtk pinentry-gnome3) \
- $(use_enable ncurses fallback-curses) \
- $(use_enable ncurses pinentry-curses) \
- $(use_enable qt5 pinentry-qt) \
- $(use_with caps libcap) \
- --enable-pinentry-tty \
- --disable-pinentry-fltk \
- --disable-pinentry-gtk2 \
- MOC="$(qt5_get_bindir)"/moc \
- GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" \
- LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" \
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-src_install() {
- default
-
- rm "${ED}"/usr/bin/pinentry || die
-
- use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
-}
-
-pkg_postinst() {
- eselect pinentry update ifunset
-}
-
-pkg_postrm() {
- eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.2.0.ebuild b/app-crypt/pinentry/pinentry-1.2.0.ebuild
deleted file mode 100644
index 22f5e9b96eff..000000000000
--- a/app-crypt/pinentry/pinentry-1.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools qmake-utils
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
-
-DEPEND="
- >=app-eselect/eselect-pinentry-0.7.2
- >=dev-libs/libassuan-2.1
- >=dev-libs/libgcrypt-1.6.3
- >=dev-libs/libgpg-error-1.17
- caps? ( sys-libs/libcap )
- efl? ( dev-libs/efl[X] )
- gnome-keyring? ( app-crypt/libsecret )
- ncurses? ( sys-libs/ncurses:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}
- gtk? ( app-crypt/gcr[gtk] )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-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"
- "${FILESDIR}/${PN}-1.0.0-AR.patch"
-)
-
-src_prepare() {
- default
- unset FLTK_CONFIG
- eautoreconf
-}
-
-src_configure() {
- export QTLIB="$(qt5_get_libdir)"
-
- econf \
- $(use_enable efl pinentry-efl) \
- $(use_enable emacs pinentry-emacs) \
- $(use_enable gnome-keyring libsecret) \
- $(use_enable gtk pinentry-gnome3) \
- $(use_enable ncurses fallback-curses) \
- $(use_enable ncurses pinentry-curses) \
- $(use_enable qt5 pinentry-qt) \
- $(use_with caps libcap) \
- --enable-pinentry-tty \
- --disable-pinentry-fltk \
- --disable-pinentry-gtk2 \
- MOC="$(qt5_get_bindir)"/moc \
- GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" \
- LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" \
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-src_install() {
- default
- rm "${ED}"/usr/bin/pinentry || die
-
- use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
-}
-
-pkg_postinst() {
- eselect pinentry update ifunset
-}
-
-pkg_postrm() {
- eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.2.1.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r1.ebuild
index 7f40b2816016..4aa172fa6804 100644
--- a/app-crypt/pinentry/pinentry-1.2.1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.2.1-r1.ebuild
@@ -31,7 +31,7 @@ DEPEND="
"
RDEPEND="
${DEPEND}
- gtk? ( app-crypt/gcr[gtk] )
+ gtk? ( app-crypt/gcr:0[gtk] )
"
BDEPEND="
sys-devel/gettext