[gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/libcryptui/, x11-libs/libcryptui/files/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     a48e9972437925453cbce586701c3f533b25dda6
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 26 03:14:32 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 26 03:16:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a48e9972

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-collisions.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 <tetromino@gmail.com>
+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 => 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 => 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 *******************
+ 
+-GETTEXT_PACKAGE=seahorse
++GETTEXT_PACKAGE=cryptui
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext domain.])
+ 
+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 @@
+ 
+ localedir = $(datadir)/locale
+-pixmapsdir = $(datadir)/pixmaps/
+-uidir = $(datadir)/seahorse/ui/
++pixmapsdir = $(datadir)/pixmaps/cryptui/
++uidir = $(datadir)/cryptui/ui/
+ 
+ INCLUDES = -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@
+ 
+ schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+-schemas_in_files = seahorse.schemas.in
++schemas_in_files = cryptui.schemas.in
+ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+ 
+ 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 @@
+ 
+-icon22dir = $(datadir)/pixmaps/seahorse/22x22/
++icon22dir = $(datadir)/pixmaps/cryptui/22x22/
+ icon22_DATA =   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 @@
+ 
+-icon48dir = $(datadir)/pixmaps/seahorse/48x48/
++icon48dir = $(datadir)/pixmaps/cryptui/48x48/
+ icon48_DATA =   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 = $(datadir)/pixmaps/seahorse/scalable/
++iconsvgdir = $(datadir)/pixmaps/cryptui/scalable/
+ iconsvg_DATA =  seahorse-key.svg \
+                 seahorse-key-personal.svg \
+                 seahorse-key-ssh.svg \
+-- 
+1.7.6
+

diff --git a/x11-libs/libcryptui/libcryptui-3.1.4.ebuild b/x11-libs/libcryptui/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="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+
+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"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~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="
+	>=gnome-base/gconf-2:2
+	>=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/gnome-doc-utils-0.3.2
+	>=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-scrollkeeper
+		--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"
+
+	# Prevent file collisions with app-crypt/seahorse
+	# https://bugzilla.gnome.org/show_bug.cgi?id=655291
+	epatch "${FILESDIR}/${PN}-3.1.4-seahorse-file-collisions.patch"
+	mv data/seahorse.schemas.in data/cryptui.schemas.in || die "mv failed"
+	[[ ${PV} = 9999 ]] || eautoreconf
+
+	gnome2_src_prepare
+}

diff --git a/x11-libs/libcryptui/libcryptui-9999.ebuild b/x11-libs/libcryptui/libcryptui-9999.ebuild
new file mode 100644
index 0000000..31e51c3
--- /dev/null
+++ b/x11-libs/libcryptui/libcryptui-9999.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+
+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"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~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="
+	>=gnome-base/gconf-2:2
+	>=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/gnome-doc-utils-0.3.2
+	>=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-scrollkeeper
+		--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"
+
+	# Prevent file collisions with app-crypt/seahorse
+	# https://bugzilla.gnome.org/show_bug.cgi?id=655291
+	epatch "${FILESDIR}/${PN}-3.1.4-seahorse-file-collisions.patch"
+	mv data/seahorse.schemas.in data/cryptui.schemas.in || die "mv failed"
+	[[ ${PV} = 9999 ]] || eautoreconf
+
+	gnome2_src_prepare
+}