From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
Date: Tue, 15 Feb 2011 23:45:23 +0000 (UTC) [thread overview]
Message-ID: <2b189906490b3ea22539a53ba65572a07e7613a3.nirbheek@gentoo> (raw)
commit: 2b189906490b3ea22539a53ba65572a07e7613a3
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 23:19:36 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 23:42:44 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2b189906
gnome-base/gnome-keyring: Add GTK+-3 version
* Slotting is problematic because libgcr is slotted, but libgck is not
* However, libgck doesn't link to gtk+3, so binary distros are happy
- WE ARE SCREWED
* Maybe we can chicken out of slotting this if nothing much links to libgcr
---
...1.4.ebuild => gnome-keyring-2.91.4-r300.ebuild} | 10 +++++++---
.../gnome-keyring/gnome-keyring-2.91.4.ebuild | 2 ++
gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 10 +++++++---
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.91.4-r300.ebuild
similarity index 84%
copy from gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
copy to gnome-base/gnome-keyring/gnome-keyring-2.91.4-r300.ebuild
index ab6a9db..be0a4d9 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.91.4-r300.ebuild
@@ -22,9 +22,11 @@ else
fi
# USE=valgrind is probably not a good idea for the tree
-
+#
+# XXX: ARGH: libgcr is slotted, but libgck is not.
+# Hence, gtk2/3 versions are not parallel installable.
RDEPEND=">=dev-libs/glib-2.25:2
- >=x11-libs/gtk+-2.20:2
+ >=x11-libs/gtk+-2.90.0:3
gnome-base/gconf
>=sys-apps/dbus-1.0
>=dev-libs/libgcrypt-1.2.2
@@ -47,6 +49,8 @@ DOCS="AUTHORS ChangeLog NEWS README"
# tests fail in several ways, they should be fixed in the next cycle (bug #340283),
# revisit then.
+# UPDATE: tests use system-installed libraries, fail with:
+# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
RESTRICT="test"
pkg_setup() {
@@ -60,7 +64,7 @@ pkg_setup() {
--enable-acl-prompts
--enable-ssh-agent
--enable-gpg-agent
- --with-gtk=2.0"
+ --with-gtk=3.0"
# $(use_enable valgrind)
}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
index ab6a9db..dc29a2a 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
@@ -47,6 +47,8 @@ DOCS="AUTHORS ChangeLog NEWS README"
# tests fail in several ways, they should be fixed in the next cycle (bug #340283),
# revisit then.
+# UPDATE: tests use system-installed libraries, fail with:
+# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
RESTRICT="test"
pkg_setup() {
diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index ab6a9db..be0a4d9 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -22,9 +22,11 @@ else
fi
# USE=valgrind is probably not a good idea for the tree
-
+#
+# XXX: ARGH: libgcr is slotted, but libgck is not.
+# Hence, gtk2/3 versions are not parallel installable.
RDEPEND=">=dev-libs/glib-2.25:2
- >=x11-libs/gtk+-2.20:2
+ >=x11-libs/gtk+-2.90.0:3
gnome-base/gconf
>=sys-apps/dbus-1.0
>=dev-libs/libgcrypt-1.2.2
@@ -47,6 +49,8 @@ DOCS="AUTHORS ChangeLog NEWS README"
# tests fail in several ways, they should be fixed in the next cycle (bug #340283),
# revisit then.
+# UPDATE: tests use system-installed libraries, fail with:
+# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
RESTRICT="test"
pkg_setup() {
@@ -60,7 +64,7 @@ pkg_setup() {
--enable-acl-prompts
--enable-ssh-agent
--enable-gpg-agent
- --with-gtk=2.0"
+ --with-gtk=3.0"
# $(use_enable valgrind)
}
next reply other threads:[~2011-02-15 23:45 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-15 23:45 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-04-05 0:57 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/ Nirbheek Chauhan
2011-04-10 18:04 Gilles Dartiguelongue
2011-04-11 22:25 Gilles Dartiguelongue
2011-05-28 3:40 Gilles Dartiguelongue
2011-10-05 21:41 Alexandre Restovtsev
2011-10-06 5:22 Priit Laes
2011-10-18 7:37 Alexandre Restovtsev
2011-10-21 4:01 Alexandre Restovtsev
2012-02-27 2:24 Alexandre Restovtsev
2012-03-26 8:20 Nirbheek Chauhan
2012-04-20 7:29 Alexandre Restovtsev
2012-05-14 6:38 Alexandre Restovtsev
2012-09-05 15:48 Nirbheek Chauhan
2012-09-22 15:54 Nirbheek Chauhan
2012-09-27 22:32 Alexandre Rostovtsev
2012-10-24 8:10 Alexandre Rostovtsev
2012-11-25 15:46 Gilles Dartiguelongue
2012-12-17 8:14 Gilles Dartiguelongue
2013-10-13 22:22 Gilles Dartiguelongue
2013-12-11 23:44 Gilles Dartiguelongue
2014-02-12 20:58 Gilles Dartiguelongue
2014-04-16 22:27 Gilles Dartiguelongue
2014-10-26 15:46 Gilles Dartiguelongue
2014-12-22 23:11 Gilles Dartiguelongue
2015-05-10 17:20 Gilles Dartiguelongue
2016-03-26 22:54 Ole Reifschneider
2018-01-12 12:46 Dennis Lamm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2b189906490b3ea22539a53ba65572a07e7613a3.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox