From acad5327d6e44f7f4b2dd8a5eb6a563a1297aac3 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Mon, 25 Jan 2021 18:58:03 +0300 Subject: app-crypt/pinentry: major rework - disable fltk (was not used) - disable gtk2 (obsolete) - fix qt5 symlink - link gnome3-pinentry under gtk USE Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Mikle Kolyada --- app-crypt/pinentry/pinentry-1.1.0-r3.ebuild | 100 ---------------------------- app-crypt/pinentry/pinentry-1.1.0-r4.ebuild | 88 ++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 100 deletions(-) delete mode 100644 app-crypt/pinentry/pinentry-1.1.0-r3.ebuild create mode 100644 app-crypt/pinentry/pinentry-1.1.0-r4.ebuild diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild deleted file mode 100644 index a86c83d4d9f6..000000000000 --- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5" - -DEPEND=" - 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 - ) -" -RDEPEND="${DEPEND} - gnome-keyring? ( app-crypt/gcr ) -" -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 - eautoreconf -} - -src_configure() { - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - export QTLIB="$(qt5_get_libdir)" - - econf \ - $(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 fallback-curses) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable qt5 pinentry-qt) \ - $(use_with caps libcap) \ - --enable-pinentry-tty \ - FLTK_CONFIG="${ESYSROOT}/usr/bin/fltk-config" \ - 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 -f "${ED}"/usr/bin/pinentry - - 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-r4.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild new file mode 100644 index 000000000000..967f928b26f7 --- /dev/null +++ b/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="caps emacs gnome-keyring gtk ncurses qt5" + +DEPEND=" + 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 ) + ncurses? ( sys-libs/ncurses:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +RDEPEND="${DEPEND} + gtk? ( app-crypt/gcr ) +" +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() { + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 + + export QTLIB="$(qt5_get_libdir)" + + econf \ + $(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 +} -- cgit v1.2.3-65-gdbad