1 files changed, 15 insertions, 130 deletions

diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index f998a47ed0ff..2efe365ec459 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -1,97 +1,23 @@
 bin/gnome-keyring
+bin/gnome-keyring-3
 bin/gnome-keyring-daemon
 etc/xdg/autostart/gnome-keyring-gpg.desktop
 etc/xdg/autostart/gnome-keyring-pkcs11.desktop
 etc/xdg/autostart/gnome-keyring-secrets.desktop
 etc/xdg/autostart/gnome-keyring-ssh.desktop
-include/gcr/gcr/gcr-certificate-basics-widget.h
-include/gcr/gcr/gcr-certificate-details-widget.h
-include/gcr/gcr/gcr-certificate.h
-include/gcr/gcr/gcr-importer.h
-include/gcr/gcr/gcr-parser.h
-include/gcr/gcr/gcr-simple-certificate.h
-include/gcr/gcr/gcr-types.h
-include/gcr/gcr/gcr-unlock-options-widget.h
-include/gcr/gcr/gcr-unlock-options.h
-include/gcr/gcr/gcr.h
-include/gp11/gp11.h
-include/gp11/pkcs11.h
-include/gp11/pkcs11g.h
-include/gp11/pkcs11n.h
-lib/gnome-keyring/devel/gkm-ssh-store-standalone.la
+lib/gnome-keyring/devel/gkm-gnome2-store-standalone.so
+lib/gnome-keyring/devel/gkm-secret-store-standalone.so
 lib/gnome-keyring/devel/gkm-ssh-store-standalone.so
-lib/gnome-keyring/devel/gkm-user-store-standalone.la
-lib/gnome-keyring/devel/gkm-user-store-standalone.so
-lib/gnome-keyring/gnome-keyring-pkcs11.la
-lib/gnome-keyring/gnome-keyring-pkcs11.so
-lib/gnome-keyring/standalone/gkm-roots-store-standalone.la
-lib/gnome-keyring/standalone/gkm-roots-store-standalone.so
-lib/gnome-keyring/standalone/gkm-secret-store-standalone.la
-lib/gnome-keyring/standalone/gkm-secret-store-standalone.so
-lib/libgcr.la
-lib/libgcr.so
-lib/libgcr.so.0
-lib/libgcr.so.0.0.0
-lib/libgp11.la
-lib/libgp11.so
-lib/libgp11.so.0
-lib/libgp11.so.0.0.0
-lib/pam_gnome_keyring.la
+lib/gnome-keyring/devel/gkm-xdg-store-standalone.so
 lib/pam_gnome_keyring.so
-libdata/pkgconfig/gcr-0.pc
-libdata/pkgconfig/gp11-0.pc
-libexec/gnome-keyring-prompt
+lib/pkcs11/gnome-keyring-pkcs11.so
+man/man1/gnome-keyring-3.1.gz
+man/man1/gnome-keyring-daemon.1.gz
+man/man1/gnome-keyring.1.gz
 share/GConf/gsettings/org.gnome.crypto.cache.convert
-share/GConf/gsettings/org.gnome.crypto.pgp.convert
 share/dbus-1/services/org.freedesktop.secrets.service
 share/dbus-1/services/org.gnome.keyring.service
-share/doc/gcr-0/ch01.html
-share/doc/gcr-0/gcr-GcrCertificate.html
-share/doc/gcr-0/gcr-gcr-certificate-basics-widget.html
-share/doc/gcr-0/gcr-gcr-certificate-details-widget.html
-share/doc/gcr-0/gcr-gcr-import-dialog.html
-share/doc/gcr-0/gcr-gcr-importer.html
-share/doc/gcr-0/gcr-gcr-initializer.html
-share/doc/gcr-0/gcr-gcr-parser.html
-share/doc/gcr-0/gcr-gcr-simple-certificate.html
-share/doc/gcr-0/gcr-gcr-types.html
-share/doc/gcr-0/gcr-gcr-xxx.html
-share/doc/gcr-0/gcr-0.devhelp
-share/doc/gcr-0/gcr-0.devhelp2
-share/doc/gcr-0/home.png
-share/doc/gcr-0/index.html
-share/doc/gcr-0/index.sgml
-share/doc/gcr-0/left.png
-share/doc/gcr-0/right.png
-share/doc/gcr-0/style.css
-share/doc/gcr-0/up.png
-share/doc/gp11/GP11Module.html
-share/doc/gp11/GP11Object.html
-share/doc/gp11/GP11Session.html
-share/doc/gp11/GP11Slot.html
-share/doc/gp11/ch01.html
-share/doc/gp11/gp11-Errors.html
-share/doc/gp11/gp11-GP11Attribute.html
-share/doc/gp11/gp11-GP11Attributes.html
-share/doc/gp11/gp11-Miscellaneous-Functions.html
-share/doc/gp11/gp11.devhelp
-share/doc/gp11/gp11.devhelp2
-share/doc/gp11/home.png
-share/doc/gp11/index.html
-share/doc/gp11/index.sgml
-share/doc/gp11/left.png
-share/doc/gp11/right.png
-share/doc/gp11/style.css
-share/doc/gp11/up.png
-share/gcr/ui/gcr-certificate-basics-widget.ui
-share/gcr/ui/gcr-import-dialog.ui
-share/gcr/ui/gcr-unlock-options-widget.ui
-%%DATADIR%%/introspect/introspect-collection.xml
-%%DATADIR%%/introspect/introspect-item.xml
-%%DATADIR%%/introspect/introspect-prompt.xml
-%%DATADIR%%/introspect/introspect-service.xml
-%%DATADIR%%/introspect/introspect-session.xml
-%%DATADIR%%/ui/gku-prompt.ui
+share/locale/af/LC_MESSAGES/gnome-keyring.mo
 share/locale/ar/LC_MESSAGES/gnome-keyring.mo
 share/locale/as/LC_MESSAGES/gnome-keyring.mo
 share/locale/ast/LC_MESSAGES/gnome-keyring.mo
@@ -113,6 +39,7 @@ share/locale/el/LC_MESSAGES/gnome-keyring.mo
 share/locale/en@shaw/LC_MESSAGES/gnome-keyring.mo
 share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
 share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo
+share/locale/eo/LC_MESSAGES/gnome-keyring.mo
 share/locale/es/LC_MESSAGES/gnome-keyring.mo
 share/locale/et/LC_MESSAGES/gnome-keyring.mo
 share/locale/eu/LC_MESSAGES/gnome-keyring.mo
@@ -120,6 +47,7 @@ share/locale/fa/LC_MESSAGES/gnome-keyring.mo
 share/locale/fi/LC_MESSAGES/gnome-keyring.mo
 share/locale/fr/LC_MESSAGES/gnome-keyring.mo
 share/locale/ga/LC_MESSAGES/gnome-keyring.mo
+share/locale/gd/LC_MESSAGES/gnome-keyring.mo
 share/locale/gl/LC_MESSAGES/gnome-keyring.mo
 share/locale/gu/LC_MESSAGES/gnome-keyring.mo
 share/locale/he/LC_MESSAGES/gnome-keyring.mo
@@ -131,6 +59,7 @@ share/locale/is/LC_MESSAGES/gnome-keyring.mo
 share/locale/it/LC_MESSAGES/gnome-keyring.mo
 share/locale/ja/LC_MESSAGES/gnome-keyring.mo
 share/locale/ka/LC_MESSAGES/gnome-keyring.mo
+share/locale/km/LC_MESSAGES/gnome-keyring.mo
 share/locale/kn/LC_MESSAGES/gnome-keyring.mo
 share/locale/ko/LC_MESSAGES/gnome-keyring.mo
 share/locale/lt/LC_MESSAGES/gnome-keyring.mo
@@ -164,58 +93,14 @@ share/locale/sr@latin/LC_MESSAGES/gnome-keyring.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring.mo
 share/locale/ta/LC_MESSAGES/gnome-keyring.mo
 share/locale/te/LC_MESSAGES/gnome-keyring.mo
+share/locale/tg/LC_MESSAGES/gnome-keyring.mo
 share/locale/th/LC_MESSAGES/gnome-keyring.mo
 share/locale/tr/LC_MESSAGES/gnome-keyring.mo
+share/locale/ug/LC_MESSAGES/gnome-keyring.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring.mo
 share/locale/vi/LC_MESSAGES/gnome-keyring.mo
 share/locale/xh/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/introspect
-@dirrm %%DATADIR%%
-@dirrm share/gcr/ui
-@dirrm share/gcr
-@dirrm share/doc/gp11
-@dirrm share/doc/gcr-0
-@dirrm lib/gnome-keyring/standalone
-@dirrm lib/gnome-keyring/devel
-@dirrm lib/gnome-keyring
-@dirrm include/gp11
-@dirrm include/gcr/gcr
-@dirrm include/gcr
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
+share/p11-kit/modules/gnome-keyring.module