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 1PpUaP-0003bZ-U7 for garchives@archives.gentoo.org; Tue, 15 Feb 2011 23:45:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D8BFE09FB; Tue, 15 Feb 2011 23:45:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 33787E09FB for ; Tue, 15 Feb 2011 23:45:25 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9507F1B412C for ; Tue, 15 Feb 2011 23:45:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CE2A580073 for ; Tue, 15 Feb 2011 23:45:23 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <2b189906490b3ea22539a53ba65572a07e7613a3.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-keyring/gnome-keyring-2.91.4-r300.ebuild gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild gnome-base/gnome-keyring/gnome-keyring-9999.ebuild X-VCS-Directories: gnome-base/gnome-keyring/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 2b189906490b3ea22539a53ba65572a07e7613a3 Date: Tue, 15 Feb 2011 23:45:23 +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: 64d4e108e9604ab81ea3e54feb33ecfc commit: 2b189906490b3ea22539a53ba65572a07e7613a3 Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue Feb 15 23:19:36 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Tue Feb 15 23:42:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D2b189906 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 libg= cr --- ...1.4.ebuild =3D> 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 =20 # USE=3Dvalgrind 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=3D">=3Ddev-libs/glib-2.25:2 - >=3Dx11-libs/gtk+-2.20:2 + >=3Dx11-libs/gtk+-2.90.0:3 gnome-base/gconf >=3Dsys-apps/dbus-1.0 >=3Ddev-libs/libgcrypt-1.2.2 @@ -47,6 +49,8 @@ DOCS=3D"AUTHORS ChangeLog NEWS README" =20 # tests fail in several ways, they should be fixed in the next cycle (bu= g #340283), # revisit then. +# UPDATE: tests use system-installed libraries, fail with: +# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-k= eyring-pkcs11.so: Couldn't initialize module: The device was removed or u= nplugged=20 RESTRICT=3D"test" =20 pkg_setup() { @@ -60,7 +64,7 @@ pkg_setup() { --enable-acl-prompts --enable-ssh-agent --enable-gpg-agent - --with-gtk=3D2.0" + --with-gtk=3D3.0" # $(use_enable valgrind) } =20 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=3D"AUTHORS ChangeLog NEWS README" =20 # tests fail in several ways, they should be fixed in the next cycle (bu= g #340283), # revisit then. +# UPDATE: tests use system-installed libraries, fail with: +# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-k= eyring-pkcs11.so: Couldn't initialize module: The device was removed or u= nplugged=20 RESTRICT=3D"test" =20 pkg_setup() { diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-b= ase/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 =20 # USE=3Dvalgrind 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=3D">=3Ddev-libs/glib-2.25:2 - >=3Dx11-libs/gtk+-2.20:2 + >=3Dx11-libs/gtk+-2.90.0:3 gnome-base/gconf >=3Dsys-apps/dbus-1.0 >=3Ddev-libs/libgcrypt-1.2.2 @@ -47,6 +49,8 @@ DOCS=3D"AUTHORS ChangeLog NEWS README" =20 # tests fail in several ways, they should be fixed in the next cycle (bu= g #340283), # revisit then. +# UPDATE: tests use system-installed libraries, fail with: +# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-k= eyring-pkcs11.so: Couldn't initialize module: The device was removed or u= nplugged=20 RESTRICT=3D"test" =20 pkg_setup() { @@ -60,7 +64,7 @@ pkg_setup() { --enable-acl-prompts --enable-ssh-agent --enable-gpg-agent - --with-gtk=3D2.0" + --with-gtk=3D3.0" # $(use_enable valgrind) } =20