From e94910679972a184dfd4057a7ccd4e01c91ad3d7 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Mon, 22 Aug 2011 22:36:15 +0200
Subject: [PATCH] [app-crypt/pinentry*] provide app-crypt/pinentry-base and use
 app-crypt/pinentry as meta package

---
 app-crypt/pinentry-base/Manifest              |  2 +
 .../pinentry-base-0.8.1.ebuild}               | 41 +++++++-----
 app-crypt/pinentry-gtk2/Manifest              |  6 +-
 .../pinentry-gtk2/pinentry-gtk2-0.7.6.ebuild  | 40 ------------
 .../pinentry-gtk2/pinentry-gtk2-0.8.0.ebuild  | 40 ------------
 .../pinentry-gtk2/pinentry-gtk2-0.8.1.ebuild  | 13 ++--
 app-crypt/pinentry-qt4/Manifest               |  6 +-
 .../pinentry-qt4/pinentry-qt4-0.7.6.ebuild    | 46 -------------
 .../pinentry-qt4/pinentry-qt4-0.8.0.ebuild    | 46 -------------
 .../pinentry-qt4/pinentry-qt4-0.8.1.ebuild    | 14 ++--
 app-crypt/pinentry/Manifest                   |  7 +-
 app-crypt/pinentry/pinentry-0.8.0.ebuild      | 50 ---------------
 app-crypt/pinentry/pinentry-0.8.1.ebuild      | 64 +++++--------------
 13 files changed, 64 insertions(+), 311 deletions(-)
 create mode 100644 app-crypt/pinentry-base/Manifest
 rename app-crypt/{pinentry/pinentry-0.7.6.ebuild => pinentry-base/pinentry-base-0.8.1.ebuild} (55%)
 delete mode 100644 app-crypt/pinentry-gtk2/pinentry-gtk2-0.7.6.ebuild
 delete mode 100644 app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.0.ebuild
 delete mode 100644 app-crypt/pinentry-qt4/pinentry-qt4-0.7.6.ebuild
 delete mode 100644 app-crypt/pinentry-qt4/pinentry-qt4-0.8.0.ebuild
 delete mode 100644 app-crypt/pinentry/pinentry-0.8.0.ebuild

diff --git a/app-crypt/pinentry-base/Manifest b/app-crypt/pinentry-base/Manifest
new file mode 100644
index 000000000..75fad3197
--- /dev/null
+++ b/app-crypt/pinentry-base/Manifest
@@ -0,0 +1,2 @@
+DIST pinentry-0.8.1.tar.gz 504101 RMD160 e36e34bfa2472094503c7809259f37abcc5fb2e8 SHA1 84a6940175b552a8562b4014f4661dec3ff10165 SHA256 3e17e1d410686d197f96b61b04e3fad28bd6bcb029077bdfd902780934de9132
+EBUILD pinentry-base-0.8.1.ebuild 1846 RMD160 8c611f1f680bce2e0b68908acd9a8471c12da55e SHA1 2dd2af856da00a5a7dc121103cc65ba701146fd2 SHA256 2971cda3f913013a4334efe696969cd829c070376b60e6dd0791aa420349af80
diff --git a/app-crypt/pinentry/pinentry-0.7.6.ebuild b/app-crypt/pinentry-base/pinentry-base-0.8.1.ebuild
similarity index 55%
rename from app-crypt/pinentry/pinentry-0.7.6.ebuild
rename to app-crypt/pinentry-base/pinentry-base-0.8.1.ebuild
index 7205ed7d2..8155cb733 100644
--- a/app-crypt/pinentry/pinentry-0.7.6.ebuild
+++ b/app-crypt/pinentry-base/pinentry-base-0.8.1.ebuild
@@ -1,27 +1,31 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=3
 
-inherit multilib eutils
-
 DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="http://www.gnupg.org/aegypten/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P/-base}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-# gtk and qt4 are fake use flags
-IUSE="gtk qt4 caps"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps static"
 
-DEPEND="sys-libs/ncurses sys-libs/libcap"
-RDEPEND="${DEPEND}"
+RDEPEND="app-admin/eselect-pinentry
+	static? ( >=sys-libs/ncurses-5.7-r5[static-libs] )
+	!static? ( sys-libs/ncurses )
+	caps? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${P/-base}"
+
+pkg_setup() {
+	use static && append-ldflags -static
+}
 
 src_configure() {
-
-	econf \
+		econf \
 		--disable-dependency-tracking \
 		--enable-maintainer-mode \
 		--disable-pinentry-gtk \
@@ -34,17 +38,24 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	rm -f "${D}"/usr/bin/pinentry || die
 }
 
 pkg_postinst() {
+	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."
-	use gtk && elog "If you want pinentry for GTK, please install app-crypt/pinentry-gtk."
+	eselect pinentry update ifunset
+	use gtk && elog "If you want pinentry for Gtk+, please install app-crypt/pinentry-gtk."
 	use qt4 && elog "If you want pinentry for Qt4, please install app-crypt/pinentry-qt4."
 }
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
diff --git a/app-crypt/pinentry-gtk2/Manifest b/app-crypt/pinentry-gtk2/Manifest
index f67b71fd6..f23cf8983 100644
--- a/app-crypt/pinentry-gtk2/Manifest
+++ b/app-crypt/pinentry-gtk2/Manifest
@@ -1,7 +1,3 @@
 AUX pinentry-0.7.5-grab.patch 536 RMD160 66f86ff0c8c208ec62de1dea2b2c3edeca41d0fb SHA1 cbb4a01242ce73ebb18c38d9541f03017691a265 SHA256 149fadfa505e55fa4f4e1fb5536066b87290566df4d890e6f4087d86f213188a
-DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab
-DIST pinentry-0.8.0.tar.gz 487629 RMD160 966e830fb86c1820057979f581ca71f82a4fc9e0 SHA1 381f9ee47b9f198e1be5d3ec4e043067a7e97912 SHA256 426c7ff9ca7d147d21243dffd72e844d84c1f593e323f1d207ee19bdded0f01a
 DIST pinentry-0.8.1.tar.gz 504101 RMD160 e36e34bfa2472094503c7809259f37abcc5fb2e8 SHA1 84a6940175b552a8562b4014f4661dec3ff10165 SHA256 3e17e1d410686d197f96b61b04e3fad28bd6bcb029077bdfd902780934de9132
-EBUILD pinentry-gtk2-0.7.6.ebuild 1092 RMD160 1ba7b1c6773df4b70c83f872c6ea2d8f559a20d7 SHA1 e8ab5b81eac9a1bafd42010e1751030ba6af08ae SHA256 18570914b9b5cb5e7efaf0c01fad8214fcb91ad8e7aed20d2a415ebb755e754e
-EBUILD pinentry-gtk2-0.8.0.ebuild 1092 RMD160 1ba7b1c6773df4b70c83f872c6ea2d8f559a20d7 SHA1 e8ab5b81eac9a1bafd42010e1751030ba6af08ae SHA256 18570914b9b5cb5e7efaf0c01fad8214fcb91ad8e7aed20d2a415ebb755e754e
-EBUILD pinentry-gtk2-0.8.1.ebuild 1079 RMD160 a3b9d7dca0f357ceb4874d16d981aaf5a74c85e9 SHA1 18934b77f9cf6c3bdb2b2530dd9cce604d2f7e4b SHA256 4d090270f7e16363d90993d3624c273210b30431b4f26fa7f9480de5f5b79afa
+EBUILD pinentry-gtk2-0.8.1.ebuild 1139 RMD160 cfda9aa9c68ad400b8aa50287157ad2e72154ee9 SHA1 098a4040e1182e96f6a5a63e307f4b44496a0c42 SHA256 3970a37c773d60707b31e1eae378f498115abb5a11d247c10c2f32bdf7a595b7
diff --git a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.7.6.ebuild b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.7.6.ebuild
deleted file mode 100644
index a68b3a318..000000000
--- a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.7.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit multilib eutils
-
-DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol (GTK 2 frontend)"
-HOMEPAGE="http://www.gnupg.org/aegypten/"
-SRC_URI="mirror://gnupg/${PN/-gtk2}/${P/-gtk2}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~app-crypt/pinentry-${PV} x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${P/-gtk2}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN/-gtk2}-0.7.5-grab.patch"
-}
-
-src_configure() {
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-maintainer-mode \
-		--disable-pinentry-gtk \
-		--enable-pinentry-gtk2 \
-		--disable-pinentry-curses \
-		--disable-pinentry-qt \
-		--disable-pinentry-qt4
-}
-
-src_install() {
-	cd gtk+-2 && emake DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.0.ebuild b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.0.ebuild
deleted file mode 100644
index a68b3a318..000000000
--- a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit multilib eutils
-
-DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol (GTK 2 frontend)"
-HOMEPAGE="http://www.gnupg.org/aegypten/"
-SRC_URI="mirror://gnupg/${PN/-gtk2}/${P/-gtk2}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~app-crypt/pinentry-${PV} x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${P/-gtk2}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN/-gtk2}-0.7.5-grab.patch"
-}
-
-src_configure() {
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-maintainer-mode \
-		--disable-pinentry-gtk \
-		--enable-pinentry-gtk2 \
-		--disable-pinentry-curses \
-		--disable-pinentry-qt \
-		--disable-pinentry-qt4
-}
-
-src_install() {
-	cd gtk+-2 && emake DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.1.ebuild b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.1.ebuild
index 58b92acd5..d506be9f6 100644
--- a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.1.ebuild
+++ b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.1.ebuild
@@ -15,17 +15,20 @@ SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="caps"
+IUSE="caps static"
 
-RDEPEND="~app-crypt/pinentry-${PV}
-	app-admin/eselect-pinentry
-	x11-libs/gtk+:2
-	caps? ( sys-libs/libcap )"
+RDEPEND="~app-crypt/pinentry-base-${PV}
+	caps? ( ~app-crypt/pinentry-base-${PV}[caps] )
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	use static && append-ldflags -static
+}
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
diff --git a/app-crypt/pinentry-qt4/Manifest b/app-crypt/pinentry-qt4/Manifest
index 31d104fb6..b557e3719 100644
--- a/app-crypt/pinentry-qt4/Manifest
+++ b/app-crypt/pinentry-qt4/Manifest
@@ -1,6 +1,2 @@
-DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab
-DIST pinentry-0.8.0.tar.gz 487629 RMD160 966e830fb86c1820057979f581ca71f82a4fc9e0 SHA1 381f9ee47b9f198e1be5d3ec4e043067a7e97912 SHA256 426c7ff9ca7d147d21243dffd72e844d84c1f593e323f1d207ee19bdded0f01a
 DIST pinentry-0.8.1.tar.gz 504101 RMD160 e36e34bfa2472094503c7809259f37abcc5fb2e8 SHA1 84a6940175b552a8562b4014f4661dec3ff10165 SHA256 3e17e1d410686d197f96b61b04e3fad28bd6bcb029077bdfd902780934de9132
-EBUILD pinentry-qt4-0.7.6.ebuild 1262 RMD160 2135d0503fd750b47975080676657f07ef5f54f3 SHA1 1b367bb357835e4f430b82fdcbb10302cca57e16 SHA256 6e78ffd297ed8ca8fe1670105e8a8711990525c599ac4a508a1ccda5af094563
-EBUILD pinentry-qt4-0.8.0.ebuild 1262 RMD160 2135d0503fd750b47975080676657f07ef5f54f3 SHA1 1b367bb357835e4f430b82fdcbb10302cca57e16 SHA256 6e78ffd297ed8ca8fe1670105e8a8711990525c599ac4a508a1ccda5af094563
-EBUILD pinentry-qt4-0.8.1.ebuild 1242 RMD160 0096eeea763bd25e2da7c8659e9631109c9dec58 SHA1 61de66d7f3ced6c0b572e6cdfddf057492d61ff4 SHA256 231c800bb2bc4b9f71806a663afda4b98689ba35a29f3466f84db20b042afde5
+EBUILD pinentry-qt4-0.8.1.ebuild 1354 RMD160 079931f27ac2980f66f194aa54eb263baa163343 SHA1 bb8c98c00c6d0201fce574dcb30e0a6f7753155f SHA256 01321b971dd48260f3ea0b8714a9d998e0c05a7c48a80e1375b7b7e424aeffa2
diff --git a/app-crypt/pinentry-qt4/pinentry-qt4-0.7.6.ebuild b/app-crypt/pinentry-qt4/pinentry-qt4-0.7.6.ebuild
deleted file mode 100644
index f469a871a..000000000
--- a/app-crypt/pinentry-qt4/pinentry-qt4-0.7.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit multilib eutils
-
-DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol (Qt4 frontend)"
-HOMEPAGE="http://www.gnupg.org/aegypten/"
-SRC_URI="mirror://gnupg/${PN/-qt4}/${P/-qt4}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~app-crypt/pinentry-${PV} >=x11-libs/qt-gui-4.4.1"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${P/-qt4}"
-
-src_prepare() {
-	local file
-	for file in qt4/*.moc; do
-		"${EPREFIX}"/usr/bin/moc ${file/.moc/.h} > ${file} || die "moc ${file} failed"
-	done
-}
-
-src_configure() {
-
-        # Issues finding qt on multilib systems
-        export QTLIB="${QTDIR}/$(get_libdir)"
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-maintainer-mode \
-		--disable-pinentry-gtk \
-		--disable-pinentry-gtk2 \
-		--disable-pinentry-curses \
-		--disable-pinentry-qt \
-		--enable-pinentry-qt4
-}
-
-src_install() {
-	cd qt4 && emake DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/app-crypt/pinentry-qt4/pinentry-qt4-0.8.0.ebuild b/app-crypt/pinentry-qt4/pinentry-qt4-0.8.0.ebuild
deleted file mode 100644
index f469a871a..000000000
--- a/app-crypt/pinentry-qt4/pinentry-qt4-0.8.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit multilib eutils
-
-DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol (Qt4 frontend)"
-HOMEPAGE="http://www.gnupg.org/aegypten/"
-SRC_URI="mirror://gnupg/${PN/-qt4}/${P/-qt4}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~app-crypt/pinentry-${PV} >=x11-libs/qt-gui-4.4.1"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${P/-qt4}"
-
-src_prepare() {
-	local file
-	for file in qt4/*.moc; do
-		"${EPREFIX}"/usr/bin/moc ${file/.moc/.h} > ${file} || die "moc ${file} failed"
-	done
-}
-
-src_configure() {
-
-        # Issues finding qt on multilib systems
-        export QTLIB="${QTDIR}/$(get_libdir)"
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-maintainer-mode \
-		--disable-pinentry-gtk \
-		--disable-pinentry-gtk2 \
-		--disable-pinentry-curses \
-		--disable-pinentry-qt \
-		--enable-pinentry-qt4
-}
-
-src_install() {
-	cd qt4 && emake DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/app-crypt/pinentry-qt4/pinentry-qt4-0.8.1.ebuild b/app-crypt/pinentry-qt4/pinentry-qt4-0.8.1.ebuild
index 5ccf87d9c..3f3e2de4d 100644
--- a/app-crypt/pinentry-qt4/pinentry-qt4-0.8.1.ebuild
+++ b/app-crypt/pinentry-qt4/pinentry-qt4-0.8.1.ebuild
@@ -15,17 +15,21 @@ SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="caps"
+IUSE="caps static"
 
-RDEPEND="~app-crypt/pinentry-${PV}
-	app-admin/eselect-pinentry
-	>=x11-libs/qt-gui-4.4.1
-	caps? ( sys-libs/libcap )"
+RDEPEND="~app-crypt/pinentry-base-${PV}
+	caps? ( ~app-crypt/pinentry-base-${PV}[caps] )
+	static? ( ~app-crypt/pinentry-base-${PV}[static] )
+	>=x11-libs/qt-gui-4.4.1"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	use static && append-ldflags -static
+}
+
 src_prepare() {
 	local file
 	for file in qt4/*.moc; do
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 13287dcd9..41c836516 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,6 +1 @@
-DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab
-DIST pinentry-0.8.0.tar.gz 487629 RMD160 966e830fb86c1820057979f581ca71f82a4fc9e0 SHA1 381f9ee47b9f198e1be5d3ec4e043067a7e97912 SHA256 426c7ff9ca7d147d21243dffd72e844d84c1f593e323f1d207ee19bdded0f01a
-DIST pinentry-0.8.1.tar.gz 504101 RMD160 e36e34bfa2472094503c7809259f37abcc5fb2e8 SHA1 84a6940175b552a8562b4014f4661dec3ff10165 SHA256 3e17e1d410686d197f96b61b04e3fad28bd6bcb029077bdfd902780934de9132
-EBUILD pinentry-0.7.6.ebuild 1722 RMD160 9962ac30200c449d98b00dd31ffd091d8f8f659f SHA1 25567443ea0d0f690aca24885364af60cef6f923 SHA256 aa2f872865a03e80e4829e1ebb77c9235f462121c2debe69e8b72ff55f3112b6
-EBUILD pinentry-0.8.0.ebuild 1722 RMD160 9962ac30200c449d98b00dd31ffd091d8f8f659f SHA1 25567443ea0d0f690aca24885364af60cef6f923 SHA256 aa2f872865a03e80e4829e1ebb77c9235f462121c2debe69e8b72ff55f3112b6
-EBUILD pinentry-0.8.1.ebuild 1871 RMD160 b37e8c47c068567b46900d052ba725d755e96894 SHA1 911099c15da986d3e18dd8cd815877344303e4d3 SHA256 ee5d7bf55f4d7f48566528a11c9a2033dcd585263c9236bfc6a5d5a61784e226
+EBUILD pinentry-0.8.1.ebuild 811 RMD160 911eb4c9ef12ade1ba4782bcab6c3bb13ce465c0 SHA1 c885d060566ff19746a7fb767d02b6b6a610a3e6 SHA256 9303c612005dd0ddd769837e497c341b0da402652a0eda23148f71f837ddd676
diff --git a/app-crypt/pinentry/pinentry-0.8.0.ebuild b/app-crypt/pinentry/pinentry-0.8.0.ebuild
deleted file mode 100644
index 7205ed7d2..000000000
--- a/app-crypt/pinentry/pinentry-0.8.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit multilib eutils
-
-DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="http://www.gnupg.org/aegypten/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-# gtk and qt4 are fake use flags
-IUSE="gtk qt4 caps"
-
-DEPEND="sys-libs/ncurses sys-libs/libcap"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-maintainer-mode \
-		--disable-pinentry-gtk \
-		--disable-pinentry-gtk2 \
-		--disable-pinentry-qt \
-		--enable-pinentry-curses \
-		--enable-fallback-curses \
-		--disable-pinentry-qt4 \
-		$(use_with caps libcap)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
-}
-
-pkg_postinst() {
-	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."
-	use gtk && elog "If you want pinentry for GTK, please install app-crypt/pinentry-gtk."
-	use qt4 && elog "If you want pinentry for Qt4, please install app-crypt/pinentry-qt4."
-}
diff --git a/app-crypt/pinentry/pinentry-0.8.1.ebuild b/app-crypt/pinentry/pinentry-0.8.1.ebuild
index 7e051a0e3..415eccce4 100644
--- a/app-crypt/pinentry/pinentry-0.8.1.ebuild
+++ b/app-crypt/pinentry/pinentry-0.8.1.ebuild
@@ -4,58 +4,26 @@
 
 EAPI=3
 
-DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol (meta package)"
 HOMEPAGE="http://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-# ncurses, gtk and q4 are fake USE flags
+# ncurses use flag is fake, used to mimic portage ebuild USE flags
 IUSE="gtk ncurses qt4 caps static"
 
-RDEPEND="app-admin/eselect-pinentry
-	static? ( >=sys-libs/ncurses-5.7-r5[static-libs] )
-	!static? ( sys-libs/ncurses )
-	caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use static && append-ldflags -static
-}
-
-src_configure() {
-		econf \
-		--disable-dependency-tracking \
-		--enable-maintainer-mode \
-		--disable-pinentry-gtk \
-		--disable-pinentry-gtk2 \
-		--disable-pinentry-qt \
-		--enable-pinentry-curses \
-		--enable-fallback-curses \
-		--disable-pinentry-qt4 \
-		$(use_with caps libcap)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	rm -f "${D}"/usr/bin/pinentry || die
-}
-
-pkg_postinst() {
-	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."
-	eselect pinentry update ifunset
-	use gtk && elog "If you want pinentry for Gtk+, please install app-crypt/pinentry-gtk."
-	use qt4 && elog "If you want pinentry for Qt4, please install app-crypt/pinentry-qt4."
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}
+RDEPEND="
+	caps? ( ~app-crypt/pinentry-base-${PV}[caps] )
+	static? (
+		~app-crypt/pinentry-base-${PV}[static]
+		gtk? ( ~app-crypt/pinentry-gtk2-${PV}[static] )
+		qt4? ( ~app-crypt/pinentry-qt4-${PV}[static] )
+	)
+	!static? (
+		~app-crypt/pinentry-base-${PV}
+		gtk? ( ~app-crypt/pinentry-gtk2-${PV} )
+		qt4? ( ~app-crypt/pinentry-qt4-${PV} )
+	)"
+DEPEND=""