From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QlY92-0003JL-NX for garchives@archives.gentoo.org; Tue, 26 Jul 2011 03:17:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBFE921C09C; Tue, 26 Jul 2011 03:17:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AFF9D21C09C for ; Tue, 26 Jul 2011 03:17:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E85B41BC023 for ; Tue, 26 Jul 2011 03:17:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 022828004C for ; Tue, 26 Jul 2011 03:17:09 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/libcryptui/, x11-libs/libcryptui/files/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/libcryptui/files/libcryptui-3.1.4-seahorse-file-collisions.patch x11-libs/libcryptui/libcryptui-3.1.4.ebuild x11-libs/libcryptui/libcryptui-9999.ebuild X-VCS-Directories: x11-libs/libcryptui/ x11-libs/libcryptui/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: a48e9972437925453cbce586701c3f533b25dda6 Date: Tue, 26 Jul 2011 03:17:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 366b7022f2e5a2163be2979b7b73c768 commit: a48e9972437925453cbce586701c3f533b25dda6 Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue Jul 26 03:14:32 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Jul 26 03:16:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Da48e9972 x11-libs/libcryptui: new package (formerly part of seahorse) Starting with 3.1.4, upstream split libcryptui from seahorse into a separate package. Add a patch to prevent file collisions with seahorse (see gnome bug 655291). --- ...libcryptui-3.1.4-seahorse-file-collisions.patch | 105 ++++++++++++++= ++++++ x11-libs/libcryptui/libcryptui-3.1.4.ebuild | 80 ++++++++++++++= + x11-libs/libcryptui/libcryptui-9999.ebuild | 80 ++++++++++++++= + 3 files changed, 265 insertions(+), 0 deletions(-) diff --git a/x11-libs/libcryptui/files/libcryptui-3.1.4-seahorse-file-col= lisions.patch b/x11-libs/libcryptui/files/libcryptui-3.1.4-seahorse-file-= collisions.patch new file mode 100644 index 0000000..9ac2790 --- /dev/null +++ b/x11-libs/libcryptui/files/libcryptui-3.1.4-seahorse-file-collisions= .patch @@ -0,0 +1,105 @@ +From 1638c5ddbaa8e55a1c212b739cc4dd12c8e264ff Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Mon, 25 Jul 2011 22:42:22 -0400 +Subject: [PATCH] Prevent file collisions between libcryptui and seahorse + (#655291) + +To prevent file collisions between seahorse and libcryptui: +* install pixmaps in /usr/share/pixmaps/cryptui (and set pixmapsdir + to the correct value, so daemon/seahorse-gtkstock.c can actually + load them); +* install ui files in /usr/share/cryptui/ui; +* rename seahorse.schemas to cryptui.schemas; +* use "cryptui" as the gettext translation domain. + +Addresses Gnome bug #655291. +--- + configure.ac | 2 +- + daemon/Makefile.am | 4 ++-- + data/Makefile.am | 2 +- + data/{seahorse.schemas.in =3D> cryptui.schemas.in} | 0 + pixmaps/22x22/Makefile.am | 2 +- + pixmaps/48x48/Makefile.am | 2 +- + pixmaps/scalable/Makefile.am | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + rename data/{seahorse.schemas.in =3D> cryptui.schemas.in} (100%) + +diff --git a/configure.ac b/configure.ac +index 6d36575..d6741fd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -325,7 +325,7 @@ dnl ******************* + dnl ***** gettext ***** + dnl ******************* +=20 +-GETTEXT_PACKAGE=3Dseahorse ++GETTEXT_PACKAGE=3Dcryptui + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the ge= ttext domain.]) +=20 +diff --git a/daemon/Makefile.am b/daemon/Makefile.am +index 08ff418..d214559 100644 +--- a/daemon/Makefile.am ++++ b/daemon/Makefile.am +@@ -1,7 +1,7 @@ +=20 + localedir =3D $(datadir)/locale +-pixmapsdir =3D $(datadir)/pixmaps/ +-uidir =3D $(datadir)/seahorse/ui/ ++pixmapsdir =3D $(datadir)/pixmaps/cryptui/ ++uidir =3D $(datadir)/cryptui/ui/ +=20 + INCLUDES =3D -I$(top_builddir) \ + -I$(top_srcdir) \ +diff --git a/data/Makefile.am b/data/Makefile.am +index d343d5f..d6e2d44 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -1,7 +1,7 @@ + @INTLTOOL_SCHEMAS_RULE@ +=20 + schemasdir =3D $(GCONF_SCHEMA_FILE_DIR) +-schemas_in_files =3D seahorse.schemas.in ++schemas_in_files =3D cryptui.schemas.in + schemas_DATA =3D $(schemas_in_files:.schemas.in=3D.schemas) +=20 + if GCONF_SCHEMAS_INSTALL +diff --git a/data/seahorse.schemas.in b/data/cryptui.schemas.in +similarity index 100% +rename from data/seahorse.schemas.in +rename to data/cryptui.schemas.in +diff --git a/pixmaps/22x22/Makefile.am b/pixmaps/22x22/Makefile.am +index 60922ce..7fda357 100644 +--- a/pixmaps/22x22/Makefile.am ++++ b/pixmaps/22x22/Makefile.am +@@ -1,5 +1,5 @@ +=20 +-icon22dir =3D $(datadir)/pixmaps/seahorse/22x22/ ++icon22dir =3D $(datadir)/pixmaps/cryptui/22x22/ + icon22_DATA =3D seahorse-key.png \ + seahorse-key-personal.png \ + seahorse-key-ssh.png \ +diff --git a/pixmaps/48x48/Makefile.am b/pixmaps/48x48/Makefile.am +index a91f86f..c908b1e 100644 +--- a/pixmaps/48x48/Makefile.am ++++ b/pixmaps/48x48/Makefile.am +@@ -1,5 +1,5 @@ +=20 +-icon48dir =3D $(datadir)/pixmaps/seahorse/48x48/ ++icon48dir =3D $(datadir)/pixmaps/cryptui/48x48/ + icon48_DATA =3D seahorse-key.png \ + seahorse-key-personal.png \ + seahorse-key-ssh.png \ +diff --git a/pixmaps/scalable/Makefile.am b/pixmaps/scalable/Makefile.am +index e43463b..27c0d44 100644 +--- a/pixmaps/scalable/Makefile.am ++++ b/pixmaps/scalable/Makefile.am +@@ -1,4 +1,4 @@ +-iconsvgdir =3D $(datadir)/pixmaps/seahorse/scalable/ ++iconsvgdir =3D $(datadir)/pixmaps/cryptui/scalable/ + iconsvg_DATA =3D seahorse-key.svg \ + seahorse-key-personal.svg \ + seahorse-key-ssh.svg \ +--=20 +1.7.6 + diff --git a/x11-libs/libcryptui/libcryptui-3.1.4.ebuild b/x11-libs/libcr= yptui/libcryptui-3.1.4.ebuild new file mode 100644 index 0000000..31e51c3 --- /dev/null +++ b/x11-libs/libcryptui/libcryptui-3.1.4.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3D"4" +GCONF_DEBUG=3D"yes" +GNOME2_LA_PUNT=3D"yes" + +inherit autotools eutils gnome2 +if [[ ${PV} =3D 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION=3D"User interface components for OpenPGP" +HOMEPAGE=3D"http://www.gnome.org/projects/seahorse/index.html" + +LICENSE=3D"GPL-2 LGPL-2" +SLOT=3D"0" +IUSE=3D"debug doc +introspection libnotify test" +if [[ ${PV} =3D 9999 ]]; then + KEYWORDS=3D"" +else + KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +fi + +# Pull in libnotify-0.7 because it's controlled via an automagic ifdef +COMMON_DEPEND=3D" + >=3Dgnome-base/gconf-2:2 + >=3Ddev-libs/glib-2.10:2 + >=3Dx11-libs/gtk+-2.90.0:3[introspection?] + >=3Ddev-libs/dbus-glib-0.72 + >=3Dgnome-base/gnome-keyring-2.91.2 + + >=3Dapp-crypt/gpgme-1 + || ( + =3Dapp-crypt/gnupg-2.0* + =3Dapp-crypt/gnupg-1.4* ) + + introspection? ( >=3Ddev-libs/gobject-introspection-0.6.4 ) + libnotify? ( >=3Dx11-libs/libnotify-0.7.0 ) +" +DEPEND=3D"${COMMON_DEPEND} + sys-devel/gettext + >=3Dapp-text/gnome-doc-utils-0.3.2 + >=3Dapp-text/scrollkeeper-0.3 + >=3Ddev-util/pkgconfig-0.20 + >=3Ddev-util/intltool-0.35 + doc? ( >=3Ddev-util/gtk-doc-1.9 ) +" +# Before 3.1.4, libcryptui was part of seahorse +RDEPEND=3D"${COMMON_DEPEND} + !!=3Dgnome-base/gconf-2:2 + >=3Ddev-libs/glib-2.10:2 + >=3Dx11-libs/gtk+-2.90.0:3[introspection?] + >=3Ddev-libs/dbus-glib-0.72 + >=3Dgnome-base/gnome-keyring-2.91.2 + + >=3Dapp-crypt/gpgme-1 + || ( + =3Dapp-crypt/gnupg-2.0* + =3Dapp-crypt/gnupg-1.4* ) + + introspection? ( >=3Ddev-libs/gobject-introspection-0.6.4 ) + libnotify? ( >=3Dx11-libs/libnotify-0.7.0 ) +" +DEPEND=3D"${COMMON_DEPEND} + sys-devel/gettext + >=3Dapp-text/gnome-doc-utils-0.3.2 + >=3Dapp-text/scrollkeeper-0.3 + >=3Ddev-util/pkgconfig-0.20 + >=3Ddev-util/intltool-0.35 + doc? ( >=3Ddev-util/gtk-doc-1.9 ) +" +# Before 3.1.4, libcryptui was part of seahorse +RDEPEND=3D"${COMMON_DEPEND} + !!