Bump. Minor bugfixes. Correctly drop alpha, ia64, ppc, ppc64, sparc keywords due...

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

diff --git a/x11-libs/libcryptui/ChangeLog b/x11-libs/libcryptui/ChangeLog
index afee179fbb5207ca7cb907630a180584816d8346..f00c60ee390e591d5e860a5520b1e14b6177f5bf 100644 (file)
--- 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/Manifest b/x11-libs/libcryptui/Manifest
index ca530b156d46f9b7b30e2c61d1ab2ddcbc0bb72f..8d5dff84e47b25ca6ebaeb4cffa8bda7c1401d50 100644 (file)
--- a/x11-libs/libcryptui/Manifest
+++ b/x11-libs/libcryptui/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST libcryptui-3.2.0.tar.xz 1196232 RMD160 481d340e3147953dae8e43fde36a1ff4b5bb5964 SHA1 30966d33dbef023fbf42286493ea6b699a7d6c26 SHA256 a87d866a670bb8d6f0bb6017b52e6e809dcb5463cd4714156d3beccb369c0ff4
-EBUILD libcryptui-3.2.0.ebuild 1671 RMD160 49a72d6136d682a8016d116b724df9b95e363668 SHA1 10462aec4600b06c0b5a06c8fdce9420dc3f067a SHA256 190355e45f8ba91d86646ab7e9e7f2ccc675fb8ecb229ae94cc1ac9b1fafd916
-MISC ChangeLog 476 RMD160 26ad424d8db3142a2bb76c5985a901117f334282 SHA1 ec0600d03f9150cf905450da6cdd3148ee4464b8 SHA256 1f5c025ced06e5b8ed92011e8058828c1cc4245438d5b8742063a5e3b9a99521
+DIST libcryptui-3.2.2.tar.xz 1196232 RMD160 a84f4b43844cb238b48772da4c3f5ecfc6cf614b SHA1 23bbb4915012ba6cc3eff72b2d91f0725f82a848 SHA256 76123c9d3ccdefc94f55b1726f1084a48a1a8c792ee641a39d415142fe4ac4eb
+EBUILD libcryptui-3.2.0.ebuild 1639 RMD160 217bce80c159e80bb6b3f90ec6b4985eccb05b80 SHA1 27408601074f078aa9031547061939fca0f2a2a1 SHA256 a90a28842ab74c20227b4f63dec302b9beba14afcaee5b7c0bd43bcaaa82a649
+EBUILD libcryptui-3.2.2.ebuild 1614 RMD160 2ab2b613e2fe7c79242c7033c1dbea19c5b9cef8 SHA1 7965bf57b404b209902cdaaf868b5653daa62189 SHA256 dcc4e621c310f605f89b9d7b291709adda651db731093748f82a9bc5b199c7e4
+MISC ChangeLog 801 RMD160 0e3c5f24debd7a815e6d2878eb882b548d248182 SHA1 bfdcc1224cc8c701f4d732c0ea0aa04003844a58 SHA256 5f4d4d66d7b42c19826f7a9f5280e37ddcb0c150bc9a4317dfd35e59d1adab67
 MISC metadata.xml 275 RMD160 d198c939ae6264af123154814d7862c93e21f4de SHA1 3a1da363677fe7793a7d6b99de721b87283d174a SHA256 b686b26b3537ca6aabcea923eeb34db08cae5f75a0f2559e381c88e02e6fab5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6tAP4ACgkQdjK8w9WeBnBXQgD/V4iB0V0B/UQjmHhgqlyMyqQM
-QMEoq8Gyhfpm/w3mAsgA/22EWUmZ4u7bhGBrc/tmalKSYhxNKHheoO4L+QQzFgEs
-=SX8O
+iF4EAREIAAYFAk7EpTsACgkQdjK8w9WeBnDhSAD+ITmRfQbZvxWzAsTRYdTUEEtU
+JfIzImPNtOZuHnSeKNoA/2cXwt9oZQ0s/WBCqTqBjMn7gHbRsX8Xxo9zJpvDhqvx
+=axFl
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/libcryptui/libcryptui-3.2.0.ebuild b/x11-libs/libcryptui/libcryptui-3.2.0.ebuild
index 0f620a3f576157234d4c7248e1a09ebfd1502e29..cd780b2f7c92a44685fceba1799146fda31285de 100644 (file)
--- 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 (file)
index 0000000..15ab76c
--- /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
+}