Bump. Minor bugfixes. Correctly drop alpha, ia64, ppc, ppc64, sparc keywords due to gnome-keyring-3 dependency (these keywords should not have been set in the first place).

(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)

3 files changed, 75 insertions, 3 deletions

diff --git a/x11-libs/libcryptui/ChangeLog b/x11-libs/libcryptui/ChangeLog
index afee179fbb52..f00c60ee390e 100644
--- a/x11-libs/libcryptui/ChangeLog
+++ b/x11-libs/libcryptui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/libcryptui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/ChangeLog,v 1.1 2011/10/30 07:47:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/ChangeLog,v 1.2 2011/11/17 06:09:57 tetromino Exp $
+
+*libcryptui-3.2.2 (17 Nov 2011)
+
+  17 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libcryptui-3.2.0.ebuild, +libcryptui-3.2.2.ebuild:
+  Bump. Minor bugfixes. Correctly drop alpha, ia64, ppc, ppc64, sparc keywords
+  due to gnome-keyring-3 dependency (these keywords should not have been set in
+  the first place).
 
 *libcryptui-3.2.0 (30 Oct 2011)
 
diff --git a/x11-libs/libcryptui/libcryptui-3.2.0.ebuild b/x11-libs/libcryptui/libcryptui-3.2.0.ebuild
index 0f620a3f5761..cd780b2f7c92 100644
--- a/x11-libs/libcryptui/libcryptui-3.2.0.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.2.0.ebuild,v 1.1 2011/10/30 07:47:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.2.0.ebuild,v 1.2 2011/11/17 06:09:57 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 IUSE="debug doc +introspection libnotify test"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
 # Pull in libnotify-0.7 because it's controlled via an automagic ifdef
 COMMON_DEPEND="
diff --git a/x11-libs/libcryptui/libcryptui-3.2.2.ebuild b/x11-libs/libcryptui/libcryptui-3.2.2.ebuild
new file mode 100644
index 000000000000..15ab76c1f7ab
--- /dev/null
+++ b/x11-libs/libcryptui/libcryptui-3.2.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.2.2.ebuild,v 1.1 2011/11/17 06:09:57 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="User interface components for OpenPGP"
+HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="debug doc +introspection libnotify test"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
+COMMON_DEPEND="
+	>=dev-libs/glib-2.10:2
+	>=x11-libs/gtk+-2.90.0:3[introspection?]
+	>=dev-libs/dbus-glib-0.72
+	>=gnome-base/gnome-keyring-2.91.2
+
+	>=app-crypt/gpgme-1
+	|| (
+		=app-crypt/gnupg-2.0*
+		=app-crypt/gnupg-1.4* )
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	>=app-text/scrollkeeper-0.3
+	>=dev-util/pkgconfig-0.20
+	>=dev-util/intltool-0.35
+	doc? ( >=dev-util/gtk-doc-1.9 )
+"
+# Before 3.1.4, libcryptui was part of seahorse
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-3.1.4
+"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-update-mime-database
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_enable libnotify)
+		$(use_enable test tests)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+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
+}