gentoo resync : 07.10.2018

3 files changed, 108 insertions, 3 deletions

diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index f636b4b23f5f..ff2e06e67134 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -8,5 +8,6 @@ DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1
 EBUILD pinentry-1.0.0-r2.ebuild 2874 BLAKE2B 8d2d5d2804270af7e717dd8bab0a025251da59ff4e82f3044420f437f0d89c7bb3efa88a7d725deb54635b5006d83b8496c4b29ee0a440bd70e08d8d80390b83 SHA512 944d73b638e782c52faf3596f38d3ebff7e7f4caa3d459cc41d6c4b37a31738782fe3414742d25f61c8749983030c26acd905f0b930db3fec42027ea3be114f4
 EBUILD pinentry-1.0.0-r3.ebuild 2947 BLAKE2B e60fcc295f85e56b52e3c06de406084aaee202398e03a596bcb68918c388074c02687c8bb28b1829ac118df5e98973eebee810a531d55eeae7f0241bb07dcbd7 SHA512 4e4c5c407d4acdcce021564852d24b5c9b7343f9059747a0b5efe4a700315ab2470dd2f15f9242189489338e5a9af47a33c55858d6145b3832a262e638a61580
 EBUILD pinentry-1.1.0-r1.ebuild 2798 BLAKE2B ddbaa44c716dfd7e3289c116f0205df9e5ae522884b37b822e0218d377f9d4b236a4a40969619a491989510a08e4e29405d2df8f1ffe7d040a389c274e6fe03d SHA512 6bff540b8ebac1269a5f79c68fdf7de8cb3f79ca00ada5746ddf7daed5b27f05e7f54caf768fb43b9c7e9ec6ecf43edb1471848170af59f62d38329934f98d08
-EBUILD pinentry-1.1.0-r2.ebuild 2864 BLAKE2B 3363a8ca104efcf6c81cc96b78a1b4263a639ba11c85eceae2ae4e36db70bb73ab5e7ca7e20c748963428e809e3662adc0cb88fa5c0076dc1cefcffb4a8cf981 SHA512 537ec6e9c8841d2192c3e0c984b7d38e436a8d22172f8c4effbfdb67b3dba1da6fc3104c012786cdd6352faf69a152eb097f85b70925099fae983caa3aa8b0fb
+EBUILD pinentry-1.1.0-r2.ebuild 2857 BLAKE2B e56f945db99dbd41278ec407d606662da157227a2fd25320a49f58fddf0280d7a61f2b8d2d1a3b48c9b7a665c3d8ab719f3a61d87684fad99a7c67d335c8b729 SHA512 48c7a152adfa0ca2fe342c0107d6cf9a8ebb82bcd678d77f5d99b02558b0fa3764ce172e3aa5af515e6fc75ec4bf5b0d02428483abd4630b9d2b1ee58c8270ce
+EBUILD pinentry-1.1.0-r3.ebuild 2999 BLAKE2B cf291d49bc8236200f628fb173fc0f4c92aa404e04e50abfd47d05b809e17475e3bf6dc70d7416689c4f3d906a2dd1ad5e85b57862bb7c14e2d35790569c3ea8 SHA512 de1e7a1e6ee5fe2a96cbc057a6de10ccc3a69cad241b8c4300b65211f8ca8faf9ecacfe12ea9642462d0051d89a176549070c03551dd24767ce05278be05492f
 MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
index afc5e7f970cd..7c624a0187c4 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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="
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..82e3443aa1b3
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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"
+
+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
+	)
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+"
+RDEPEND="${DEPEND}
+	gnome-keyring? ( app-crypt/gcr )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+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 \
+		$(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="${EROOT}/usr/bin/fltk-config" \
+		MOC="$(qt5_get_bindir)"/moc \
+		$(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+}
+
+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 '<app-crypt/pinentry-0.7.3'; then
+		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+		elog "Linux kernels >=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
+}