Update app-crypt/pinentry-0.9.7-r1, app-crypt/pinentry-1.0.0

3 files changed, 20 insertions, 18 deletions

diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index fb22ccc3..d0e9031f 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -35,5 +35,5 @@ 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 3399 SHA256 d010238c18b9b005c0c424c8e77b2221a17d55666831c695cb2cd47477cb8807 SHA512 5bdf81a7d29cfc2a7446f71aada353ca47a2e1c2cb56f30d14bb7db4884f5ea8982ecd992fb3075ee851d24cc84e043f3168d54e785692f6ff7db0a75af3f15d WHIRLPOOL c7a8d0ff25d6670f5f02ef6a097ca8236bbd65ef757ddaf1bad8a7503f12b76ea2cace2cbddc75240541c448a0d4b7dcd9598b366a7411f9e62651127fc824ad
-EBUILD pinentry-1.0.0.ebuild 3354 SHA256 5e9e43687bc69207bec3a92a82a1d87530fd0dffd1ca9c53bca6ef0517e654d3 SHA512 d71f341d9d394a534ca6316aad9b46d259ffb7e1c7562499a4385540fec7d599aedf9af7bbc5b7c6fa59753105af2c9c3cf4889742b4fbb7752c161045ddcc29 WHIRLPOOL 300565080a7ee5c723baa2ac11ddb42b4e8389e682035342b8ee2858e4dbce8e7d9f751e8a71254ccf0624efbc8c433f142acb04e7cecb8f4d1b4b15f7aae577
+EBUILD pinentry-0.9.7-r1.ebuild 3398 SHA256 4f46bbc350d389c11ee6aef70862f72b3a80842393b742edf9ec7743c5f9c895 SHA512 053194a7c6915251f9a4074a2438e89e68aaf8601acca13218d43fb81ae7ee448842ca25b2c8714c837dc52ed9bc0ae53e9815b79d58a2405fcba9e04f1d65fa WHIRLPOOL 0582ee3c20aed5db596a311876d258897a286df35bd5cac3a01a5b900849917e8759f6f593eda07d0c8acb17c3fe957cc7b4b1ff640719ba25b905ded2615dff
+EBUILD pinentry-1.0.0.ebuild 3317 SHA256 04ea2f1eee955a3af11a2df1ef4ad0aa7edebd6eed2fed71bf69c88581caf3a7 SHA512 68a69dcaebc0e7ea0f122edf9b5ea4c800b922da4ec2561245115d818bf500b27e170ec4813bbb153995d939ea2a3975496f1bc5014e3f284efc84cf11c715b5 WHIRLPOOL ac508e7057c8b934176bbdddd566752cbc8702b8e61a324e8e0e0da3e726cd8278dc3fcb3bc1bfb2e94aeda9e35ec6b384af6930e37a62f7eb12fabf426e415a
diff --git a/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
index e0263d7e..0d148373 100644
--- a/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: cbea59c2e99a8787840234a716290ff05b6c5bf4 $
+# $Id: b4ea01207a14fa440bed1e21f7d465b2d3a82fe4 $
 
 EAPI=5
 
@@ -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 ~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"
+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="
diff --git a/app-crypt/pinentry/pinentry-1.0.0.ebuild b/app-crypt/pinentry/pinentry-1.0.0.ebuild
index ce671037..329d8bcb 100644
--- a/app-crypt/pinentry/pinentry-1.0.0.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 707d1595c45a5b800ba0d4a47c9c0cd73e4a975d $
+# $Id: 55953287ea1f8f9177937616797f0fae3a7211b0 $
 
-EAPI=5
+EAPI=6
 
 inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
 
@@ -55,10 +55,14 @@ REQUIRED_USE="
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${PN}-0.9.4-configure.ac.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" \
-		   "${FILESDIR}/${PN}-0.9.4-configure.ac.patch"
-	epatch_user
+	default
 	eautoreconf
 }
 
@@ -67,17 +71,16 @@ src_configure() {
 	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
+		myconf+=(
+			--enable-pinentry-qt
+			--disable-pinentry-qt5
+		)
+		export MOC="$(qt4_get_bindir)"/moc
 		export QTLIB="$(qt4_get_libdir)"
 	elif use qt5; then
 		myconf+=( --enable-pinentry-qt )
-		QT_MOC="$(qt5_get_bindir)"/moc
+		export MOC="$(qt5_get_bindir)"/moc
 		export QTLIB="$(qt5_get_libdir)"
 	else
 		myconf+=( --disable-pinentry-qt )
@@ -92,8 +95,7 @@ src_configure() {
 		$(use_with caps libcap) \
 		$(use_enable gnome-keyring libsecret) \
 		$(use_enable gnome-keyring pinentry-gnome3) \
-		"${myconf[@]}" \
-		MOC="${QT_MOC}"
+		"${myconf[@]}"
 }
 
 src_install() {