Use qt4_get_bindir from qmake-utils instead of hardcoding moc path. Fixes #544110

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xFED5002857C1ABFA!

3 files changed, 116 insertions, 9 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 2978830637ea..18b73e7d7a18 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.165 2015/03/01 22:30:54 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.166 2015/03/22 15:09:04 k_f Exp $
+
+*pinentry-0.9.0-r3 (22 Mar 2015)
+
+  22 Mar 2015; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.0-r3.ebuild:
+  Use qt4_get_bindir from qmake-utils instead of hardcoding moc path. Fixes
+  #544110
 
 *pinentry-0.9.0-r2 (01 Mar 2015)
 
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 9d23d659fcc2..a46de89d1518 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -7,16 +7,17 @@ AUX pinentry-0.9.0-accessibility.patch 2587 SHA256 80adf350a7fa17ab7d60b36d1d373
 DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac
 EBUILD pinentry-0.9.0-r1.ebuild 2985 SHA256 b2bc39db7bf74f20cce4f14b8ba194e8e9e2d34b9f68f122c8c0487c62541815 SHA512 b17b889479003a87a663103ed78b25476e2af111a21c5bad416706176da100f3ed632f60906ebcab8fa4f2f122430642a97bf2b2a7f1bf4e5143c5e0d94bf26f WHIRLPOOL 6250f45c5ea2cff95638aa276953d0a43f7889c3d8c16bfbb1d10e151df54021af295f7bb048c235bfdeaeee2039fc0032c7bc81777e4fce759ab3c5705c3974
 EBUILD pinentry-0.9.0-r2.ebuild 3036 SHA256 72a38626c655131dce280a2ce630034a0c0c3a44090636033cb4ce77965c5735 SHA512 d22aa5c6cb6285d2248cb8f04d8314350c371b33fe314f2f84f2eebed90a8259f66b8454eb20e0d51ce1dd555368607a0641009cc4a1d9c8c6b871eae4818ec8 WHIRLPOOL feec856fc383095015ce1756d1aafb33a311d56ee469a4a030efafcd367929f32300ed52f9f187bc412a97ea400e4d598310c37063d4bd2d873da61e3a90be20
+EBUILD pinentry-0.9.0-r3.ebuild 3047 SHA256 dfed48a48a406b51414acfc7ca5dbd713a533c4d4dce78738111d00e6ee3caa7 SHA512 2084121f60faf1bd80b806af46f9756b8536448c85b3d7df899de9c9db319c3e8710118c5ce2bfd0cb3e4379d40d0deac2f1c44242579037ed4ab01463c95eb2 WHIRLPOOL ea18eb624225a5dd2ff009b65be49197643096784f7a2d000935720cc9ecc75c1943fe84f8d97ea951345793d3e4101fef775bbde983918abbf1f215c367da87
 EBUILD pinentry-0.9.0.ebuild 2899 SHA256 e47fabd6a6b36a4653332ee1dc81dce47f94d7606f3ac867f247ec2c5d9b41e5 SHA512 9e6e6b3b75c6c8e276b9996c3d22ca35917a44c2bdf67dac49d46a6762b2988be827af10ff950785f92328424a92e965fb96456bcb365fb40b20585af5579ff4 WHIRLPOOL f94e0084731cd592830a760628a42df75bb9215ee80e8120cc8775cc277568a65ce5eb23fbdd02e64931a415ad0e3eb7a932462e29db43abb7445e13c04f0db7
-MISC ChangeLog 22036 SHA256 dc79386c6bbeda3bd22b8289a411651ddf69a5fd35d59c83c82a05b8fb7304df SHA512 f23bda8681993ba2d8240578c7f4d66fe169d29f0f67c6fc7bb62d2525205e7d41a13e585f0052dd0e1f8f2e2f3a07d86bdbaa528c78389499434100677e90ed WHIRLPOOL c201894d4343562d2de881b74144e305cf448c430fa576df9fcee53880fb4ca64f4a518485d358dd7e1f5c8a3108c30def7ce6eb71dbbbba96293bfd6b440c6f
+MISC ChangeLog 22238 SHA256 e0bd4ae6cc32570d784a4e661db676ea329eb1261be9c0bf079016c173dafbad SHA512 286bfc7494c139f4420ef3edb0a8b1465e147a3e8d046947cd448928e1d583c310bdbbd69f3a5586de6467e9032ce12e6da5471ffbb1821c8b23718461c7aeb5 WHIRLPOOL bdeb0aa5e04daf0672a4f19a739fa9ff748b0697c5a871e4da23b52f4b53623368a7b02494225713eb7e6642b9a4528fe8540d2416479853fba4a87b5afc27f5
 MISC metadata.xml 232 SHA256 0f9362f8e4539dec9b2feb1bd93d34e4dff44290f4dac44dd50f9d44de62360e SHA512 79b3d9679dd2d61479a24ef159f6a23758dad2b77679824bae7758c8f47375b4548e0adf135b3dae5c6d6eff23d134f9477a06fd29789d4fb98670431670bb01 WHIRLPOOL 2ac86da5a1d1512f358400d0616ca3baba6ad55d68ad68296975192cf4f60ed55a3faefe0c3290720d61f117e6c8b24b37cd017e8b8c21c77f977dda8d3212fa
 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAEBCAAGBQJU85MfAAoJEP7VAChXwav68ucIAJUINa2EmHH+akN+DfFtR2Vs
-tStJF4UJ3//mTUUJjZthLMqP6KnhOJ20ADAA1R0HDa1LVXL6dhxHDmGS/OCyNY8U
-CYLfr8oNSAn057QaSkV2Pxz5PideHPEM0cYrjHjVV50G91CaZqhfNnOhGhfk4Mbu
-s5/vTAGFEgL/hkm0Fd90eCjuf2AzgZpaZpwmF7l2TRsJLjjXBw3GvSJ5FfiE1zPw
-nSOst1MoW/cCI8LQN9GmOwwTYuO2MlikYYJKNwBmTKnS9tWGTmoTWPxAQ+MD/iaX
-yUmTaaIUafBSiaFVoFfhtL6aM8SEtipBymvWA/ZJuNhrJN8KhljOa8rETVoCRXM=
-=Bw+X
+iQEcBAEBCAAGBQJVDtsRAAoJEP7VAChXwav6eVEH/i75HmHNY/Qy24tdaSImUYU2
+AhJUobG6RDRjDSndh0gYenVenrKFOelahSlNeP1YiUqUaKTE1JfZTH4No1wGlkKE
+gXwHzlYqPp+7XLZbm0JizkePMC0XdArm9mWTMXKaMDnYUI2ToP33w2Mu/pTM7djE
+fu++vmwsoB6OGhLMp9O6Kxl0EvSMEhx5WgduNinzG2A4/MeNeptuK3sAx0+OswqN
+ns/hM9LNmNk0FDMWQbug9HokkIDOJ4YAoCuKZHz3B92WNGe48DHjmQ3kaxOuYxqt
+xI5U2fJcTtv1pSx2FrgjTQQOMw8fQjdWt/KNKLESVjS7NZKrXeZp9A4ID/nlNFI=
+=YAIE
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild b/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild
new file mode 100644
index 000000000000..a8d9bcbf1291
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild,v 1.1 2015/03/22 15:09:04 k_f Exp $
+
+EAPI=5
+
+inherit qmake-utils autotools multilib eutils flag-o-matic
+
+DESCRIPTION="Collection of simple PIN or 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="clipboard gtk ncurses qt4 caps static"
+
+RDEPEND="
+	app-admin/eselect-pinentry
+	caps? ( sys-libs/libcap )
+	gtk? ( x11-libs/gtk+:2 )
+	ncurses? ( sys-libs/ncurses )
+	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
+	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	gtk? ( virtual/pkgconfig )
+	qt4? ( virtual/pkgconfig )
+	ppc-aix? ( dev-libs/gnulib )
+"
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 )
+	gtk? ( !static )
+	qt4? ( !static )
+	static? ( ncurses )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	if use qt4; then
+		local f
+		for f in qt4/*.moc; do
+			"$(qt4_get_bindir)"/moc ${f/.moc/.h} > ${f} || die
+		done
+	fi
+	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	epatch "${FILESDIR}/${PN}-0.8.2-texi.patch"
+	epatch "${FILESDIR}/${PN}-0.9.0-accessibility.patch"
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	if [[ ${CHOST} == *-aix* ]] ; then
+		append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include"
+		append-ldflags -L"${EPREFIX}/usr/$(get_libdir)/gnulib/$(get_libdir)"
+		append-libs -lgnu
+	fi
+
+	# Issues finding qt on multilib systems
+	export QTLIB="${QTDIR}/$(get_libdir)"
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable qt4 pinentry-qt4) \
+		$(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \
+		$(use_with caps libcap)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+}
+
+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
+}