gentoo resync : 29.01.2021

3 files changed, 101 insertions, 23 deletions

diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 1ebefdccf8d6..603bd741c0a2 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -2,5 +2,7 @@ AUX pinentry-0.8.2-ncurses.patch 824 BLAKE2B 922bb9a7079d4a3bc307a441f3f884f764f
 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.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
-EBUILD pinentry-1.1.0-r3.ebuild 2940 BLAKE2B 91a208d122d53ad83ed32c1fb6251ca089057e043aba3d25e5a4c2edf03a14f2dbe8eaef600a41d0d07eb976e904799ea4b1c3733d8e592b4872e6485b58251d SHA512 b7d17b817274be6fd14a03bbc3a40b6d9ef13f3884a008bdba2ba86e0a81f019ff900452c611add0deba846facfcca783da743228616058a4a4987fcd7a37836
+DIST pinentry-1.1.1.tar.bz2 515723 BLAKE2B f257fe552852e6d1ff2c23aeb0c1127b43e3a60e44c78dfa764d569e659ccb78528ce3ee863114af273a4b6f6c24686cda2cb14bb04995eb8c41ccd4541a9fbd SHA512 d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
+EBUILD pinentry-1.1.0-r4.ebuild 2238 BLAKE2B ce1c7b875208ec0fd3fcba08a7ae89439e86980d46c4e945c096d588dbf24d13516909b11473c89111527d0c6183067e97e447a9866201c5356ecba6ad35c24b SHA512 2b0f6ed73c6477c55c85cceaa108cc8f0b633eba49e5dea221664957236b462f782a3c9c1f20cc5c2a582d1258f00e80ad9162ce21ddd6d784fd305fafed6607
+EBUILD pinentry-1.1.1.ebuild 2247 BLAKE2B 10017793a0fe20615bae74ca0e1c139bd9d33aa21d32f61de1b7abdd205f73c5f185a0c9ec6c0537d006bf003f533b78ae958ffdc05f264c20d44aa38eccea45 SHA512 962fadc9e9bc6980413cc9f390b20a014462186f07a865262e2ee37bcbfeca22ccc32b53896d10ff3ada167776e1ca080631796c148bbb7bc14d14076b2dc458
 MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild
index b1f94a63c96a..967f928b26f7 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild
@@ -12,7 +12,7 @@ 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"
+IUSE="caps emacs gnome-keyring gtk ncurses qt5"
 
 DEPEND="
 	app-eselect/eselect-pinentry
@@ -20,9 +20,7 @@ DEPEND="
 	>=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
@@ -31,7 +29,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	gnome-keyring? ( app-crypt/gcr )
+	gtk? ( app-crypt/gcr )
 "
 BDEPEND="
 	sys-devel/gettext
@@ -48,6 +46,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+	unset FLTK_CONFIG
 	eautoreconf
 }
 
@@ -58,40 +57,29 @@ src_configure() {
 
 	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 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 \
-		FLTK_CONFIG="${EROOT}/usr/bin/fltk-config" \
+		--disable-pinentry-fltk \
+		--disable-pinentry-gtk2 \
 		MOC="$(qt5_get_bindir)"/moc \
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
-		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
+		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
+	rm "${ED}"/usr/bin/pinentry || die
 
-	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4
+	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
 }
 
 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
 }
 
diff --git a/app-crypt/pinentry/pinentry-1.1.1.ebuild b/app-crypt/pinentry/pinentry-1.1.1.ebuild
new file mode 100644
index 000000000000..5d2943485111
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-1.1.1.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
+}