diff --git a/app-crypt/pinentry-base/Manifest b/app-crypt/pinentry-base/Manifest
index c352dbda9..f015e9ec6 100644
--- a/app-crypt/pinentry-base/Manifest
+++ b/app-crypt/pinentry-base/Manifest
@@ -1,2 +1 @@
-DIST pinentry-0.8.1.tar.gz 504101 RMD160 e36e34bfa2472094503c7809259f37abcc5fb2e8 SHA1 84a6940175b552a8562b4014f4661dec3ff10165 SHA256 3e17e1d410686d197f96b61b04e3fad28bd6bcb029077bdfd902780934de9132
-EBUILD pinentry-base-0.8.1.ebuild 1851 RMD160 f53457cb6535a56e8a3018db0382089e36f96475 SHA1 da81f12fc4614f66999118ffc8d8e09077fb500c SHA256 3b82603de77de22dd8cb81de154ecce91aa3c9c69ea0b83867697dc238f57c55
+DIST pinentry-0.8.2.tar.bz2 428514 SHA256 5084b7b6aac5725303f3b0185f126daa8b33ee78ade538edf1e20034594a39b1 SHA512 f012ed163b8905e10714e8667a4434eb192e9519e0fa91a686b097224252bf2e73c3b35d682b6fd4a9df80eefcb3afbf2ec763aef58a3ab5a1e71268fd83e158 WHIRLPOOL 0a17bf30390895dddbaad14bcf07b3064fb7e3c1ed97ba22231e13201f24cfc194a8ef110da7316f137ed3942c094c1990aa51a80b352c5572748b42f40a77d7
diff --git a/app-crypt/pinentry-base/pinentry-base-0.8.1.ebuild b/app-crypt/pinentry-base/pinentry-base-0.8.1.ebuild
deleted file mode 100644
index 51b975e30..000000000
--- a/app-crypt/pinentry-base/pinentry-base-0.8.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-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/-base}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~x86"
-IUSE="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}"
-S="${WORKDIR}/${P/-base}"
-
-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
-}
diff --git a/app-crypt/pinentry-base/pinentry-base-0.8.2.ebuild b/app-crypt/pinentry-base/pinentry-base-0.8.2.ebuild
new file mode 100644
index 000000000..0483677e8
--- /dev/null
+++ b/app-crypt/pinentry-base/pinentry-base-0.8.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils flag-o-matic
+
+MY_PN=${PN/-base}
+MY_P=${P/-base}
+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/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~x86"
+IUSE="gtk qt4 caps static"
+
+RDEPEND="
+	app-admin/eselect-pinentry
+	caps? ( sys-libs/libcap )
+	sys-libs/ncurses
+	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_configure() {
+	use static && append-ldflags -static
+
+	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) \
+		--without-x
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+}
+
+pkg_postinst() {
+	if ! has_version 'app-crypt/pinentry-base'; then
+		# || 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
+	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 908f7fef7..f015e9ec6 100644
--- a/app-crypt/pinentry-gtk2/Manifest
+++ b/app-crypt/pinentry-gtk2/Manifest
@@ -1,4 +1 @@
-AUX pinentry-0.7.5-grab.patch 536 RMD160 66f86ff0c8c208ec62de1dea2b2c3edeca41d0fb SHA1 cbb4a01242ce73ebb18c38d9541f03017691a265 SHA256 149fadfa505e55fa4f4e1fb5536066b87290566df4d890e6f4087d86f213188a
-DIST pinentry-0.8.1.tar.gz 504101 RMD160 e36e34bfa2472094503c7809259f37abcc5fb2e8 SHA1 84a6940175b552a8562b4014f4661dec3ff10165 SHA256 3e17e1d410686d197f96b61b04e3fad28bd6bcb029077bdfd902780934de9132
-EBUILD pinentry-gtk2-0.8.1-r1.ebuild 1183 RMD160 44b6b59da28ea031efe1b83169364d67f2e303a1 SHA1 1f6658f76fd510971c04330cf111210c044f4ef2 SHA256 31cc28f0d7f8a114ddb28cd5e7aec844a80c1625a0deb70d61fd5d0e521464fd
-EBUILD pinentry-gtk2-0.8.1.ebuild 1144 RMD160 f06cf23faaa69c2052ea39dd6547205ce50988ce SHA1 c3659f3c43535bd54f64f104b7630eedf0decaed SHA256 2504b6f02810bdb2bd26eb76a8f20ae967ac3b1a8c3e50256308dc90b0afaad4
+DIST pinentry-0.8.2.tar.bz2 428514 SHA256 5084b7b6aac5725303f3b0185f126daa8b33ee78ade538edf1e20034594a39b1 SHA512 f012ed163b8905e10714e8667a4434eb192e9519e0fa91a686b097224252bf2e73c3b35d682b6fd4a9df80eefcb3afbf2ec763aef58a3ab5a1e71268fd83e158 WHIRLPOOL 0a17bf30390895dddbaad14bcf07b3064fb7e3c1ed97ba22231e13201f24cfc194a8ef110da7316f137ed3942c094c1990aa51a80b352c5572748b42f40a77d7
diff --git a/app-crypt/pinentry-gtk2/files/pinentry-0.7.5-grab.patch b/app-crypt/pinentry-gtk2/files/pinentry-0.7.5-grab.patch
deleted file mode 100644
index 7cd3d96cd..000000000
--- a/app-crypt/pinentry-gtk2/files/pinentry-0.7.5-grab.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- pinentry/gtk+-2/pinentry-gtk-2.c
-+++ pinentry/gtk+-2/pinentry-gtk-2.c
-@@ -261,10 +261,10 @@ create_window (int confirm_mode)
-   if (!confirm_mode)
-     {
-       g_signal_connect (G_OBJECT (win),
--			pinentry->grab ? "map-event" : "focus-in-event",
-+			"focus-in-event",
- 			G_CALLBACK (grab_keyboard), NULL);
-       g_signal_connect (G_OBJECT (win),
--			pinentry->grab ? "unmap-event" : "focus-out-event",
-+			"focus-out-event",
- 			G_CALLBACK (ungrab_keyboard), NULL);
-     }
-   gtk_window_add_accel_group (GTK_WINDOW (win), acc);
diff --git a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.1.ebuild b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.1.ebuild
deleted file mode 100644
index f4f9adb45..000000000
--- a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit multilib eutils flag-o-matic
-
-MY_PN=${PN/-gtk2}
-MY_P=${P/-gtk2}
-DESCRIPTION="Gtk+2 frontend for pinentry" # less than 100 chars!
-HOMEPAGE="http://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~x86"
-IUSE="caps static"
-
-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 \
-		--enable-maintainer-mode \
-		--disable-pinentry-gtk \
-		--enable-pinentry-gtk2 \
-		--disable-pinentry-qt \
-		--disable-pinentry-curses \
-		--disable-fallback-curses \
-		--disable-pinentry-qt4 \
-		$(use_with caps libcap)
-}
-
-src_install() {
-	cd gtk+-2 && emake DESTDIR="${D}" install || die "make install failed"
-}
-
-pkg_postinst() {
-	eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.1-r1.ebuild b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.2.ebuild
similarity index 58%
rename from app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.1-r1.ebuild
rename to app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.2.ebuild
index 7aa902097..151c1c1be 100644
--- a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.1-r1.ebuild
+++ b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.2.ebuild
@@ -1,34 +1,33 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 
-inherit multilib eutils flag-o-matic
+inherit eutils flag-o-matic
 
 MY_PN=${PN/-gtk2}
 MY_P=${P/-gtk2}
-DESCRIPTION="Gtk+2 frontend for pinentry" # less than 100 chars!
+DESCRIPTION="Gtk+2 frontend for pinentry"
 HOMEPAGE="http://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
-IUSE="caps static"
+IUSE="caps"
 
-RDEPEND="~app-crypt/pinentry-base-${PV}
-	caps? ( ~app-crypt/pinentry-base-${PV}[caps] )
-	x11-libs/gtk+:2"
+RDEPEND="
+	~app-crypt/pinentry-base-${PV}
+	!app-crypt/pinentry-base[static]
+	caps? ( sys-libs/libcap )
+	x11-libs/gtk+:2
+"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	use static && append-ldflags -static
-}
-
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
@@ -39,11 +38,16 @@ src_configure() {
 		--disable-pinentry-curses \
 		--disable-fallback-curses \
 		--disable-pinentry-qt4 \
-		$(use_with caps libcap)
+		$(use_with caps libcap) \
+		--without-x
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
-	cd gtk+-2 && emake DESTDIR="${D}" install || die "make install failed"
+	cd gtk+-2 && emake DESTDIR="${D}" install
 }
 
 pkg_postinst() {
diff --git a/app-crypt/pinentry-qt4/Manifest b/app-crypt/pinentry-qt4/Manifest
index b50c6a34f..f015e9ec6 100644
--- a/app-crypt/pinentry-qt4/Manifest
+++ b/app-crypt/pinentry-qt4/Manifest
@@ -1,3 +1 @@
-DIST pinentry-0.8.1.tar.gz 504101 RMD160 e36e34bfa2472094503c7809259f37abcc5fb2e8 SHA1 84a6940175b552a8562b4014f4661dec3ff10165 SHA256 3e17e1d410686d197f96b61b04e3fad28bd6bcb029077bdfd902780934de9132
-EBUILD pinentry-qt4-0.8.1-r1.ebuild 1396 RMD160 b1da0e7f41c0318b8b4110a9c24c7c4600549e8c SHA1 6dba2757c017281ad7c7b2f6ac2aa18c50e537ca SHA256 fe26964b0c43aff13cba83589765a157058a36e19462efb9114a1c73260ca6ee
-EBUILD pinentry-qt4-0.8.1.ebuild 1359 RMD160 5fd216f3c1de064ec1696adb2402201fcdcb89a4 SHA1 803683c810f0d2c2a546829591415ebaf4e180a8 SHA256 185c8dbd6cb98f5087ca252dc37cfbb2c11fa65bc50bcbcdf392b8dd5c67ca20
+DIST pinentry-0.8.2.tar.bz2 428514 SHA256 5084b7b6aac5725303f3b0185f126daa8b33ee78ade538edf1e20034594a39b1 SHA512 f012ed163b8905e10714e8667a4434eb192e9519e0fa91a686b097224252bf2e73c3b35d682b6fd4a9df80eefcb3afbf2ec763aef58a3ab5a1e71268fd83e158 WHIRLPOOL 0a17bf30390895dddbaad14bcf07b3064fb7e3c1ed97ba22231e13201f24cfc194a8ef110da7316f137ed3942c094c1990aa51a80b352c5572748b42f40a77d7
diff --git a/app-crypt/pinentry-qt4/pinentry-qt4-0.8.1.ebuild b/app-crypt/pinentry-qt4/pinentry-qt4-0.8.1.ebuild
deleted file mode 100644
index 70b7030ae..000000000
--- a/app-crypt/pinentry-qt4/pinentry-qt4-0.8.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit multilib
-
-MY_PN=${PN/-qt4}
-MY_P=${P/-qt4}
-DESCRIPTION="Qt4 frontend for pinentry"
-HOMEPAGE="http://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~x86"
-IUSE="caps static"
-
-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
-		"${EPREFIX}"/usr/bin/moc ${file/.moc/.h} > ${file} || die
-	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-qt \
-		--disable-pinentry-curses \
-		--disable-fallback-curses \
-		--enable-pinentry-qt4 \
-		$(use_with caps libcap)
-}
-
-src_install() {
-	cd qt4 && emake DESTDIR="${D}" install || die "make install failed"
-}
-
-pkg_postinst() {
-	eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry-qt4/pinentry-qt4-0.8.1-r1.ebuild b/app-crypt/pinentry-qt4/pinentry-qt4-0.8.2.ebuild
similarity index 57%
rename from app-crypt/pinentry-qt4/pinentry-qt4-0.8.1-r1.ebuild
rename to app-crypt/pinentry-qt4/pinentry-qt4-0.8.2.ebuild
index 9c1279fb7..8eace93b1 100644
--- a/app-crypt/pinentry-qt4/pinentry-qt4-0.8.1-r1.ebuild
+++ b/app-crypt/pinentry-qt4/pinentry-qt4-0.8.2.ebuild
@@ -1,40 +1,41 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 
-inherit multilib
+inherit multilib eutils flag-o-matic
 
 MY_PN=${PN/-qt4}
 MY_P=${P/-qt4}
 DESCRIPTION="Qt4 frontend for pinentry"
 HOMEPAGE="http://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
-IUSE="caps static"
+IUSE="caps"
 
-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"
+RDEPEND="
+	~app-crypt/pinentry-base-${PV}
+	!app-crypt/pinentry-base[static]
+	caps? ( sys-libs/libcap )
+	>=x11-libs/qt-gui-4.4.1:4
+"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig
+"
 
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use static && append-ldflags -static
-}
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	local file
-	for file in qt4/*.moc; do
-		"${EPREFIX}"/usr/bin/moc ${file/.moc/.h} > ${file} || die
-	done
+	#if use qt4; then
+		local f
+		for f in qt4/*.moc; do
+			"${EPREFIX}"/usr/bin/moc ${f/.moc/.h} > ${f} || die
+		done
+	#fi
 }
 
 src_configure() {
@@ -50,11 +51,16 @@ src_configure() {
 		--disable-pinentry-curses \
 		--disable-fallback-curses \
 		--enable-pinentry-qt4 \
-		$(use_with caps libcap)
+		$(use_with caps libcap) \
+		--without-x
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
-	cd qt4 && emake DESTDIR="${D}" install || die "make install failed"
+	cd qt4 && emake DESTDIR="${D}" install
 }
 
 pkg_postinst() {
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
deleted file mode 100644
index 1035a572c..000000000
--- a/app-crypt/pinentry/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD pinentry-0.8.1.ebuild 816 RMD160 865c3b8b3a1b1aeac77139931c6269307023d19e SHA1 7c2f4d7454f0d6453cc69b802f32ff83144b53d6 SHA256 fb6bfb075ff22a6537ecc79fad7f4e3d96c06e239b022e8ac6f6a1e5447e2480
diff --git a/app-crypt/pinentry/pinentry-0.8.1.ebuild b/app-crypt/pinentry/pinentry-0.8.1.ebuild
deleted file mode 100644
index 942f65b11..000000000
--- a/app-crypt/pinentry/pinentry-0.8.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-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=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~x86"
-# ncurses use flag is fake, used to mimic portage ebuild USE flags
-IUSE="gtk ncurses qt4 caps static"
-
-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=""
diff --git a/app-crypt/pinentry/pinentry-0.8.2.ebuild b/app-crypt/pinentry/pinentry-0.8.2.ebuild
new file mode 100644
index 000000000..217b9a2de
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.8.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Collection of simple PIN/passphrase entry dialogs which utilize the Assuan protocol (meta package)"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~x86"
+# ncurses use flag is fake, used to mimic portage ebuild USE flags
+IUSE="gtk ncurses qt4 caps static"
+
+RDEPEND="
+	~app-crypt/pinentry-base-${PV}
+	caps? ( ~app-crypt/pinentry-base-${PV}[caps] )
+	gtk? ( ~app-crypt/pinentry-gtk2-${PV} )
+	qt4? ( ~app-crypt/pinentry-qt4-${PV} )
+	static? ( ~app-crypt/pinentry-base-${PV}[static] )"
+DEPEND=""
+
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 )
+	gtk? ( !static )
+	qt4? ( !static )
+	static? ( ncurses )
+"