reinit the tree, so we can have metadata

9 files changed, 430 insertions, 0 deletions

diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest
new file mode 100644
index 000000000000..ab0d5807e846
--- /dev/null
+++ b/x11-libs/libcryptui/Manifest
@@ -0,0 +1,11 @@
+AUX libcryptui-3.12.2-fix-return-types.patch 1049 SHA256 20d928c9d16045086187a79c1ae9f75b646348b80fca7605e805d5d9f726aab1 SHA512 2c29a7213d620be54f00f8b753b429c3f87f3986f8b024274b0c8758b7207e05591820abb7f896f441b3097d3cb24baabadc7542c536a6db2d1d1c71df28de5d WHIRLPOOL 032e866c72fb113203c1e500bc994ac8682d8bbead42300faa81378c48511e64bae2597c092ab3a3fa5d19463549aa7bee1c040d2009376336a46e4e51c1b102
+AUX libcryptui-3.12.2-gnupg-2.1.patch 702 SHA256 2c4a49d7d011159a0abe49e674eeb133e373a1b5ec7eee155edeb82464ddbd33 SHA512 9207081483604b115ec6ca5dd920b6396e2ad3c00ad41e1f354f10e43d144ce110431b34a895baa9ea22702aa22210eee3ba83e78083216d720d43ec0e4cdc7e WHIRLPOOL 7d3cdeb170bb8ae33dfbe20be778d127b576f5010a9f89f9bfad36eb399c6ac2043012d160792403da5f3736f657fb04995387a7626b3c43519a4507a9dd37e9
+AUX libcryptui-3.12.2-gnupg-2.2.patch 708 SHA256 df8b1df97b16247c8522412d486d72f3767c9a16aad7c5362d0eded6f4f77d16 SHA512 7acf4770f9382e574822bf54defa48e817f40459a50fd5fd2b6794d61ef82329bbe1bfe013fb3ce0880bfc3f97d556c103e3685ead86772fd04e0119f70bc103 WHIRLPOOL fb7fa73c465f612e0d93ab7b4d1ab7d4c69880ab50fa625fcdd0e3f9677a35c2f451ba5abb365012d85e3dd7ac0aa35e3ecf60ed14d1f3f9536560231fdbce89
+AUX libcryptui-3.12.2-port-gcr-3.patch 4932 SHA256 f87cb63070ad777a47662b464e27bbccd9774b9f240e2f1d70df1f75f9558fa7 SHA512 3ffa45e6a2636bb4e6933082c92b83a2eedee927ad6a7d214df1bdb1b4c5ca41ca22c0c06469f3a6fe1c81e94888a3a5adca56e6354a00bebdc68faaa009e4c6 WHIRLPOOL 8cce8ec62f13fca38991c602f0806e5000c85c7c22e6a92ccab620bdf7bf0cefbe4861ea2ef56d36d250083aad57b76dd1c981b28208b753372b8bb57d8bf718
+AUX libcryptui-3.12.2-prompt-recipient.patch 1447 SHA256 1bdaaacd289306f2b2e0a095fe76952ca347291c5f329a9fa3c768ae7cf7d558 SHA512 4e38c0f2e813bf0ab76f2205045a3b5240d0ccb9701de8c7a73adc4edc3540ff49eff6fcd5bb011c9e91984c9b82eab8a6bef32d099501895eaf9d6187874c43 WHIRLPOOL 0995c4b6dacac598a472aee96b9d1eb3487324362c0b26b047dcbc74aa9ac6993a24f0455be07b755e05dd6dfd48962108d368a2526facce903ac4eb9526860c
+DIST libcryptui-3.12.2.tar.xz 1163784 SHA256 71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866 SHA512 50ef407f0a9fe2ac8f4ab075e125fe8eabc55160b9b96a852d34e52c46be04e04b2a7c8288d2669e24865a89dc179af6bb0da8f6799e8b07fff7bc667c8eb1f0 WHIRLPOOL 0e376834c74df1492a7ffea29646a4912124b46b972dc9bdc64dd40b19e3b9c43c85eec87416f8ea0995e7d164e763bf7b5da7f66c2103df3be44f6516b8e632
+EBUILD libcryptui-3.12.2-r1.ebuild 1849 SHA256 43a99fcd2a71f7c290f79b54608968a910f7893b6be84a60d698ee8c7918253c SHA512 62e835191d29289f900ef7a373e2d30b02c8914576152a3c5769a5c7fd8ba3790aa6a7c92e0db534a2d51b8c997581d0640ba93364ae9395146466b655fd7e28 WHIRLPOOL b40abf0dce0674a6e4c7d091d34cc6df2ce5b904eb0097be8636d8641f1c911965fc7c1dbe96e769bcab6e32443400b1e63fea956f2c5235fe0dc71a298abc04
+EBUILD libcryptui-3.12.2.ebuild 1535 SHA256 bd72b17dd5238dd77548533ac1b5f9a2f58d50e12fc5181aa2d38d131f1011fc SHA512 8abb95d5b65b5e7bd915d1f5048f3f07f77a793b6724bd0e94f4fdc0038491bdae224487d3453c7669cdf91239295864d28fcd516ccdc3b1400cac94c08b9656 WHIRLPOOL 1e01c8357f1dd77eb227f22d58c25e92f174b6666d7dc2185d14513648e7da564d6e3a33d006e169f4fbd039319a679674302611ed375cab80d89ea9792f854a
+MISC ChangeLog 3208 SHA256 c08730ddb48bca368eb86674fd903b68221f50916ec69b6c95969e55c3b12c12 SHA512 c429e1c4a37c02e733d42801824346f43d2c1e2dace257d89a5bbf205fe13219e4271bb1f8b552e0db7d6163af991f8bc6c99dcbe429fd13439494b214c1f813 WHIRLPOOL 7f70a28619cfbb02b2c36539fc40e021d321d6977a5a7ef9b42c321a1cb2689444bef08fa7c9136225bd1f09dbe8ff30199f40c8c53d416b4994af3532565ab3
+MISC ChangeLog-2015 3376 SHA256 b69d0e1c9b749a2ad642c079f0e734183ce91b7e5f955212593af0da34f2da22 SHA512 db49fda715b4841eae5bd33e7bb47d3a4c68e204b3c7f0688c946c888bc6b34eae55fcfe4e2364b6e17aff5e1c7ff6b94db56cdfb905af98ad0cd4922d6c9d98 WHIRLPOOL 18b27e77a50547a075d0fba23b8beee81db1967f265636ba2d732a000e60fb2021acac85b4ccbc08ad5147c6871b254a5ceb7be1c0c03dc11881fd9fc19cdef7
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch
new file mode 100644
index 000000000000..d3fdf3c408d0
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch
@@ -0,0 +1,34 @@
+From a576e407d913b35804f838d615da52899681d61d Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Mon, 15 Aug 2016 18:12:06 +0200
+Subject: [PATCH 2/3] daemon: fix conflicting return types
+
+... in functions seahorse_dbus_server_{init,cleanup}
+
+Reported-by: Michael Tautschnig <mt@debian.org>
+Bug-Debian: https://bugs.debian.org/749001
+
+https://bugzilla.gnome.org/show_bug.cgi?id=769943
+---
+ daemon/seahorse-daemon.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/seahorse-daemon.h b/daemon/seahorse-daemon.h
+index 93c0c452..09716bb5 100644
+--- a/daemon/seahorse-daemon.h
++++ b/daemon/seahorse-daemon.h
+@@ -24,9 +24,9 @@
+ /* seahorse-dbus-server.c --------------------------------------------------- */
+ 
+ 
+-gboolean            seahorse_dbus_server_init ();
++void                seahorse_dbus_server_init ();
+ 
+-gboolean            seahorse_dbus_server_cleanup ();
++void                seahorse_dbus_server_cleanup ();
+ 
+ DBusGConnection*    seahorse_dbus_server_get_connection ();
+ 
+-- 
+2.14.1
+
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
new file mode 100644
index 000000000000..d968dd367a11
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
@@ -0,0 +1,25 @@
+From 183d7619c29482a5d4ae8019692899f87f198171 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sat, 17 Oct 2015 08:52:35 +0200
+Subject: [PATCH] Allow building with gnupg 2.1.
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 406b9f3f..b621b236 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
+ 	DO_CHECK=$enableval, DO_CHECK=yes)
+ 
+ if test	"$DO_CHECK" = "yes"; then
+-	accepted_versions="1.2 1.4 2.0"
++	accepted_versions="1.2 1.4 2.0 2.1"
+ 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
+ 	ok="no"
+-- 
+2.14.1
+
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch
new file mode 100644
index 000000000000..4feaf2b18265
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch
@@ -0,0 +1,25 @@
+From 98afc46861678162aad8cae1c4c01dc4d6780bef Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 2 Sep 2017 17:48:44 +0200
+Subject: [PATCH] Allow building with gnupg 2.2
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4486e7b2..be5b28b4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
+ 	DO_CHECK=$enableval, DO_CHECK=yes)
+ 
+ if test	"$DO_CHECK" = "yes"; then
+-	accepted_versions="1.2 1.4 2.0 2.1"
++	accepted_versions="1.2 1.4 2.0 2.1 2.2"
+ 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
+ 	ok="no"
+-- 
+2.14.1
+
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch
new file mode 100644
index 000000000000..5ca31f664136
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch
@@ -0,0 +1,154 @@
+From 728aceb6defd4e6e4f07fa49ca76f5e745230fee Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Fri, 16 Sep 2016 11:46:55 +0200
+Subject: [PATCH 3/3] daemon: port to gcr-3
+
+This removes the dependency on libgnome-keyring and adds a dependency
+on libgcr instead.
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Signed-off-by: Stef Walter <stefw@redhat.com>
+ * Updated commit message
+
+https://bugzilla.gnome.org/show_bug.cgi?id=771522
+---
+ configure.ac                    | 14 +++++++-------
+ daemon/seahorse-secure-buffer.c |  7 ++++---
+ daemon/seahorse-secure-memory.c | 21 +++++++++++----------
+ 3 files changed, 22 insertions(+), 20 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b621b236..4486e7b2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -252,18 +252,18 @@ if test "$enable_fatal_messages" = "yes" && test "$enable_debug" = "yes"; then
+ fi
+ 
+ dnl ****************************************************************************
+-dnl GNOME-KEYRING
++dnl GCR
+ dnl ****************************************************************************
+ 
+-PKG_CHECK_MODULES([GNOME_KEYRING], gnome-keyring-1 >= 2.25.5,
+-                  [enable_gnome_keyring=yes],[enable_gnome_keyring=no])
++PKG_CHECK_MODULES([GCR], gcr-3,
++                  [enable_gcr=yes],[enable_gcr=no])
+ 
+-if test "$enable_gnome_keyring" = "no"; then
+-	AC_MSG_ERROR([gnome-keyring library or headers not found.])
++if test "$enable_gcr" = "no"; then
++	AC_MSG_ERROR([gcr library or headers not found.])
+ fi
+ 
+-SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
+-SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
++SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GCR_CFLAGS"
++SEAHORSE_LIBS="$SEAHORSE_LIBS $GCR_LIBS"
+ 
+ dnl ****************************************************************************
+ dnl LIBCRYPTUI
+diff --git a/daemon/seahorse-secure-buffer.c b/daemon/seahorse-secure-buffer.c
+index 0db87961..63f87cd3 100644
+--- a/daemon/seahorse-secure-buffer.c
++++ b/daemon/seahorse-secure-buffer.c
+@@ -20,7 +20,8 @@
+ #include "config.h"
+ 
+ #include "seahorse-secure-buffer.h"
+-#include <gnome-keyring-memory.h>
++#define GCR_API_SUBJECT_TO_CHANGE 1
++#include <gcr/gcr.h>
+ 
+ #include <string.h>
+ 
+@@ -92,7 +93,7 @@ seahorse_secure_buffer_real_insert_text (GtkEntryBuffer *buffer, guint position,
+ 			}
+ 		}
+ 
+-		pv->text = gnome_keyring_memory_realloc (pv->text, pv->text_size);
++		pv->text = gcr_secure_memory_realloc (pv->text, pv->text_size);
+ 	}
+ 
+ 	/* Actual text insertion */
+@@ -158,7 +159,7 @@ seahorse_secure_buffer_finalize (GObject *obj)
+ 	SeahorseSecureBufferPrivate *pv = self->priv;
+ 
+ 	if (pv->text) {
+-		gnome_keyring_memory_free (pv->text);
++		gcr_secure_memory_free (pv->text);
+ 		pv->text = NULL;
+ 		pv->text_bytes = pv->text_size = 0;
+ 		pv->text_chars = 0;
+diff --git a/daemon/seahorse-secure-memory.c b/daemon/seahorse-secure-memory.c
+index 3d94a674..f201d1df 100644
+--- a/daemon/seahorse-secure-memory.c
++++ b/daemon/seahorse-secure-memory.c
+@@ -23,7 +23,8 @@
+   
+ #include <glib.h>
+   
+-#include <gnome-keyring-memory.h>
++#define GCR_API_SUBJECT_TO_CHANGE 1
++#include <gcr/gcr.h>
+   
+ #include "seahorse-secure-memory.h"
+   
+@@ -47,7 +48,7 @@ switch_malloc (gsize size)
+     if (size == 0)
+         return NULL;
+     if (seahorse_use_secure_mem)
+-        p = gnome_keyring_memory_try_alloc (size);
++        p = gcr_secure_memory_try_alloc (size);
+     else
+         p = malloc (size);
+     return p;
+@@ -71,7 +72,7 @@ switch_calloc (gsize num, gsize size)
+     if (size == 0 || num == 0)
+         return NULL;
+     if (seahorse_use_secure_mem)
+-        p = gnome_keyring_memory_try_alloc (size * num);
++        p = gcr_secure_memory_try_alloc (size * num);
+     else
+         p = calloc (num, size);
+     return p;
+@@ -99,11 +100,11 @@ switch_realloc (gpointer mem, gsize size)
+ 
+     if (!mem) {
+         if (seahorse_use_secure_mem)
+-            p = gnome_keyring_memory_alloc (size);
++            p = gcr_secure_memory_alloc (size);
+         else
+             p = malloc (size);
+-    } else if (gnome_keyring_memory_is_secure (mem))
+-        p = gnome_keyring_memory_try_realloc (mem, size);
++    } else if (gcr_secure_memory_is_secure (mem))
++        p = gcr_secure_memory_try_realloc (mem, size);
+     else
+         p = realloc (mem, size);
+     return p;
+@@ -120,8 +121,8 @@ static void
+ switch_free (gpointer mem)
+ {
+     if (mem) {
+-        if (gnome_keyring_memory_is_secure (mem))
+-            gnome_keyring_memory_free (mem);
++        if (gcr_secure_memory_is_secure (mem))
++            gcr_secure_memory_free (mem);
+         else
+             free (mem);
+     }
+@@ -138,9 +139,9 @@ seahorse_try_gk_secure_memory ()
+ {
+     gpointer p;
+ 
+-    p = gnome_keyring_memory_try_alloc (10);
++    p = gcr_secure_memory_try_alloc (10);
+     if (p != NULL) {
+-        gnome_keyring_memory_free (p);
++        gcr_secure_memory_free (p);
+         return TRUE;
+     }
+ 
+-- 
+2.14.1
+
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch
new file mode 100644
index 000000000000..0a172a635107
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch
@@ -0,0 +1,38 @@
+From 7c805b5d4eca798a03ac56b40e53cb335e30c187 Mon Sep 17 00:00:00 2001
+From: Vlad Orlov <monsta@inbox.ru>
+Date: Mon, 15 Aug 2016 18:23:31 +0200
+Subject: [PATCH 1/3] libcryptui: fix logic flaw in the prompt recipients
+ dialog
+
+The prompt recipients dialog has been broken in commit
+https://github.com/GNOME/libcryptui/commit/cd74aa6bf810a5ce0935d2ec89d6db64dbbde24d#diff-f0ea8a1eef5386b0149314d2a1743e85L202
+
+The patch fixes the logic there and makes seahorse-tool's
+encrypt command work again. Therefore, seahorse plugins for both
+Nautilus and Nemo should start working as well.
+
+Bug-Debian: https://bugs.debian.org/770436
+
+https://bugzilla.gnome.org/show_bug.cgi?id=769944
+
+Reviewed-by: Stef Walter <stefw@gnome.org>
+---
+ libcryptui/cryptui.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcryptui/cryptui.c b/libcryptui/cryptui.c
+index 92f0d5d4..2bbfa409 100644
+--- a/libcryptui/cryptui.c
++++ b/libcryptui/cryptui.c
+@@ -211,7 +211,7 @@ cryptui_prompt_recipients_with_symmetric (CryptUIKeyset *keyset,
+             *symmetric = cryptui_key_chooser_get_symmetric (chooser);
+         }
+         
+-        if (symmetric != NULL && !*symmetric) {
++        if (symmetric == NULL || *symmetric == FALSE) {
+             recipients = cryptui_key_chooser_get_recipients (chooser);
+             keys = g_new0(gchar*, g_list_length (recipients) + 1);
+             for (l = recipients, i = 0; l; l = g_list_next (l), i++)
+-- 
+2.14.1
+
diff --git a/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
new file mode 100644
index 000000000000..6447ee44eca7
--- /dev/null
+++ b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="User interface components for OpenPGP"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1"
+SLOT="0"
+IUSE="debug +introspection libnotify"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3:3[introspection?]
+	>=dev-libs/dbus-glib-0.72
+	>=app-crypt/gcr-3[gtk]
+	x11-libs/libICE
+	x11-libs/libSM
+
+	>=app-crypt/gpgme-1:1=
+	>=app-crypt/gnupg-1.4
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Before 3.1.4, libcryptui was part of seahorse
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-3.1.4
+"
+
+PATCHES=(
+	# Support GnuPG 2.1, in master
+	# https://bugzilla.gnome.org/show_bug.cgi?id=745843
+	"${FILESDIR}"/${PN}-3.12.2-gnupg-2.1.patch
+	# from master, in Debian as well
+	"${FILESDIR}"/${PN}-3.12.2-prompt-recipient.patch
+	"${FILESDIR}"/${PN}-3.12.2-fix-return-types.patch
+	"${FILESDIR}"/${PN}-3.12.2-port-gcr-3.patch
+	# Support GnuPG 2.2
+	# https://bugs.gentoo.org/show_bug.cgi?id=629572
+	"${FILESDIR}"/${PN}-3.12.2-gnupg-2.2.patch
+)
+
+src_prepare() {
+	# FIXME: Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
+		-e 's/-Werror//' \
+		-i configure.ac configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-update-mime-database \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_enable libnotify)
+}
diff --git a/x11-libs/libcryptui/libcryptui-3.12.2.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
new file mode 100644
index 000000000000..edaa2db9c183
--- /dev/null
+++ b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2
+
+DESCRIPTION="User interface components for OpenPGP"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1"
+SLOT="0"
+IUSE="debug +introspection libnotify"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
+
+# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3:3[introspection?]
+	>=dev-libs/dbus-glib-0.72
+	gnome-base/libgnome-keyring
+	x11-libs/libICE
+	x11-libs/libSM
+
+	>=app-crypt/gpgme-1:1=
+	>=app-crypt/gnupg-1.4
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Before 3.1.4, libcryptui was part of seahorse
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-3.1.4
+"
+
+src_prepare() {
+	# Support GnuPG 2.1, https://bugzilla.gnome.org/show_bug.cgi?id=745843
+	eapply "${FILESDIR}"/${PN}-3.12.2-gnupg-2.1.patch
+
+	# FIXME: Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
+		-e 's/-Werror//' \
+		-i configure.ac configure || die "sed failed"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-update-mime-database \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_enable libnotify)
+}
diff --git a/x11-libs/libcryptui/metadata.xml b/x11-libs/libcryptui/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/x11-libs/libcryptui/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>