Add app-crypt/pinentry-0.9.7-r1

3 files changed, 175 insertions, 0 deletions

diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index acc8cac2..5f921b1c 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -16,12 +16,14 @@ AUX pinentry-0.9.4-configure.ac.patch 1398 SHA256 226f637b60bd1bcbc4da0bd97e5ad1
 AUX pinentry-0.9.5-build.patch 1632 SHA256 e78b4299eafd4cf90914f11882a19c2f26eac37efc6ffd0c639ea6a79c2e7927 SHA512 9d4f5dea925710da263546f52c685e82ddce66a52c3d2e16e52411b27a4adba07d28502af174217f138660eb8b016beb17a2e23a45edb757f49f80854f56a699 WHIRLPOOL 5fada469994b8fc155401d733a6a0f1ba226f6c4caeece77885b19608bf5649db4137ab584485965c439da8249598d1e0591e1934bf3748a0d8e1384a79f02bd
 AUX pinentry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch 926 SHA256 132e7d7daebbe3e59870f0ca703801ec3c5ce68836fc24617790d1def5dd1986 SHA512 cee841da71253289a460d9167af6a466c5ca8f582cf2d86059c642b38d5ed205281fab4f47d1c9159efb9562535c6003f8bdca06496b6f7a313fdab82799d58e WHIRLPOOL 0227a2d3aaa68bdca12ac26c121afd70221db6512b694f135a020025bf073d589a83e9004cae7f62bf6f62096aaeab19ce351fa537a22ffcbf917b700fd48b0c
 AUX pinentry-0.9.6-add-disable-pinentry-qt5-option.patch 1810 SHA256 f19a155be0632ce3dbfa5dd17c01b9d54aa8abd130d411a82152b48ca35daf7a SHA512 e336403faf12e6deadd33fd7c87fbd45ba8fe0173b328881bca43b021170f523c5459d3e62651ef1d47a0bb8d5dc194125b29cbd09934653f98fbd5ece21f1b5 WHIRLPOOL 6d577042df3b8ce5c4729b761940ed95785c788a1e754d20d3a465f531ab63fb2c4c457193c2ad70ac2a302f344b17e457718f4e3480474a1f0366501dbf4986
+AUX pinentry-0.9.7-require-CPP11-for-qt-5-7.patches 1415 SHA256 ee9fc1ccc6d8c96a7097d8cb93a2277b7809dff24314d616615ae3bbe369c5a1 SHA512 1191ec7aa71042e4c770ea2793aac73f5501e83f0f93e9ae5440cbf84e4796c258156af7da9d0aaa7603e690c6bfa97d921c7721b3519d7ba33bd0f0def0baf4 WHIRLPOOL bbd686b0bde31c1a07074720ae611454f8a2f383c4d950c29deac974ac91b44c64c06066a65467589451bf596badbcc56d63a6bbfcb2061329861983b9209915
 DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac
 DIST pinentry-0.9.1.tar.bz2 482295 SHA256 9cd08e856b395df3adc7124170b53f77c6d5c8bf88e899e818648ec70d3e9695 SHA512 2462d25a471a6053a0d1b67a05d1a828b9d14ca4aeced352376ff16b6aa4d03fd6d1013aee1b07b97f9ee73f218065c48fe2746bbf27f3cb2bd9aa0b9c9c1a50 WHIRLPOOL 2e74e31567b26d0ee1d0d962f9c4dee6bd9c5a8679751dc85a14d3f2d47bc83aa068ac9810261c1e47a08eacb25777926be3de0db9e3d20d3d8348033c6b13c5
 DIST pinentry-0.9.2.tar.bz2 495742 SHA256 fd8bc1592ceb22bb492b07cb29b1b140bb882c859e6503b974254c0a4b4134d1 SHA512 68ba5643b9dc4e71b28f964172c7f37a67d1b22914c649c612e001c7c5ca0c40a0a2ec0974f50dbdc8dd98cc6266688c71d67e922db4334536797d331b0203cf WHIRLPOOL 457c8408ed04b2b5f72761d0b24cf1f07b1b81bb431cc666ee88015fda5a868a4ad296ac82fc98c79d5af5c1fdfdc597cb38914088143fb08e7838c9b572a090
 DIST pinentry-0.9.4.tar.bz2 510034 SHA256 4b8835bb738d464542b62020ff6b8f649a621540edb61c4cbfe0c894538ee2e0 SHA512 91b7b7c99a700874b130d72907295e8fe71737575024f0253a9ffa4ff6bb8a0fb6856fa3e0a5a1b66bd8fb2ee9a81674b9fdecef179e5abef543af9a4bd6bd5e WHIRLPOOL eb5cc9a9851584ed76c59662850549b873949f260edb0b64af73e026923e5779f28ed8bf60f9690bbc89b607018990db934532945a51ca8b0e2ce5d5e1d4259a
 DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727
 DIST pinentry-0.9.6.tar.bz2 432889 SHA256 2a1124e9097f24f866cab7982610677e222cea71be0a71a5566f223177e01e66 SHA512 c9f94e5ce5baf6779f6effc13f82c8c7f99d426dc232114fc4e11a8684eaefbaf4f60363db78cdb9f4c8e91ba7af40779ec1c5d7e01ee15b84c7de77ccf46e72 WHIRLPOOL 954d185ce60eeb28717dd5986c4bdfda0472944b99d52caa213919b4dd1368b2d2b4cff27bfc4158a0fd7f70f7f6549b3415de7ba33239ec9305a2e0e0bdcbc0
+DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a
 EBUILD pinentry-0.9.0-r2.ebuild 3146 SHA256 c45f4ac80cc6ae2f05d5ad70ca5f5f47d9ba973500b932ea48e7efda3c1d2e8b SHA512 d99290821b5fe432cf9482b1f6bc6f131de8254bd675c5a2f24dbc5f960ee628a1abe5ee653ae84790e622d28cd35c5f95b576e5c4c569b2ffa61c0a55b20773 WHIRLPOOL 29f9025b2e98164336a6eeb42c76bd5986ada41bb6a367706f899ca286d32fc51ba17e63c92e34e49b4b193ac12fb02ca34ad08b2da0af8746dbfe6966b90dc0
 EBUILD pinentry-0.9.0-r3.ebuild 3176 SHA256 f459b25a865e806326013738ac1e2f445f664d0924973ee518f34c03b9fee63f SHA512 a5fd365837c72b01c97fad5f3736bc49fac7f6b5bfd824b2fd4745069481b469c771ffeba1a9ece44d89f356e4b07a709c73c758879abbf9fd2be656d4700f63 WHIRLPOOL 331283f62f7cc37e1bb30fb58132b54e92c7997a9c96793614e268d2e0f0b835775baeb945ec442282c59be5cecf58135329f1d4a44fd0c41a7c554fef347f37
 EBUILD pinentry-0.9.0.ebuild 2946 SHA256 bbbf56b08b61e4041cd6b2d4397f7b165a96129d102e75a98373c08077bfafd0 SHA512 93584b8bc336f3ab9a22ddc055afebf860bd423bdbcecced37930b24779a749bb9602a9e5469675d8cb2b413964d15bdbc188f33a1a5c7dc302f08e8eb1b1df9 WHIRLPOOL ecc16fba111754856bbbf8e62359b490cf28f2b572313e79b767903508936b166e0d865aa403aa546676665cd83c2aedc88c8381dfc6f8e9d2b425c8c47bd755
@@ -32,3 +34,4 @@ EBUILD pinentry-0.9.5.ebuild 2910 SHA256 6a871e287e5f47cc7b303c31d02509232aa2d21
 EBUILD pinentry-0.9.6-r1.ebuild 2939 SHA256 dcebfebbd64562d53bfc70e8a1fcbda790adf01d693fd8e502202b1068461e37 SHA512 2f2ff4b2ded35472ec3e73cde33ed999f533a11b1ce7c7221f9851cabb4d5907568102579526e0e019cd93502fddcb4263035ba9199afa6b84ecd498e001e9d4 WHIRLPOOL b05b42143d3816536c6e9bc219d56431679825373195a04ae40ebb51ee9099435f2c5e9e0eeb09b9cf651f5bc7fb68a38a37944806f667fcd79e4c0d94503188
 EBUILD pinentry-0.9.6-r5.ebuild 3436 SHA256 fcb831aac2f5796ae3fb599a1eef2c532d7fd6827edd2b3ea6ef525057f466c1 SHA512 815ca2539bb09d5950ffff6801929c9096879abd5925bbc3b944206f3cb3f5f70a4e931261d0b9f6ef50fddb8a72481a5d553ef4b342eaad076cd49fd859c7e5 WHIRLPOOL f0bc78996fa29d911993ff09227f4545a0c1ca159ac3cf32223ed2477db93c961392064637db2da82c89a6775571f3abc8196247379586e8b7f253200c560813
 EBUILD pinentry-0.9.6-r6.ebuild 3426 SHA256 54fbffa65d71dae6913ef0b406570ff3a28243b1970376808f604640b9c0fde0 SHA512 6fa0972f6a8ce02605544970cb1bddee2a35f48790bfbda3338dbeb98823730d7c89ebd0216cde5f9996943a00d216b0d6882dbcc7ba45031a502e7382f38fc5 WHIRLPOOL d2df3020598020a45d70abc33507d804f79b7cc6999f3432c50ed166388c2d7684ef58f9e45f485cd22076abf654259f5366c6582abffdc4e3b0364db6b051fa
+EBUILD pinentry-0.9.7-r1.ebuild 3400 SHA256 75d3e7f18ab05b85dad072e30a697e6d9f2783725c672e37c5fe94b19479dc47 SHA512 c699c03c8b9de302309fb3dc3c1fa872145b2ebba5c5b8316068041f87154ca5e07187a33a27672c2f4d2c62faca61afa2456ac3bc795e1aed484cbe77567992 WHIRLPOOL 3425314c047dbe021c53c498ee8a56fc018f08699f948c392eba3f8fdc3f0e1f438c8089bc41acff4f3b1e6f1f02d337ce503d3bac3fb36a390e2dc43f412f86
diff --git a/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches b/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
new file mode 100644
index 00000000..406571cd
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
@@ -0,0 +1,48 @@
+From 7384e2a575dde2809784d9f182fd1d247064c8a2 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Thu, 11 Aug 2016 14:44:37 +0200
+Subject: [PATCH] Qt: Append -std=c++11 if building against Qt 5.7
+
+ * m4/qt.m4: Append -std=c++11 to CFLAGS if building against Qt 5.7
+
+--
+Qt 5.7 enables C++11 for Qt modules, and any app relying on it require to be
+compiled with at least this standard.
+
+This patch adds detection for Qt 5.7 and make sure -std=c++11 is passed if
+building against Qt 5.7 or higher.
+---
+ m4/qt.m4 | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/m4/qt.m4 b/m4/qt.m4
+index 093f428..90c4a6e 100644
+--- a/m4/qt.m4
++++ b/m4/qt.m4
+@@ -35,6 +35,7 @@ AC_DEFUN([FIND_QT],
+                 enable_pinentry_qt5="try")
+ 
+   have_qt5_libs="no";
++  require_qt_cpp11="no";
+ 
+   if test "$enable_pinentry_qt5" != "no"; then
+     PKG_CHECK_MODULES(PINENTRY_QT,
+@@ -47,6 +48,15 @@ AC_DEFUN([FIND_QT],
+     fi
+   fi
+   if test "$have_qt5_libs" = "yes"; then
++    PKG_CHECK_MODULES(PINENTRY_QT_REQUIRE_CPP11,
++                      Qt5Core >= 5.7.0,
++                      [require_qt_cpp11="yes"],
++                      [require_qt_cpp11="no"])
++
++    if test "${require_qt_cpp11}" = "yes"; then
++      PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -std=c++11"
++    fi
++
+     AC_CHECK_TOOL(MOC, moc)
+     AC_MSG_CHECKING([moc version])
+     mocversion=`$MOC -v 2>&1`
+-- 
+2.7.3
+
diff --git a/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
new file mode 100644
index 00000000..1d959616
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: d97fc6bc7a937bd2f7a1743e01f66cee13413e0b $
+
+EAPI=5
+
+inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://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 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"
+
+CDEPEND="
+	>=dev-libs/libgpg-error-1.17
+	>=dev-libs/libassuan-2.1
+	>=dev-libs/libgcrypt-1.6.3
+	ncurses? ( sys-libs/ncurses:0= )
+	gtk? ( x11-libs/gtk+:2 )
+	qt4? (
+		>=dev-qt/qtgui-4.4.1:4
+	     )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	     )
+	caps? ( sys-libs/libcap )
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+	app-eselect/eselect-pinentry
+	gnome-keyring? ( app-crypt/libsecret )
+"
+
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	${CDEPEND}
+	gnome-keyring? ( app-crypt/gcr )
+"
+
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 qt5 )
+	gtk? ( !static )
+	qt4? ( !static )
+	qt5? ( !static )
+	static? ( ncurses )
+	?? ( qt4 qt5 )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" \
+		   "${FILESDIR}/${P}-require-CPP11-for-qt-5-7.patches" \
+		   "${FILESDIR}/${PN}-0.9.4-configure.ac.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	QT_MOC=""
+	if use qt4; then
+		myconf+=( --enable-pinentry-qt
+			  --disable-pinentry-qt5
+			)
+		QT_MOC="$(qt4_get_bindir)"/moc
+		# Issues finding qt on multilib systems
+		export QTLIB="$(qt4_get_libdir)"
+	elif use qt5; then
+		myconf+=( --enable-pinentry-qt )
+		QT_MOC="$(qt5_get_bindir)"/moc
+		export QTLIB="$(qt5_get_libdir)"
+	else
+		myconf+=( --disable-pinentry-qt )
+	fi
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_enable emacs pinentry-emacs) \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_with caps libcap) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gnome-keyring pinentry-gnome3) \
+		"${myconf[@]}" \
+		MOC="${QT_MOC}"
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+
+	if use qt4 || use qt5; then
+		dosym pinentry-qt /usr/bin/pinentry-qt4
+	fi
+}
+
+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
+}