summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-crypt
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/WiRouterKeyRec/Manifest1
-rw-r--r--app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild41
-rw-r--r--app-crypt/WiRouterKeyRec/metadata.xml9
-rw-r--r--app-crypt/acr38u/Manifest1
-rw-r--r--app-crypt/acr38u/acr38u-1.7.11-r1.ebuild57
-rw-r--r--app-crypt/acr38u/acr38u-1.7.11-r3.ebuild44
-rw-r--r--app-crypt/acr38u/files/1.7.11-bis.rules15
-rw-r--r--app-crypt/acr38u/files/1.7.11.rules12
-rw-r--r--app-crypt/acr38u/files/acr38u-1.7.11-build.patch178
-rw-r--r--app-crypt/acr38u/metadata.xml14
-rw-r--r--app-crypt/aescrypt/Manifest1
-rw-r--r--app-crypt/aescrypt/aescrypt-3.0.6b.ebuild32
-rw-r--r--app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch62
-rw-r--r--app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch40
-rw-r--r--app-crypt/aescrypt/metadata.xml5
-rw-r--r--app-crypt/aespipe/Manifest2
-rw-r--r--app-crypt/aespipe/aespipe-2.3e.ebuild30
-rw-r--r--app-crypt/aespipe/aespipe-2.4c-r1.ebuild29
-rw-r--r--app-crypt/aespipe/metadata.xml10
-rw-r--r--app-crypt/aesutil/Manifest1
-rw-r--r--app-crypt/aesutil/aesutil-1.0.7.ebuild37
-rw-r--r--app-crypt/aesutil/metadata.xml5
-rw-r--r--app-crypt/af_alg/Manifest1
-rw-r--r--app-crypt/af_alg/af_alg-0_pre20120229.ebuild37
-rw-r--r--app-crypt/af_alg/metadata.xml17
-rw-r--r--app-crypt/asedriveiiie-serial/Manifest1
-rw-r--r--app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild46
-rw-r--r--app-crypt/asedriveiiie-serial/metadata.xml5
-rw-r--r--app-crypt/asedriveiiie-usb/Manifest1
-rw-r--r--app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild26
-rw-r--r--app-crypt/asedriveiiie-usb/metadata.xml5
-rw-r--r--app-crypt/asekey/Manifest1
-rw-r--r--app-crypt/asekey/asekey-3.7.ebuild36
-rw-r--r--app-crypt/asekey/files/asekey-3.7-bundle.patch24
-rw-r--r--app-crypt/asekey/metadata.xml5
-rw-r--r--app-crypt/bcrypt/Manifest1
-rw-r--r--app-crypt/bcrypt/bcrypt-1.1.ebuild33
-rw-r--r--app-crypt/bcrypt/files/bcrypt-1.1-Makefile.patch19
-rw-r--r--app-crypt/bcrypt/metadata.xml8
-rw-r--r--app-crypt/bcwipe/Manifest2
-rw-r--r--app-crypt/bcwipe/bcwipe-1.9.8.ebuild49
-rw-r--r--app-crypt/bcwipe/files/bcwipe-1.9.7-fix_warnings.patch20
-rw-r--r--app-crypt/bcwipe/files/bcwipe-1.9.8-fix-flags.patch11
-rw-r--r--app-crypt/bcwipe/metadata.xml5
-rw-r--r--app-crypt/bestcrypt/Manifest3
-rw-r--r--app-crypt/bestcrypt/bestcrypt-2.0.0.ebuild72
-rw-r--r--app-crypt/bestcrypt/bestcrypt-2.0.4.ebuild72
-rw-r--r--app-crypt/bestcrypt/bestcrypt-2.0.6.ebuild76
-rw-r--r--app-crypt/bestcrypt/files/bcrypt3104
-rw-r--r--app-crypt/bestcrypt/files/bestcrypt-2.0.0-build.patch59
-rw-r--r--app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch108
-rw-r--r--app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch341
-rw-r--r--app-crypt/bestcrypt/metadata.xml5
-rw-r--r--app-crypt/bsign/Manifest1
-rw-r--r--app-crypt/bsign/bsign-0.4.5-r1.ebuild34
-rw-r--r--app-crypt/bsign/bsign-0.4.5.ebuild35
-rw-r--r--app-crypt/bsign/files/bsign-0.4.5-build.patch31
-rw-r--r--app-crypt/bsign/files/bsign-0.4.5-non-gnu.patch42
-rw-r--r--app-crypt/bsign/files/bsign-0.4.5-scripts.patch48
-rw-r--r--app-crypt/bsign/metadata.xml13
-rw-r--r--app-crypt/cardpeek/Manifest3
-rw-r--r--app-crypt/cardpeek/cardpeek-0.7.1.ebuild24
-rw-r--r--app-crypt/cardpeek/cardpeek-0.7.2.ebuild24
-rw-r--r--app-crypt/cardpeek/cardpeek-0.8.2.ebuild25
-rw-r--r--app-crypt/cardpeek/metadata.xml5
-rw-r--r--app-crypt/ccid/Manifest2
-rw-r--r--app-crypt/ccid/ccid-1.4.15.ebuild49
-rw-r--r--app-crypt/ccid/ccid-1.4.18.ebuild49
-rw-r--r--app-crypt/ccid/files/92_pcscd_ccid-2.rules50
-rw-r--r--app-crypt/ccid/files/92_pcscd_ccid.rules50
-rw-r--r--app-crypt/ccid/metadata.xml8
-rw-r--r--app-crypt/ccrypt/Manifest2
-rw-r--r--app-crypt/ccrypt/ccrypt-1.10.ebuild21
-rw-r--r--app-crypt/ccrypt/ccrypt-1.9.ebuild21
-rw-r--r--app-crypt/ccrypt/metadata.xml5
-rw-r--r--app-crypt/chntpw/Manifest2
-rw-r--r--app-crypt/chntpw/chntpw-110511.ebuild47
-rw-r--r--app-crypt/chntpw/chntpw-140201.ebuild48
-rw-r--r--app-crypt/chntpw/metadata.xml5
-rw-r--r--app-crypt/ckpass/Manifest1
-rw-r--r--app-crypt/ckpass/ckpass-0.2.ebuild24
-rw-r--r--app-crypt/ckpass/files/ckpass-0.2-tinfo.patch10
-rw-r--r--app-crypt/ckpass/metadata.xml11
-rw-r--r--app-crypt/codecrypt/Manifest2
-rw-r--r--app-crypt/codecrypt/codecrypt-1.4.1.ebuild23
-rw-r--r--app-crypt/codecrypt/codecrypt-1.6.ebuild23
-rw-r--r--app-crypt/codecrypt/metadata.xml21
-rw-r--r--app-crypt/codegroup/Manifest1
-rw-r--r--app-crypt/codegroup/codegroup-20080907-r1.ebuild34
-rw-r--r--app-crypt/codegroup/files/codegroup-20080907-Makefile.patch20
-rw-r--r--app-crypt/codegroup/metadata.xml9
-rw-r--r--app-crypt/coolkey/Manifest2
-rw-r--r--app-crypt/coolkey/coolkey-1.1.0-r6.ebuild86
-rw-r--r--app-crypt/coolkey/metadata.xml5
-rw-r--r--app-crypt/crackpkcs12/Manifest1
-rw-r--r--app-crypt/crackpkcs12/crackpkcs12-0.2.9.ebuild17
-rw-r--r--app-crypt/crackpkcs12/metadata.xml10
-rw-r--r--app-crypt/cryptkeeper/Manifest1
-rw-r--r--app-crypt/cryptkeeper/cryptkeeper-0.9.5.ebuild44
-rw-r--r--app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-binutils-gold.patch15
-rw-r--r--app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix-ftbfs-gcc-4.7-672010.patch18
-rw-r--r--app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix_cryptkeeper.desktop.patch17
-rw-r--r--app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-is_mounted_overflow_fix.patch53
-rw-r--r--app-crypt/cryptkeeper/metadata.xml15
-rw-r--r--app-crypt/dieharder/Manifest2
-rw-r--r--app-crypt/dieharder/dieharder-2.28.1.ebuild38
-rw-r--r--app-crypt/dieharder/dieharder-3.31.1-r1.ebuild45
-rw-r--r--app-crypt/dieharder/dieharder-3.31.1.ebuild38
-rw-r--r--app-crypt/dieharder/files/dieharder-2.28.1-qafixes.patch33
-rw-r--r--app-crypt/dieharder/files/dieharder-3.31.1-build.patch27
-rw-r--r--app-crypt/dieharder/metadata.xml5
-rw-r--r--app-crypt/dirmngr/Manifest1
-rw-r--r--app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild41
-rw-r--r--app-crypt/dirmngr/files/dirmngr-1.1.1-pth.patch17
-rw-r--r--app-crypt/dirmngr/metadata.xml5
-rw-r--r--app-crypt/easy-rsa/Manifest2
-rw-r--r--app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild37
-rw-r--r--app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild36
-rw-r--r--app-crypt/easy-rsa/files/2.2.2-pkcs11.patch36
-rw-r--r--app-crypt/easy-rsa/files/65easy-rsa1
-rw-r--r--app-crypt/easy-rsa/files/easy-rsa-2.0.0-pkcs11.patch36
-rw-r--r--app-crypt/easy-rsa/files/no-licenses.patch14
-rw-r--r--app-crypt/easy-rsa/metadata.xml11
-rw-r--r--app-crypt/efitools/Manifest2
-rw-r--r--app-crypt/efitools/efitools-1.4.1-r1.ebuild23
-rw-r--r--app-crypt/efitools/efitools-1.4.1-r2.ebuild29
-rw-r--r--app-crypt/efitools/efitools-1.4.1.ebuild21
-rw-r--r--app-crypt/efitools/efitools-1.4.2-r1.ebuild23
-rw-r--r--app-crypt/efitools/efitools-1.4.2.ebuild22
-rw-r--r--app-crypt/efitools/files/xxdi.patch110
-rw-r--r--app-crypt/efitools/metadata.xml8
-rw-r--r--app-crypt/eid-mw/Manifest2
-rw-r--r--app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild65
-rw-r--r--app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild62
-rw-r--r--app-crypt/eid-mw/eid-mw-9999.ebuild62
-rw-r--r--app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch38
-rw-r--r--app-crypt/eid-mw/files/fix-nodialog-bug.patch20
-rw-r--r--app-crypt/eid-mw/metadata.xml29
-rw-r--r--app-crypt/ekeyd/Manifest2
-rw-r--r--app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild186
-rw-r--r--app-crypt/ekeyd/ekeyd-1.1.5.ebuild165
-rw-r--r--app-crypt/ekeyd/files/90-ekeyd.rules16
-rw-r--r--app-crypt/ekeyd/files/ekey-egd-linux.conf.210
-rw-r--r--app-crypt/ekeyd/files/ekey-egd-linux.init.223
-rw-r--r--app-crypt/ekeyd/files/ekey-ulusbd.conf.217
-rw-r--r--app-crypt/ekeyd/files/ekey-ulusbd.init.241
-rw-r--r--app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch133
-rw-r--r--app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch32
-rw-r--r--app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch23
-rw-r--r--app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch50
-rw-r--r--app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch49
-rw-r--r--app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch29
-rw-r--r--app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch36
-rw-r--r--app-crypt/ekeyd/files/ekeyd.init.230
-rw-r--r--app-crypt/ekeyd/files/ekeyd.service8
-rw-r--r--app-crypt/ekeyd/metadata.xml27
-rw-r--r--app-crypt/elettra/Manifest1
-rw-r--r--app-crypt/elettra/elettra-1.0.ebuild35
-rw-r--r--app-crypt/elettra/metadata.xml7
-rw-r--r--app-crypt/etcd-ca/Manifest2
-rw-r--r--app-crypt/etcd-ca/etcd-ca-0_p20140903.ebuild38
-rw-r--r--app-crypt/etcd-ca/etcd-ca-0_p20150423-r1.ebuild38
-rw-r--r--app-crypt/etcd-ca/etcd-ca-0_p20150423.ebuild38
-rw-r--r--app-crypt/etcd-ca/metadata.xml13
-rw-r--r--app-crypt/fcrackzip/Manifest1
-rw-r--r--app-crypt/fcrackzip/fcrackzip-1.0.ebuild27
-rw-r--r--app-crypt/fcrackzip/metadata.xml9
-rw-r--r--app-crypt/gcr/Manifest3
-rw-r--r--app-crypt/gcr/files/gcr-3.14.0-race-building.patch29
-rw-r--r--app-crypt/gcr/gcr-3.12.2.ebuild78
-rw-r--r--app-crypt/gcr/gcr-3.14.0.ebuild83
-rw-r--r--app-crypt/gcr/gcr-3.16.0.ebuild79
-rw-r--r--app-crypt/gcr/metadata.xml5
-rw-r--r--app-crypt/gentoo-keys/Manifest1
-rw-r--r--app-crypt/gentoo-keys/gentoo-keys-201501052117.ebuild27
-rw-r--r--app-crypt/gentoo-keys/metadata.xml8
-rw-r--r--app-crypt/gifshuffle/Manifest1
-rw-r--r--app-crypt/gifshuffle/gifshuffle-2.0.ebuild29
-rw-r--r--app-crypt/gifshuffle/metadata.xml7
-rw-r--r--app-crypt/gkeys-gen/Manifest1
-rw-r--r--app-crypt/gkeys-gen/gkeys-gen-0.1-r1.ebuild40
-rw-r--r--app-crypt/gkeys-gen/gkeys-gen-9999.ebuild57
-rw-r--r--app-crypt/gkeys-gen/metadata.xml8
-rw-r--r--app-crypt/gkeys/Manifest1
-rw-r--r--app-crypt/gkeys/gkeys-0.1-r1.ebuild53
-rw-r--r--app-crypt/gkeys/gkeys-9999.ebuild67
-rw-r--r--app-crypt/gkeys/metadata.xml8
-rw-r--r--app-crypt/gnupg-pkcs11-scd/Manifest1
-rw-r--r--app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.7.3.ebuild26
-rw-r--r--app-crypt/gnupg-pkcs11-scd/metadata.xml11
-rw-r--r--app-crypt/gnupg/Manifest5
-rw-r--r--app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch34
-rw-r--r--app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch35
-rw-r--r--app-crypt/gnupg/files/gnupg-2.0.26-misc-cve.patch118
-rw-r--r--app-crypt/gnupg/gnupg-1.4.19.ebuild115
-rw-r--r--app-crypt/gnupg/gnupg-2.0.26-r3.ebuild165
-rw-r--r--app-crypt/gnupg/gnupg-2.0.27-r1.ebuild167
-rw-r--r--app-crypt/gnupg/gnupg-2.0.27.ebuild163
-rw-r--r--app-crypt/gnupg/gnupg-2.0.28.ebuild167
-rw-r--r--app-crypt/gnupg/gnupg-2.1.6.ebuild170
-rw-r--r--app-crypt/gnupg/metadata.xml31
-rw-r--r--app-crypt/gorilla/Manifest1
-rw-r--r--app-crypt/gorilla/files/gorilla-script-destdir.patch17
-rw-r--r--app-crypt/gorilla/gorilla-1.4-r1.ebuild41
-rw-r--r--app-crypt/gorilla/metadata.xml11
-rw-r--r--app-crypt/gpa/Manifest4
-rw-r--r--app-crypt/gpa/gpa-0.9.4.ebuild36
-rw-r--r--app-crypt/gpa/gpa-0.9.5.ebuild36
-rw-r--r--app-crypt/gpa/gpa-0.9.6.ebuild36
-rw-r--r--app-crypt/gpa/gpa-0.9.7.ebuild36
-rw-r--r--app-crypt/gpa/metadata.xml5
-rw-r--r--app-crypt/gpg-ringmgr/Manifest1
-rw-r--r--app-crypt/gpg-ringmgr/gpg-ringmgr-1.12.ebuild31
-rw-r--r--app-crypt/gpg-ringmgr/metadata.xml8
-rw-r--r--app-crypt/gpgme/Manifest1
-rw-r--r--app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch11
-rw-r--r--app-crypt/gpgme/gpgme-1.5.5.ebuild41
-rw-r--r--app-crypt/gpgme/metadata.xml8
-rw-r--r--app-crypt/gpgstats/Manifest1
-rw-r--r--app-crypt/gpgstats/files/gpgstats-0.5-flags.patch25
-rw-r--r--app-crypt/gpgstats/gpgstats-0.5-r1.ebuild29
-rw-r--r--app-crypt/gpgstats/metadata.xml8
-rw-r--r--app-crypt/hashalot/Manifest1
-rw-r--r--app-crypt/hashalot/hashalot-0.3-r2.ebuild23
-rw-r--r--app-crypt/hashalot/metadata.xml5
-rw-r--r--app-crypt/hashcat-bin/Manifest3
-rw-r--r--app-crypt/hashcat-bin/hashcat-bin-0.46.ebuild111
-rw-r--r--app-crypt/hashcat-bin/hashcat-bin-0.47.ebuild111
-rw-r--r--app-crypt/hashcat-bin/hashcat-bin-0.49.ebuild111
-rw-r--r--app-crypt/hashcat-bin/metadata.xml10
-rw-r--r--app-crypt/hashcat-gui/Manifest1
-rw-r--r--app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild44
-rw-r--r--app-crypt/hashcat-gui/metadata.xml16
-rw-r--r--app-crypt/heimdal/Manifest1
-rw-r--r--app-crypt/heimdal/files/heimdal-kadmind.confd5
-rw-r--r--app-crypt/heimdal/files/heimdal-kadmind.initd-r223
-rw-r--r--app-crypt/heimdal/files/heimdal-kcm.confd5
-rw-r--r--app-crypt/heimdal/files/heimdal-kcm.initd-r122
-rw-r--r--app-crypt/heimdal/files/heimdal-kdc.confd5
-rw-r--r--app-crypt/heimdal/files/heimdal-kdc.initd-r225
-rw-r--r--app-crypt/heimdal/files/heimdal-kpasswdd.confd5
-rw-r--r--app-crypt/heimdal/files/heimdal-kpasswdd.initd-r223
-rw-r--r--app-crypt/heimdal/files/heimdal_db6.patch41
-rw-r--r--app-crypt/heimdal/files/heimdal_disable-check-iprop.patch16
-rw-r--r--app-crypt/heimdal/files/heimdal_link_order.patch41
-rw-r--r--app-crypt/heimdal/files/heimdal_missing-include.patch11
-rw-r--r--app-crypt/heimdal/files/heimdal_missing_symbols.patch28
-rw-r--r--app-crypt/heimdal/files/heimdal_texinfo-5.patch28
-rw-r--r--app-crypt/heimdal/files/heimdal_tinfo.patch22
-rw-r--r--app-crypt/heimdal/files/krb5.conf27
-rw-r--r--app-crypt/heimdal/heimdal-1.5.3-r2.ebuild194
-rw-r--r--app-crypt/heimdal/metadata.xml17
-rw-r--r--app-crypt/hmaccalc/Manifest1
-rw-r--r--app-crypt/hmaccalc/hmaccalc-0.9.13.ebuild31
-rw-r--r--app-crypt/hmaccalc/metadata.xml14
-rw-r--r--app-crypt/ima-evm-utils/Manifest2
-rw-r--r--app-crypt/ima-evm-utils/ima-evm-utils-0.2.ebuild33
-rw-r--r--app-crypt/ima-evm-utils/ima-evm-utils-0.8.ebuild33
-rw-r--r--app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild22
-rw-r--r--app-crypt/ima-evm-utils/metadata.xml14
-rw-r--r--app-crypt/jacksum/Manifest1
-rw-r--r--app-crypt/jacksum/jacksum-1.7.0.ebuild33
-rw-r--r--app-crypt/jacksum/metadata.xml8
-rw-r--r--app-crypt/johntheripper/Manifest2
-rw-r--r--app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch12
-rw-r--r--app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch83
-rw-r--r--app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch31
-rw-r--r--app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch17
-rw-r--r--app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild266
-rw-r--r--app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild251
-rw-r--r--app-crypt/johntheripper/metadata.xml15
-rw-r--r--app-crypt/kencfs/Manifest1
-rw-r--r--app-crypt/kencfs/files/kencfs-1.2-desktop.patch11
-rw-r--r--app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch13
-rw-r--r--app-crypt/kencfs/kencfs-1.5.0.ebuild38
-rw-r--r--app-crypt/kencfs/metadata.xml5
-rw-r--r--app-crypt/keybase/Manifest4
-rw-r--r--app-crypt/keybase/keybase-0.8.10.ebuild33
-rw-r--r--app-crypt/keybase/keybase-0.8.12.ebuild33
-rw-r--r--app-crypt/keybase/keybase-0.8.13.ebuild33
-rw-r--r--app-crypt/keybase/keybase-0.8.9.ebuild33
-rw-r--r--app-crypt/keybase/metadata.xml14
-rw-r--r--app-crypt/keylookup/Manifest1
-rw-r--r--app-crypt/keylookup/keylookup-2.2-r9999.ebuild14
-rw-r--r--app-crypt/keylookup/keylookup-2.2.ebuild21
-rw-r--r--app-crypt/keylookup/metadata.xml8
-rw-r--r--app-crypt/keynote/Manifest1
-rw-r--r--app-crypt/keynote/files/keynote-2.3-parallel-build.patch14
-rw-r--r--app-crypt/keynote/files/keynote-2.3-qa.patch44
-rw-r--r--app-crypt/keynote/keynote-2.3-r3.ebuild51
-rw-r--r--app-crypt/keynote/metadata.xml7
-rw-r--r--app-crypt/kstart/Manifest1
-rw-r--r--app-crypt/kstart/kstart-4.1.ebuild34
-rw-r--r--app-crypt/kstart/metadata.xml17
-rw-r--r--app-crypt/libscrypt/Manifest2
-rw-r--r--app-crypt/libscrypt/libscrypt-1.19.ebuild29
-rw-r--r--app-crypt/libscrypt/libscrypt-1.20.ebuild29
-rw-r--r--app-crypt/libscrypt/metadata.xml11
-rw-r--r--app-crypt/libsecret/Manifest2
-rw-r--r--app-crypt/libsecret/libsecret-0.18.2.ebuild66
-rw-r--r--app-crypt/libsecret/libsecret-0.18.ebuild71
-rw-r--r--app-crypt/libsecret/metadata.xml8
-rw-r--r--app-crypt/libu2f-host/Manifest2
-rw-r--r--app-crypt/libu2f-host/libu2f-host-0.0.2.ebuild49
-rw-r--r--app-crypt/libu2f-host/libu2f-host-0.0.4.ebuild49
-rw-r--r--app-crypt/libu2f-host/metadata.xml18
-rw-r--r--app-crypt/libykneomgr/Manifest2
-rw-r--r--app-crypt/libykneomgr/libykneomgr-0.1.6.ebuild32
-rw-r--r--app-crypt/libykneomgr/libykneomgr-0.1.7.ebuild32
-rw-r--r--app-crypt/libykneomgr/metadata.xml12
-rw-r--r--app-crypt/loop-aes-losetup/Manifest2
-rw-r--r--app-crypt/loop-aes-losetup/loop-aes-losetup-2.21.ebuild96
-rw-r--r--app-crypt/loop-aes-losetup/metadata.xml5
-rw-r--r--app-crypt/mcrypt/Manifest1
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.7-qa.patch22
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch31
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.8-overflow.patch25
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.8-segv.patch40
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch108
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch11
-rw-r--r--app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild39
-rw-r--r--app-crypt/mcrypt/metadata.xml12
-rw-r--r--app-crypt/md4sum/Manifest1
-rw-r--r--app-crypt/md4sum/files/md4sum-fix-out-of-bounds-write.diff11
-rw-r--r--app-crypt/md4sum/md4sum-0.02.03-r1.ebuild31
-rw-r--r--app-crypt/md4sum/metadata.xml5
-rw-r--r--app-crypt/md5deep/Manifest2
-rw-r--r--app-crypt/md5deep/md5deep-4.3.ebuild17
-rw-r--r--app-crypt/md5deep/md5deep-4.4.ebuild22
-rw-r--r--app-crypt/md5deep/metadata.xml11
-rw-r--r--app-crypt/md6sum/Manifest1
-rw-r--r--app-crypt/md6sum/files/md6sum-1.0-cflags.patch27
-rw-r--r--app-crypt/md6sum/files/md6sum-1.0-format-security.patch26
-rw-r--r--app-crypt/md6sum/files/md6sum-1.0-ldflags.patch12
-rw-r--r--app-crypt/md6sum/md6sum-1.0-r2.ebuild27
-rw-r--r--app-crypt/md6sum/metadata.xml10
-rw-r--r--app-crypt/mdcrack/Manifest1
-rw-r--r--app-crypt/mdcrack/files/mdcrack-1.2-asneeded.patch20
-rw-r--r--app-crypt/mdcrack/files/mdcrack-1.2-gcc4.diff24
-rw-r--r--app-crypt/mdcrack/files/mdcrack-1.2-remove-interactive-test.diff120
-rw-r--r--app-crypt/mdcrack/mdcrack-1.2.ebuild57
-rw-r--r--app-crypt/mdcrack/metadata.xml5
-rw-r--r--app-crypt/metadata.xml40
-rw-r--r--app-crypt/mhash/Manifest1
-rw-r--r--app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch96
-rw-r--r--app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch27
-rw-r--r--app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch27
-rw-r--r--app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch27
-rw-r--r--app-crypt/mhash/files/mhash-0.9.9-mutils-align.patch118
-rw-r--r--app-crypt/mhash/files/mhash-0.9.9.9-align.patch119
-rw-r--r--app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch16
-rw-r--r--app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch14
-rw-r--r--app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch12
-rw-r--r--app-crypt/mhash/metadata.xml11
-rw-r--r--app-crypt/mhash/mhash-0.9.9.9-r1.ebuild52
-rw-r--r--app-crypt/mit-krb5-appl/Manifest1
-rw-r--r--app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch55
-rw-r--r--app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch12
-rw-r--r--app-crypt/mit-krb5-appl/metadata.xml5
-rw-r--r--app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild63
-rw-r--r--app-crypt/mit-krb5/Manifest1
-rw-r--r--app-crypt/mit-krb5/files/kpropd.xinetd11
-rw-r--r--app-crypt/mit-krb5/files/mit-krb5-1.12_warn_cflags.patch11
-rw-r--r--app-crypt/mit-krb5/files/mit-krb5-config_LDFLAGS.patch12
-rw-r--r--app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r125
-rw-r--r--app-crypt/mit-krb5/files/mit-krb5kdc.initd-r124
-rw-r--r--app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r124
-rw-r--r--app-crypt/mit-krb5/metadata.xml16
-rw-r--r--app-crypt/mit-krb5/mit-krb5-1.13.2.ebuild151
-rw-r--r--app-crypt/monkeysign/Manifest1
-rw-r--r--app-crypt/monkeysign/files/monkeysign-1.1-basename.patch12
-rw-r--r--app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch17
-rw-r--r--app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch28
-rw-r--r--app-crypt/monkeysign/files/monkeysign.desktop9
-rw-r--r--app-crypt/monkeysign/metadata.xml8
-rw-r--r--app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild51
-rw-r--r--app-crypt/monkeysphere/Manifest2
-rw-r--r--app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch12
-rw-r--r--app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch14
-rw-r--r--app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch14
-rw-r--r--app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch34
-rw-r--r--app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch50
-rw-r--r--app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch12
-rw-r--r--app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch12
-rw-r--r--app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch14
-rw-r--r--app-crypt/monkeysphere/metadata.xml8
-rw-r--r--app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild58
-rw-r--r--app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild68
-rw-r--r--app-crypt/monkeysphere/monkeysphere-0.37.ebuild58
-rw-r--r--app-crypt/nasty/Manifest1
-rw-r--r--app-crypt/nasty/files/nasty-0.6-flags.patch22
-rw-r--r--app-crypt/nasty/metadata.xml8
-rw-r--r--app-crypt/nasty/nasty-0.6-r1.ebuild30
-rw-r--r--app-crypt/nistp224/Manifest1
-rw-r--r--app-crypt/nistp224/files/nistp224-0.75-asmfix.patch39
-rw-r--r--app-crypt/nistp224/files/nistp224-0.75-declare-exit.patch18
-rw-r--r--app-crypt/nistp224/files/nistp224-0.75-honour-CC.patch79
-rw-r--r--app-crypt/nistp224/metadata.xml13
-rw-r--r--app-crypt/nistp224/nistp224-0.75-r1.ebuild57
-rw-r--r--app-crypt/nwipe/Manifest3
-rw-r--r--app-crypt/nwipe/files/nwipe-0.12-ncurses.patch59
-rw-r--r--app-crypt/nwipe/metadata.xml12
-rw-r--r--app-crypt/nwipe/nwipe-0.12-r1.ebuild28
-rw-r--r--app-crypt/nwipe/nwipe-0.12.ebuild24
-rw-r--r--app-crypt/nwipe/nwipe-0.13.ebuild21
-rw-r--r--app-crypt/nwipe/nwipe-0.14.ebuild21
-rw-r--r--app-crypt/oclhashcat-lite-bin/Manifest1
-rw-r--r--app-crypt/oclhashcat-lite-bin/metadata.xml11
-rw-r--r--app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.15.ebuild150
-rw-r--r--app-crypt/oclhashcat-plus-bin/Manifest1
-rw-r--r--app-crypt/oclhashcat-plus-bin/metadata.xml11
-rw-r--r--app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.15.ebuild147
-rw-r--r--app-crypt/onak/Manifest1
-rw-r--r--app-crypt/onak/files/onak-0.3.7-berkdb-5.0.patch13
-rw-r--r--app-crypt/onak/metadata.xml8
-rw-r--r--app-crypt/onak/onak-0.4.0.ebuild56
-rw-r--r--app-crypt/openssl-blacklist/Manifest2
-rw-r--r--app-crypt/openssl-blacklist/metadata.xml10
-rw-r--r--app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild52
-rw-r--r--app-crypt/openssl-tpm-engine/Manifest1
-rw-r--r--app-crypt/openssl-tpm-engine/metadata.xml8
-rw-r--r--app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.1.ebuild34
-rw-r--r--app-crypt/openvpn-blacklist/Manifest1
-rw-r--r--app-crypt/openvpn-blacklist/metadata.xml5
-rw-r--r--app-crypt/openvpn-blacklist/openvpn-blacklist-0.4-r1.ebuild33
-rw-r--r--app-crypt/ophcrack-tables/Manifest3
-rw-r--r--app-crypt/ophcrack-tables/metadata.xml16
-rw-r--r--app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild39
-rw-r--r--app-crypt/ophcrack/Manifest5
-rw-r--r--app-crypt/ophcrack/metadata.xml14
-rw-r--r--app-crypt/ophcrack/ophcrack-3.1.0-r2.ebuild35
-rw-r--r--app-crypt/ophcrack/ophcrack-3.3.0.ebuild35
-rw-r--r--app-crypt/ophcrack/ophcrack-3.3.1.ebuild42
-rw-r--r--app-crypt/ophcrack/ophcrack-3.4.0.ebuild42
-rw-r--r--app-crypt/ophcrack/ophcrack-3.6.0.ebuild42
-rw-r--r--app-crypt/osslsigncode/Manifest1
-rw-r--r--app-crypt/osslsigncode/metadata.xml11
-rw-r--r--app-crypt/osslsigncode/osslsigncode-1.4.ebuild23
-rw-r--r--app-crypt/p11-kit/Manifest4
-rw-r--r--app-crypt/p11-kit/metadata.xml9
-rw-r--r--app-crypt/p11-kit/p11-kit-0.20.7.ebuild46
-rw-r--r--app-crypt/p11-kit/p11-kit-0.22.0.ebuild46
-rw-r--r--app-crypt/p11-kit/p11-kit-0.22.1.ebuild46
-rw-r--r--app-crypt/p11-kit/p11-kit-0.23.1.ebuild46
-rw-r--r--app-crypt/paperkey/Manifest1
-rw-r--r--app-crypt/paperkey/metadata.xml8
-rw-r--r--app-crypt/paperkey/paperkey-1.3.ebuild16
-rw-r--r--app-crypt/pdfcrack/Manifest2
-rw-r--r--app-crypt/pdfcrack/files/pdfcrack-0.13-build.patch22
-rw-r--r--app-crypt/pdfcrack/files/pdfcrack-0.14-cflags.patch8
-rw-r--r--app-crypt/pdfcrack/metadata.xml8
-rw-r--r--app-crypt/pdfcrack/pdfcrack-0.13.ebuild28
-rw-r--r--app-crypt/pdfcrack/pdfcrack-0.14.ebuild28
-rw-r--r--app-crypt/pesign/Manifest1
-rw-r--r--app-crypt/pesign/files/destdir.patch10
-rw-r--r--app-crypt/pesign/metadata.xml11
-rw-r--r--app-crypt/pesign/pesign-0.108.ebuild53
-rw-r--r--app-crypt/pgpdump/Manifest2
-rw-r--r--app-crypt/pgpdump/files/pgpdump-0.28-respect-ldflags.patch42
-rw-r--r--app-crypt/pgpdump/metadata.xml8
-rw-r--r--app-crypt/pgpdump/pgpdump-0.28-r1.ebuild29
-rw-r--r--app-crypt/pgpdump/pgpdump-0.29.ebuild29
-rw-r--r--app-crypt/pinentry/Manifest2
-rw-r--r--app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch25
-rw-r--r--app-crypt/pinentry/files/pinentry-0.8.2-texi.patch20
-rw-r--r--app-crypt/pinentry/files/pinentry-0.9.0-accessibility.patch82
-rw-r--r--app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch49
-rw-r--r--app-crypt/pinentry/files/pinentry-0.9.5-build.patch52
-rw-r--r--app-crypt/pinentry/metadata.xml8
-rw-r--r--app-crypt/pinentry/pinentry-0.9.0-r3.ebuild101
-rw-r--r--app-crypt/pinentry/pinentry-0.9.0.ebuild98
-rw-r--r--app-crypt/pinentry/pinentry-0.9.5.ebuild89
-rw-r--r--app-crypt/pius/Manifest3
-rw-r--r--app-crypt/pius/metadata.xml18
-rw-r--r--app-crypt/pius/pius-2.0.10.ebuild30
-rw-r--r--app-crypt/pius/pius-2.0.11.ebuild28
-rw-r--r--app-crypt/pius/pius-2.0.9.ebuild30
-rw-r--r--app-crypt/pkcrack/Manifest1
-rw-r--r--app-crypt/pkcrack/metadata.xml8
-rw-r--r--app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild59
-rw-r--r--app-crypt/pkcrack/pkcrack-1.2.2.ebuild54
-rw-r--r--app-crypt/pkcs11-data/Manifest1
-rw-r--r--app-crypt/pkcs11-data/metadata.xml8
-rw-r--r--app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild25
-rw-r--r--app-crypt/pkcs11-dump/Manifest1
-rw-r--r--app-crypt/pkcs11-dump/metadata.xml8
-rw-r--r--app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild25
-rw-r--r--app-crypt/qca-cyrus-sasl/Manifest1
-rw-r--r--app-crypt/qca-cyrus-sasl/metadata.xml7
-rw-r--r--app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild36
-rw-r--r--app-crypt/qca-gnupg/Manifest1
-rw-r--r--app-crypt/qca-gnupg/metadata.xml7
-rw-r--r--app-crypt/qca-gnupg/qca-gnupg-2.0.0_beta3.ebuild37
-rw-r--r--app-crypt/qca-logger/Manifest1
-rw-r--r--app-crypt/qca-logger/metadata.xml7
-rw-r--r--app-crypt/qca-logger/qca-logger-2.0.0_beta2.ebuild36
-rw-r--r--app-crypt/qca-ossl/Manifest1
-rw-r--r--app-crypt/qca-ossl/files/qca-ossl-openssl-1.0.0.patch155
-rw-r--r--app-crypt/qca-ossl/metadata.xml7
-rw-r--r--app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r2.ebuild42
-rw-r--r--app-crypt/qca-pkcs11/Manifest1
-rw-r--r--app-crypt/qca-pkcs11/files/qca-pkcs11-2.0.0_beta2-gcc44.patch12
-rw-r--r--app-crypt/qca-pkcs11/metadata.xml7
-rw-r--r--app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild40
-rw-r--r--app-crypt/qca/Manifest2
-rw-r--r--app-crypt/qca/files/qca-2.0.2-pcfilespath.patch13
-rw-r--r--app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch59
-rw-r--r--app-crypt/qca/files/qca-2.1.0.3-qt55.patch26
-rw-r--r--app-crypt/qca/files/qca-disable-pgp-test.patch13
-rw-r--r--app-crypt/qca/metadata.xml18
-rw-r--r--app-crypt/qca/qca-2.0.3-r1.ebuild80
-rw-r--r--app-crypt/qca/qca-2.1.0.3.ebuild123
-rw-r--r--app-crypt/quickcrypt/Manifest1
-rw-r--r--app-crypt/quickcrypt/metadata.xml8
-rw-r--r--app-crypt/quickcrypt/quickcrypt-0.9.2b.ebuild23
-rw-r--r--app-crypt/rainbowcrack/Manifest2
-rw-r--r--app-crypt/rainbowcrack/metadata.xml14
-rw-r--r--app-crypt/rainbowcrack/rainbowcrack-1.5.ebuild46
-rw-r--r--app-crypt/rotix/Manifest1
-rw-r--r--app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch31
-rw-r--r--app-crypt/rotix/files/rotix-0.83-interix.patch15
-rw-r--r--app-crypt/rotix/files/rotix-0.83-locale.diff10
-rw-r--r--app-crypt/rotix/metadata.xml8
-rw-r--r--app-crypt/rotix/rotix-0.83.ebuild33
-rw-r--r--app-crypt/sbsigntool/Manifest1
-rw-r--r--app-crypt/sbsigntool/files/0002-image.c-clear-image-variable.patch29
-rw-r--r--app-crypt/sbsigntool/files/0003-Fix-for-multi-sign.patch39
-rw-r--r--app-crypt/sbsigntool/metadata.xml11
-rw-r--r--app-crypt/sbsigntool/sbsigntool-0.6-r1.ebuild38
-rw-r--r--app-crypt/sbsigntool/sbsigntool-0.6.ebuild36
-rw-r--r--app-crypt/scl011-bin/Manifest2
-rw-r--r--app-crypt/scl011-bin/files/92_pcscd_scl011-bin.rules10
-rw-r--r--app-crypt/scl011-bin/metadata.xml14
-rw-r--r--app-crypt/scl011-bin/scl011-bin-2.06.ebuild43
-rw-r--r--app-crypt/scrypt/Manifest1
-rw-r--r--app-crypt/scrypt/metadata.xml5
-rw-r--r--app-crypt/scrypt/scrypt-1.1.6.ebuild20
-rw-r--r--app-crypt/scute/Manifest1
-rw-r--r--app-crypt/scute/files/scute-1.2.0-noversion.patch14
-rw-r--r--app-crypt/scute/files/scute-1.4.0-tests.patch13
-rw-r--r--app-crypt/scute/metadata.xml28
-rw-r--r--app-crypt/scute/scute-1.4.0.ebuild50
-rw-r--r--app-crypt/seahorse-sharing/Manifest1
-rw-r--r--app-crypt/seahorse-sharing/metadata.xml5
-rw-r--r--app-crypt/seahorse-sharing/seahorse-sharing-3.8.0.ebuild59
-rw-r--r--app-crypt/seahorse/Manifest2
-rw-r--r--app-crypt/seahorse/files/seahorse-3.16.0-gnupg-detection.patch173
-rw-r--r--app-crypt/seahorse/metadata.xml30
-rw-r--r--app-crypt/seahorse/seahorse-3.14.1.ebuild67
-rw-r--r--app-crypt/seahorse/seahorse-3.16.0-r1.ebuild71
-rw-r--r--app-crypt/sgeps/Manifest1
-rw-r--r--app-crypt/sgeps/metadata.xml13
-rw-r--r--app-crypt/sgeps/sgeps-0_pre15.ebuild43
-rw-r--r--app-crypt/shash/Manifest1
-rw-r--r--app-crypt/shash/files/0.2.6-manpage-fixes.patch30
-rw-r--r--app-crypt/shash/files/shash-0.2.6-binary-files.patch34
-rw-r--r--app-crypt/shash/files/shash.bash-completion39
-rw-r--r--app-crypt/shash/metadata.xml10
-rw-r--r--app-crypt/shash/shash-0.2.6-r2.ebuild34
-rw-r--r--app-crypt/shishi/Manifest2
-rw-r--r--app-crypt/shishi/files/shishi-1.0.2_automake-1.12.patch24
-rw-r--r--app-crypt/shishi/files/shishi_automake-1.12.patch35
-rw-r--r--app-crypt/shishi/files/shishi_gets.patch20
-rw-r--r--app-crypt/shishi/files/shishi_resolv.patch31
-rw-r--r--app-crypt/shishi/files/shishid.confd6
-rw-r--r--app-crypt/shishi/files/shishid.init25
-rw-r--r--app-crypt/shishi/metadata.xml15
-rw-r--r--app-crypt/shishi/shishi-1.0.1-r1.ebuild81
-rw-r--r--app-crypt/shishi/shishi-1.0.1-r2.ebuild82
-rw-r--r--app-crypt/shishi/shishi-1.0.1.ebuild79
-rw-r--r--app-crypt/shishi/shishi-1.0.2.ebuild76
-rw-r--r--app-crypt/sign/Manifest1
-rw-r--r--app-crypt/sign/files/1.0.7-as-needed.patch10
-rw-r--r--app-crypt/sign/files/1.0.7-openssl-0.9.8.patch12
-rw-r--r--app-crypt/sign/metadata.xml20
-rw-r--r--app-crypt/sign/sign-1.0.7.ebuild37
-rw-r--r--app-crypt/signing-party/Manifest3
-rw-r--r--app-crypt/signing-party/files/signing-party-makefile.diff18
-rw-r--r--app-crypt/signing-party/metadata.xml5
-rw-r--r--app-crypt/signing-party/signing-party-1.1.11-r1.ebuild117
-rw-r--r--app-crypt/signing-party/signing-party-1.1.4.ebuild107
-rw-r--r--app-crypt/signing-party/signing-party-2.0.ebuild115
-rw-r--r--app-crypt/simple-tpm-pk11/Manifest1
-rw-r--r--app-crypt/simple-tpm-pk11/metadata.xml11
-rw-r--r--app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.03.ebuild35
-rw-r--r--app-crypt/ssdeep/Manifest4
-rw-r--r--app-crypt/ssdeep/files/ssdeep-2.10-shared.patch10
-rw-r--r--app-crypt/ssdeep/metadata.xml8
-rw-r--r--app-crypt/ssdeep/ssdeep-2.10.ebuild21
-rw-r--r--app-crypt/ssdeep/ssdeep-2.11.1.ebuild21
-rw-r--r--app-crypt/ssdeep/ssdeep-2.12.ebuild21
-rw-r--r--app-crypt/ssdeep/ssdeep-2.13.ebuild21
-rw-r--r--app-crypt/ssh-multiadd/Manifest1
-rw-r--r--app-crypt/ssh-multiadd/metadata.xml8
-rw-r--r--app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild35
-rw-r--r--app-crypt/ssh-multiadd/ssh-multiadd-1.3.2.ebuild40
-rw-r--r--app-crypt/stan/Manifest1
-rw-r--r--app-crypt/stan/files/stan-0.4.1-errno.patch26
-rw-r--r--app-crypt/stan/metadata.xml5
-rw-r--r--app-crypt/stan/stan-0.4.1.ebuild27
-rw-r--r--app-crypt/tc-play/Manifest1
-rw-r--r--app-crypt/tc-play/metadata.xml13
-rw-r--r--app-crypt/tc-play/tc-play-2.0.ebuild52
-rw-r--r--app-crypt/tinyca/Manifest1
-rw-r--r--app-crypt/tinyca/files/tinyca-2.0.7.3-compositefix.patch12
-rw-r--r--app-crypt/tinyca/files/tinyca-2.0.7.5-openssl-1.patch48
-rw-r--r--app-crypt/tinyca/files/tinyca-2.0.7.5-perl-5.18.patch47
-rw-r--r--app-crypt/tinyca/metadata.xml5
-rw-r--r--app-crypt/tinyca/tinyca-2.0.7.5-r2.ebuild68
-rw-r--r--app-crypt/tpm-emulator/Manifest1
-rw-r--r--app-crypt/tpm-emulator/files/tpm-emulator.confd-0.7.42
-rw-r--r--app-crypt/tpm-emulator/files/tpm-emulator.initd54
-rwxr-xr-xapp-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.460
-rw-r--r--app-crypt/tpm-emulator/files/tpm-emulator.udev1
-rw-r--r--app-crypt/tpm-emulator/metadata.xml8
-rw-r--r--app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild69
-rw-r--r--app-crypt/tpm-tools/Manifest1
-rw-r--r--app-crypt/tpm-tools/files/tpm-tools-1.3.8-build.patch10
-rw-r--r--app-crypt/tpm-tools/files/tpm-tools-1.3.8-gold.patch10
-rw-r--r--app-crypt/tpm-tools/metadata.xml14
-rw-r--r--app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild52
-rw-r--r--app-crypt/trousers/Manifest2
-rw-r--r--app-crypt/trousers/files/61-trousers.rules2
-rw-r--r--app-crypt/trousers/files/tcsd.confd9
-rw-r--r--app-crypt/trousers/files/tcsd.initd39
-rw-r--r--app-crypt/trousers/files/tcsd.service10
-rw-r--r--app-crypt/trousers/files/trousers-0.3.13-nouseradd.patch12
-rw-r--r--app-crypt/trousers/files/trousers-0.3.5-nouseradd.patch11
-rw-r--r--app-crypt/trousers/metadata.xml9
-rw-r--r--app-crypt/trousers/trousers-0.3.10-r1.ebuild104
-rw-r--r--app-crypt/trousers/trousers-0.3.13.ebuild101
-rw-r--r--app-crypt/truecrypt/Manifest4
-rw-r--r--app-crypt/truecrypt/files/execstack-fix.diff60
-rw-r--r--app-crypt/truecrypt/files/makefile-archdetect.diff11
-rw-r--r--app-crypt/truecrypt/files/truecrypt-7.1a-build.patch16
-rw-r--r--app-crypt/truecrypt/files/truecrypt-stop.sh9
-rw-r--r--app-crypt/truecrypt/files/truecrypt.init29
-rw-r--r--app-crypt/truecrypt/metadata.xml11
-rw-r--r--app-crypt/truecrypt/truecrypt-7.1a.ebuild126
-rw-r--r--app-crypt/truecrypt/truecrypt-7.2.ebuild114
-rw-r--r--app-crypt/xca/Manifest1
-rw-r--r--app-crypt/xca/files/xca-1.0.0-desktop.patch8
-rw-r--r--app-crypt/xca/files/xca-1.1.0-ec.patch124
-rw-r--r--app-crypt/xca/metadata.xml8
-rw-r--r--app-crypt/xca/xca-1.1.0.ebuild44
-rw-r--r--app-crypt/xor-analyze/Manifest1
-rw-r--r--app-crypt/xor-analyze/metadata.xml5
-rw-r--r--app-crypt/xor-analyze/xor-analyze-0.5.ebuild25
-rw-r--r--app-crypt/yubikey-neo-manager/Manifest3
-rw-r--r--app-crypt/yubikey-neo-manager/metadata.xml13
-rw-r--r--app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.1.0.ebuild48
-rw-r--r--app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.2.1.ebuild48
-rw-r--r--app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.3.0.ebuild50
653 files changed, 19409 insertions, 0 deletions
diff --git a/app-crypt/WiRouterKeyRec/Manifest b/app-crypt/WiRouterKeyRec/Manifest
new file mode 100644
index 000000000000..42c5cf90cc5d
--- /dev/null
+++ b/app-crypt/WiRouterKeyRec/Manifest
@@ -0,0 +1 @@
+DIST WiRouterKeyRec-1.1.2.zip 117262 SHA256 3e59138f35502b32b47bd91fe18c0c232921c08d32525a2ae3c14daec09058d4 SHA512 a3c449497e3f3fed88dfbb35a90a2cfa5937efa02393e825ec51ab390b7094ce619d3238a916afd2b48e35e0e261b454f7d7005af46d6a45d77b2e1d4faaac51 WHIRLPOOL e52d316a01ba84bbe34f3a7b8abdf94287b67f3b28bc4ccfd0036fb21cd38c711d1bb2388b9b55f9253cd01ae26e032547624d8a25b55acfa9ea4e1ee36f96f2
diff --git a/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
new file mode 100644
index 000000000000..cee83355103b
--- /dev/null
+++ b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+MY_PN="WiRouter_KeyRec"
+MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="Recovery tool for wpa passphrase"
+HOMEPAGE="http://www.salvatorefresta.net"
+SRC_URI="http://tools.salvatorefresta.net/${MY_P}.zip -> ${P}.zip"
+
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare () {
+ sed -i "s:wirouterkeyrec:${PN}:" src/*.h || die
+}
+
+src_compile () {
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install () {
+ newbin build/wirouterkeyrec ${PN}
+ insinto /etc/${PN}
+ doins config/agpf_config.lst config/teletu_config.lst
+}
diff --git a/app-crypt/WiRouterKeyRec/metadata.xml b/app-crypt/WiRouterKeyRec/metadata.xml
new file mode 100644
index 000000000000..6c08151bd39f
--- /dev/null
+++ b/app-crypt/WiRouterKeyRec/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>ago@gentoo.org</email>
+ <name>Agostino Sarubbo</name>
+ </maintainer>
+</pkgmetadata>
+
diff --git a/app-crypt/acr38u/Manifest b/app-crypt/acr38u/Manifest
new file mode 100644
index 000000000000..70ff4c452d0c
--- /dev/null
+++ b/app-crypt/acr38u/Manifest
@@ -0,0 +1 @@
+DIST ACR38_LINUX_100711_P.tar.bz2 274137 SHA256 7d7e4fa97def2415f4b5c9e90cfedc2f7acbe94ca8b1653a5d8a85e24fc0ab53 SHA512 c5d0e71ae383de515718d24110b825efa84cf1a150ec7249f80070446331fb4df4d157f5f4e96d45588346e51ab8e2012530edae92575b66891c7ee596d8d3f7 WHIRLPOOL d63f7d1a8ff51ff131e0e0bcf943bbb5c38773b707019e695377fc42b5a91029ac22736dae95f10342a8d44370f90f766c9bdbf23f5c445c8f41c051303f87c3
diff --git a/app-crypt/acr38u/acr38u-1.7.11-r1.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r1.ebuild
new file mode 100644
index 000000000000..2dcc78feab12
--- /dev/null
+++ b/app-crypt/acr38u/acr38u-1.7.11-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit multilib eutils versionator autotools toolchain-funcs udev
+
+MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader"
+
+#SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}.tar.bz2"
+# tarball release is encapsuled in a .zip file :-(
+# http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip
+# I'm waiting an answer from info@acs.com.hk about that !
+SRC_URI="http://www.linuxunderground.be/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.acs.com.hk"
+
+# Make this safe from collisions, require a version of pcsc-lite that
+# uses libusb-1.0 and use the wrapper library instead.
+# Changed back from dev-libs/libusb-compat to virtual/libusb:0 because
+# libusb-compat is marked stable and primary in the virtual. -ssuominen
+RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+ virtual/libusb:0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+IUSE=""
+
+src_prepare() {
+ epatch_user
+
+ sed -i -e '/pcdir/s:@prefix@/lib:$(libdir):' src/controllib/Makefile.am
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-static=false \
+ --enable-usbdropdir="${D}/usr/$(get_libdir)/readers/usb"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ prune_libtool_files
+
+ # note: for eudev support this pkg may always need to install rules to /usr
+ udev_newrules "${FILESDIR}"/${PV}.rules 92-pcscd-acr38u.rules
+}
diff --git a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
new file mode 100644
index 000000000000..4c4104b8b7b3
--- /dev/null
+++ b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib eutils versionator toolchain-funcs udev autotools-utils
+
+MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader"
+
+#SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}.tar.bz2"
+# tarball release is encapsuled in a .zip file :-(
+# http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip
+# I'm waiting an answer from info@acs.com.hk about that !
+SRC_URI="http://www.linuxunderground.be/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.acs.com.hk"
+
+# Make this safe from collisions, require a version of pcsc-lite that
+# uses libusb-1.0 and use the wrapper library instead.
+# Changed back from dev-libs/libusb-compat to virtual/libusb:0 because
+# libusb-compat is marked stable and primary in the virtual. -ssuominen
+RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+ virtual/libusb:0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+IUSE=""
+
+AUTOTOOLS_AUTORECONF=yes
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_install() {
+ autotools-utils_src_install
+
+ # note: for eudev support this pkg may always need to install rules to /usr
+ udev_newrules "${FILESDIR}"/${PV}-bis.rules 92-pcscd-acr38u.rules
+}
diff --git a/app-crypt/acr38u/files/1.7.11-bis.rules b/app-crypt/acr38u/files/1.7.11-bis.rules
new file mode 100644
index 000000000000..784c606f4044
--- /dev/null
+++ b/app-crypt/acr38u/files/1.7.11-bis.rules
@@ -0,0 +1,15 @@
+# udev rules to set the access rights of non CCID ACR38u smart card readers
+# so they can be used by pcscd
+
+ACTION!="add", GOTO="pcscd_acr38u_rules_end"
+SUBSYSTEM!="usb", GOTO="pcscd_acr38u_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="pcscd_acr38u_rules_end"
+
+# change group from default "root" to "pcscd"
+ENV{ID_USB_INTERFACES}=="*:0b0000:*", ENV{PCSCD}="1"
+
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="9000", ENV{PCSCD}="1"
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="9006", ENV{PCSCD}="1"
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="90CF", ENV{PCSCD}="1"
+
+LABEL="pcscd_acr38u_rules_end"
diff --git a/app-crypt/acr38u/files/1.7.11.rules b/app-crypt/acr38u/files/1.7.11.rules
new file mode 100644
index 000000000000..eead6bd200e3
--- /dev/null
+++ b/app-crypt/acr38u/files/1.7.11.rules
@@ -0,0 +1,12 @@
+# udev rules to set the access rights of non CCID ACR38u smart card readers
+# so they can be used by pcscd
+
+ACTION!="add", GOTO="pcscd_acr38u_rules_end"
+SUBSYSTEM!="usb", GOTO="pcscd_acr38u_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="pcscd_acr38u_rules_end"
+
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="9000", ENV{PCSCD}="1"
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="9006", ENV{PCSCD}="1"
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="90CF", ENV{PCSCD}="1"
+
+LABEL="pcscd_acr38u_rules_end"
diff --git a/app-crypt/acr38u/files/acr38u-1.7.11-build.patch b/app-crypt/acr38u/files/acr38u-1.7.11-build.patch
new file mode 100644
index 000000000000..374ca2822c1d
--- /dev/null
+++ b/app-crypt/acr38u/files/acr38u-1.7.11-build.patch
@@ -0,0 +1,178 @@
+Index: ACR38_LINUX_100711_P/configure.ac
+===================================================================
+--- ACR38_LINUX_100711_P.orig/configure.ac
++++ ACR38_LINUX_100711_P/configure.ac
+@@ -58,74 +58,21 @@ if test x${debug} = xtrue ; then
+ AC_DEFINE(USBDEBUG, 1, [enable USB debug messaging.])
+ fi
+
+-# --enable-pcscdropdir=DIR ; pcsclite installation directory
+-AC_ARG_ENABLE([pcscdropdir],
+- AS_HELP_STRING([--enable-pcscdropdir=DIR],
+- [installation directory of PCSCLITE (default to PREFIX)]),
+- [pcscdropdir=$enableval],
+- [pcscdropdir=false])
+-
+-if test "${pcscdropdir}" = false ; then
+- if test "$prefix" = NONE ; then
+- pcscdropdir="$ac_default_prefix"
+- else
+- pcscdropdir="$prefix"
+- fi
+-fi
+-
+-# removed by ZETES
+-# AC_SUBST([PKG_PCSC_CONFIG_PATH],[$pcscdropdir/lib/pkgconfig])
+-# removed by ZETES
+-# AC_SUBST([PKG_PCSCLITE],[$pcscdropdir/lib/pkgconfig/libpcsclite.pc])
+-
+-# added by ZETES ...
+-PKG_PCSCLITE="libpcsclite"
+-# ... added by ZETES
+-
+-# Check if pkg-config exists
+-AC_CHECK_PROG([PKGCONFIG], [pkg-config], [yes])
+-if test "$PKGCONFIG" = "yes"; then
+- if ! `pkg-config --print-errors --atleast-version=1.2.0 $PKG_PCSCLITE`
+- then
+- AC_MSG_ERROR([install pcsc-lite 1.2.0 or later])
+- fi
+-fi
+-
+-# Check for libusb 0.1.12
+-PKG_LIBUSB="libusb"
+-if test "$PKGCONFIG" = "yes"; then
+- if ! `pkg-config --print-errors --atleast-version=0.1.12 $PKG_LIBUSB`
+- then
+- AC_MSG_ERROR([install libusb 0.1.12 or later])
+- fi
+-fi
++PKG_INSTALLDIR()
+
+-# --enable-usbdropdir=DIR
+-AC_ARG_ENABLE([usbdropdir],
+- AC_HELP_STRING([--enable-usbdropdir=DIR],
+- [directory containing USB drivers (default to pcscd config or $(prefix)/pcsc/drivers)]),
+- [usbdropdir="${enableval}"],
+- [usbdropdir=false])
+-
+-if test "${usbdropdir}" = false ; then
+- if test "$PKGCONFIG" = yes ; then
+- usbdropdir=`pkg-config $PKG_PCSCLITE --variable=usbdropdir`
+- else
+- usbdropdir=""
+- fi
+- if test -z "$usbdropdir" ; then
++PKG_CHECK_MODULES([PCSCLITE], [libpcsclite >= 1.2.0])
++PKG_CHECK_VAR([USBDROPDIR], [libpcsclite], [usbdropdir], [], [
+ if test "$prefix" = NONE ; then
+- usbdropdir="$ac_default_prefix/pcsc/drivers"
++ USBDROPDIR="$ac_default_prefix/pcsc/drivers"
+ else
+- usbdropdir="$prefix/pcsc/drivers"
++ USBDROPDIR="$prefix/pcsc/drivers"
+ fi
+- fi
+-fi
++ ])
+
+-AC_SUBST(usbdropdir)
++# Check for libusb 0.1.12
++PKG_CHECK_MODULES([LIBUSB], [libusb >= 0.1.12])
+
+-AC_MSG_RESULT([USB drop directory : $usbdropdir])
+-AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR, "$usbdropdir", [directory containing USB drivers])
++AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR, "$USBDROPDIR", [directory containing USB drivers])
+
+ #AC_SUBST(CTRLLIBCFLAGS)
+ #AC_SUBST(CTRLLIBLIBS)
+@@ -141,7 +88,7 @@ AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR,
+
+ # Checks for programs.
+ AC_PROG_CC
+-AC_PROG_LIBTOOL
++AC_PROG_LIBTOOL([disable-static])
+
+ # Checks for libraries.
+ # FIXME: Replace `main' with a function in `-lpcsclite':
+@@ -164,8 +111,8 @@ AC_CHECK_HEADERS([fcntl.h limits.h mallo
+
+ # Setup the compiler and linker flag
+ OLD_CFLAGS=$CFLAGS
+-CFLAGS="$CFLAGS `pkg-config --cflags $PKG_PCSCLITE`"
+-CFLAGS="$CFLAGS `pkg-config --cflags $PKG_LIBUSB`"
++CFLAGS="$CFLAGS $PCSCLITE_CFLAGS"
++CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
+
+ # Check for pcsclite header files
+ # removed by ZETES NO_PCSC_MSG="Please install PCSCLITE 1.2.0 or later before building the driver!!"
+@@ -173,12 +120,6 @@ CFLAGS="$CFLAGS `pkg-config --cflags $PK
+
+ # removed by ZETES CFLAGS=$OLD_CFLAGS
+
+-AC_SUBST(LIBPCSCLITE)
+-LIBPCSCLITE=`pkg-config --libs $PKG_PCSCLITE`
+-
+-AC_SUBST(LIBUSB)
+-LIBUSB=`pkg-config --libs $PKG_LIBUSB`
+-
+ # Select OS specific versions of source files.
+ AC_SUBST(BUNDLE_HOST)
+ AC_SUBST(DYN_LIB_EXT)
+Index: ACR38_LINUX_100711_P/src/controllib/Makefile.am
+===================================================================
+--- ACR38_LINUX_100711_P.orig/src/controllib/Makefile.am
++++ ACR38_LINUX_100711_P/src/controllib/Makefile.am
+@@ -6,7 +6,7 @@
+
+ ACR38_CONTROLLIB = libacr38ucontrol.$(DYN_LIB_EXT)
+
+-AM_CPPFLAGS = -I../driver `pkg-config libpcsclite --cflags`
++AM_CPPFLAGS = -I$(srcdir)/../driver $(PCSCLITE_CFLAGS)
+
+ lib_LTLIBRARIES = libacr38ucontrol.la
+ include_HEADERS = ACS38DrvTools.h
+@@ -16,8 +16,6 @@ SRC_CONTROLLIB = ACS38DrvTools.c \
+ ACS38DrvTools.h
+
+ libacr38ucontrol_la_SOURCES = $(SRC_CONTROLLIB)
+-libacr38ucontrol_la_CFLAGS = `pkg-config libpcsclite --cflags`
++libacr38ucontrol_la_CFLAGS = $(PCSCLITE_CFLAGS)
+
+-#pcdir= $(PKG_PCSC_CONFIG_PATH)
+-pcdir= @prefix@/lib/pkgconfig
+-pc_DATA = libacr38ucontrol.pc
++pkgconfig_DATA = libacr38ucontrol.pc
+Index: ACR38_LINUX_100711_P/src/driver/Makefile.am
+===================================================================
+--- ACR38_LINUX_100711_P.orig/src/driver/Makefile.am
++++ ACR38_LINUX_100711_P/src/driver/Makefile.am
+@@ -9,7 +9,7 @@ DRIVER_LIB_NAME = lib$(DRIVER_NAME).$(DY
+ DRIVER_BUNDLE_DIR = $(DRIVER_NAME).bundle
+ DRIVER_INSTALL_HOME_DIR = pcsc/drivers/$(DRIVER_LIB_NAME).bundle/Contents/Linux
+
+-AM_CPPFLAGS = `pkg-config libpcsclite --cflags`
++AM_CPPFLAGS = $(PCSCLITE_CFLAGS)
+
+ EXTRA_DIST = Info.plist
+
+@@ -34,13 +34,13 @@ SRC_USB = usbserial_linux.c \
+ usbserial_linux.h
+
+ libACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB)
+-libACR38UDriver_la_LIBADD = @LIBPCSCLITE@ @LIBUSB@ @COREFOUNDATION@ @IOKIT@
++libACR38UDriver_la_LIBADD = @PCSCLITE_LIBS@ @LIBUSB_LIBS@ @COREFOUNDATION@ @IOKIT@
+
+ install: libACR38UDriver.la
+- $(mkinstalldirs) $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/
+- $(INSTALL) .libs/$(DRIVER_LIB_NAME) $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_NAME)
+- $(INSTALL) Info.plist $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents
+-# chmod 755 $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_LIB_NAME)
++ $(MKDIR_P) $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/
++ $(INSTALL) .libs/$(DRIVER_LIB_NAME) $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_NAME)
++ $(INSTALL) $(srcdir)/Info.plist $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents
++# chmod 755 $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_LIB_NAME)
+
+ uninstall:
+- rm -rf $(usbdropdir)/$(DRIVER_BUNDLE_DIR)
++ rm -rf $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)
diff --git a/app-crypt/acr38u/metadata.xml b/app-crypt/acr38u/metadata.xml
new file mode 100644
index 000000000000..662ee8f7211f
--- /dev/null
+++ b/app-crypt/acr38u/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>vincent.hardy.be@gmail.com</email>
+ <description>Proxied maintainer, assign bugs to him</description>
+ </maintainer>
+ <maintainer>
+ <email>flameeyes@gentoo.org</email>
+ <description>Proxy-maintainer, CC him on bugs</description>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/aescrypt/Manifest b/app-crypt/aescrypt/Manifest
new file mode 100644
index 000000000000..1f1d640ce321
--- /dev/null
+++ b/app-crypt/aescrypt/Manifest
@@ -0,0 +1 @@
+DIST aescrypt-3.0.6b.tar.gz 28272 SHA256 88a5efe11ede495688e409807c33c09d3df6595acbbf2639f5a93d0061ca3dfd SHA512 4c88abc9bff50ae5d310be7dad8f29843941843f9b484d9846b08dc76c605940adbb375f7e8ffefd6e8236f35ff860a745f89226e9c171bfa70c28c16aa6626a WHIRLPOOL b8fc56084af1b8296a531ff1bfbf5b70d2ea79cb3a2a0539f21e01d443f549016d52fc73f2e94033d82ec1f6a9e4ef2124d7fd9d1971a6364f91d4e35393db7a
diff --git a/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild b/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild
new file mode 100644
index 000000000000..1f5e2c60f1f8
--- /dev/null
+++ b/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Advanced file encryption using AES"
+HOMEPAGE="http://www.aescrypt.com/"
+SRC_URI="https://www.aescrypt.com/download/v3/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-build.patch"
+ epatch "${FILESDIR}/${P}-iconv.patch"
+}
+
+src_compile() {
+ if use static; then
+ append-cflags "-DDISABLE_ICONV"
+ append-ldflags "-static"
+ fi
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+}
diff --git a/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch b/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch
new file mode 100644
index 000000000000..8dac5b4e6f47
--- /dev/null
+++ b/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch
@@ -0,0 +1,62 @@
+From ab74ea544739ab044af1e9b398770d31add3b435 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 2 Feb 2013 01:16:03 +0200
+Subject: [PATCH 1/2] build: respect CFLAGS, DESTDIR and permissions
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ac661a8..abcdcc4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,8 @@ CC=gcc
+
+ #The below line is for debugging
+ #CFLAGS=-I. -ggdb -Wall -D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -D_FILE_OFFSET_BITS=64
++CFLAGS=-Wall
++EXTRA_CFLAGS=-D_FILE_OFFSET_BITS=64
+
+ LIBS=
+
+@@ -27,10 +28,10 @@ LIBS=
+ all: aescrypt aescrypt_keygen
+
+ aescrypt: aescrypt.o aes.o sha256.o password.o keyfile.o
+- $(CC) $(CFLAGS) $(LIBS) -o $@ $^
++ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $^
+
+ aescrypt_keygen: aescrypt_keygen.o password.o
+- $(CC) $(CFLAGS) $(LIBS) -o $@ $^
++ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $^
+
+ test:
+ @$(CC) -DTEST -o sha.test sha256.c
+@@ -48,15 +49,16 @@ testfile: aescrypt
+ cmp test.orig.txt test.txt
+
+ %.o: %.c %.h
+- $(CC) $(CFLAGS) -c $*.c
++ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $*.c
+
+ install: aescrypt
+- install -o root -g root -m 755 aescrypt /usr/bin
+- install -o root -g root -m 755 aescrypt_keygen /usr/bin
++ install -m 755 -d $(DESTDIR)/usr/bin
++ install -m 755 aescrypt $(DESTDIR)/usr/bin
++ install -m 755 aescrypt_keygen $(DESTDIR)/usr/bin
+
+ uninstall:
+- rm -f /usr/bin/aescrypt
+- rm -f /usr/bin/aescrypt_keygen
++ rm -f $(DESTDIR)/usr/bin/aescrypt
++ rm -f $(DESTDIR)/usr/bin/aescrypt_keygen
+
+ clean:
+ rm -f *.o aescrypt aescrypt_keygen test* *test
+--
+1.7.12.4
+
diff --git a/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch b/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch
new file mode 100644
index 000000000000..616e87e38d61
--- /dev/null
+++ b/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch
@@ -0,0 +1,40 @@
+From 337cc9367a3cb4450eee245c6ceb615d0f05499d Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 2 Feb 2013 01:18:08 +0200
+Subject: [PATCH 2/2] build: support disable iconv for static build
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ password.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/password.c b/password.c
+index 9a2c1f8..dee79da 100644
+--- a/password.c
++++ b/password.c
+@@ -232,6 +232,15 @@ int passwd_to_utf16(unsigned char *in_passwd,
+ size_t ic_inbytesleft,
+ ic_outbytesleft;
+
++#ifdef DISABLE_ICONV
++ /* support only latin */
++ int i;
++ for (i=0;i<length+1;i++) {
++ out_passwd[i*2] = in_passwd[i];
++ out_passwd[i*2+1] = 0;
++ }
++ return length*2;
++#else
+ /* Max length is specified in character, but this function deals
+ * with bytes. So, multiply by two since we are going to create a
+ * UTF-16 string.
+@@ -273,5 +282,6 @@ int passwd_to_utf16(unsigned char *in_passwd,
+ }
+ iconv_close(condesc);
+ return (max_length - ic_outbytesleft);
++#endif
+ }
+
+--
+1.7.12.4
+
diff --git a/app-crypt/aescrypt/metadata.xml b/app-crypt/aescrypt/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/app-crypt/aescrypt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/aespipe/Manifest b/app-crypt/aespipe/Manifest
new file mode 100644
index 000000000000..8816155839ec
--- /dev/null
+++ b/app-crypt/aespipe/Manifest
@@ -0,0 +1,2 @@
+DIST aespipe-v2.3e.tar.bz2 91752 SHA256 4e63a5709fdd0bffdb555582f9fd7a0bd1842e429420159accaf7f60c5d3c70f SHA512 e62f1f7a8f595066142f626dfd928106b4057c3e5f129bb31057af4e4a9412b4def60afffac72083621334449d627424fb661ef11a426015b0b0c232aa3ce648 WHIRLPOOL 3564aedeeb7e16a9cf10ceb13d15aaf3350b39ff8eb771d23d59029c8676b27bccee4098644d7e3d457af6866e045bec1cdfdf16f3941a831c0ec0b90897d08a
+DIST aespipe-v2.4c.tar.bz2 106608 SHA256 260190beea911190a839e711f610ec3454a9b13985d35479775b7e26ad4c845e SHA512 6738c019e4c1e5377650f9a982b328ce38e127ebe838cfe61c7d3fad878eaf0a4fd051d32897eb4c2ff33f94669203ccba25fc246405b50f9ac24fdf5d2831cf WHIRLPOOL a9c99f45313fa427e3a4227a3a8b8035c031937851e30fb5a31e8409bef25990497ce3f1b32e0e93c184a6d5549fa2a5e31185790a531350d6774df041c6f5e9
diff --git a/app-crypt/aespipe/aespipe-2.3e.ebuild b/app-crypt/aespipe/aespipe-2.3e.ebuild
new file mode 100644
index 000000000000..9bef38d6d18c
--- /dev/null
+++ b/app-crypt/aespipe/aespipe-2.3e.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit flag-o-matic
+
+DESCRIPTION="Encrypts data from stdin to stdout"
+HOMEPAGE="http://loop-aes.sourceforge.net"
+SRC_URI="http://loop-aes.sourceforge.net/aespipe/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="static"
+DEPEND=""
+RDEPEND="app-arch/sharutils"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_compile() {
+ use static && append-ldflags -static
+ econf || die
+ emake || die
+}
+
+src_install() {
+ dobin aespipe bz2aespipe
+ dodoc README
+ doman aespipe.1
+}
diff --git a/app-crypt/aespipe/aespipe-2.4c-r1.ebuild b/app-crypt/aespipe/aespipe-2.4c-r1.ebuild
new file mode 100644
index 000000000000..62ceb09ad12c
--- /dev/null
+++ b/app-crypt/aespipe/aespipe-2.4c-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic
+
+DESCRIPTION="Encrypts data from stdin to stdout"
+HOMEPAGE="http://loop-aes.sourceforge.net"
+SRC_URI="http://loop-aes.sourceforge.net/aespipe/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_padlock static"
+DEPEND=""
+RDEPEND="app-arch/sharutils
+ app-crypt/gnupg"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_configure() {
+ use static && append-ldflags -static
+ econf \
+ $(use_enable asm) \
+ $(use_enable cpu_flags_x86_aes intelaes) \
+ $(use_enable cpu_flags_x86_padlock padlock)
+}
diff --git a/app-crypt/aespipe/metadata.xml b/app-crypt/aespipe/metadata.xml
new file mode 100644
index 000000000000..7e01eb4b56dd
--- /dev/null
+++ b/app-crypt/aespipe/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+<use>
+ <flag name='asm'>Enable assebly modules</flag>
+ <flag name='cpu_flags_x86_padlock'>Use VIA padlock instructions,
+ detected at run time, code still works on non-padlock processors</flag>
+</use>
+</pkgmetadata>
diff --git a/app-crypt/aesutil/Manifest b/app-crypt/aesutil/Manifest
new file mode 100644
index 000000000000..20c279d2b244
--- /dev/null
+++ b/app-crypt/aesutil/Manifest
@@ -0,0 +1 @@
+DIST aes-1.0.7.tar.gz 34165 SHA256 729bdefff0a614229ffd1a8fd3c299f9e8568a8bf2bf78979376cc0b7ad52a19 SHA512 df2cc6c0aa38e648332b64cab8e712164d28a670a5e4d397918cf9e5faabdaa5d68d9f4e501885b990da98254383ee466e5c374a30e1c00411e8be88884eacf5 WHIRLPOOL 1458bd44117d0e3327adcc7d9fb2380ab245608aec73eb260ac8080cd0b81d878d1411acdf83604fcfbb3d495950824ea489bed9112b5d3c6214f95a2713a056
diff --git a/app-crypt/aesutil/aesutil-1.0.7.ebuild b/app-crypt/aesutil/aesutil-1.0.7.ebuild
new file mode 100644
index 000000000000..acb5e233b0c0
--- /dev/null
+++ b/app-crypt/aesutil/aesutil-1.0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+MY_P="${PN/util/}-${PV}"
+DESCRIPTION="Command line program ('aes') to encrypt and decrypt data using the Rijndael algorithm"
+HOMEPAGE="http://my.cubic.ch/users/timtas/aes/"
+SRC_URI="http://my.cubic.ch/users/timtas/aes/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ sed -e "/^CFLAGS/s:-g -Wall:${CFLAGS}:" Makefile.linux > Makefile \
+ || die "Sed failed"
+ sed -i -e "/^LDFLAGS/s:-g:${LDFLAGS}:" Makefile || die "Sed failed"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+ dobin aes || die
+ dodoc CHANGES INSTALL README TODO || die
+}
diff --git a/app-crypt/aesutil/metadata.xml b/app-crypt/aesutil/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/app-crypt/aesutil/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/af_alg/Manifest b/app-crypt/af_alg/Manifest
new file mode 100644
index 000000000000..da2c017ffb21
--- /dev/null
+++ b/app-crypt/af_alg/Manifest
@@ -0,0 +1 @@
+DIST af_alg-7b13512edbd77c35d20edb4e53d5d83eeaf05d52.tar.gz 5362 SHA256 5fd78ccf5f815ac89d55bf53db6a41a720100325e2ecb7dd7c2b459d30bee88d SHA512 c897a64ce12c5ecbdf8147a8776b646b9fed7d012cbc913e1f047eff4dd81fe1783733d64e711ab3702923b57055e4ca923cdf4f90bef6a4868f803be11239ca WHIRLPOOL 53c1972c01833f7a4151f1613095a53a5fe46ed162296c2a082b1c647e038c1367c70a3dfdb4399e3ce2244d7b3a544614805e0f40a69b63ae2cb996d7dd3d61
diff --git a/app-crypt/af_alg/af_alg-0_pre20120229.ebuild b/app-crypt/af_alg/af_alg-0_pre20120229.ebuild
new file mode 100644
index 000000000000..fbf16e4df78b
--- /dev/null
+++ b/app-crypt/af_alg/af_alg-0_pre20120229.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib
+
+COMMIT_ID=7b13512edbd77c35d20edb4e53d5d83eeaf05d52
+
+DESCRIPTION="AF_ALG for OpenSSL"
+HOMEPAGE="http://carnivore.it/2011/04/23/openssl_-_af_alg"
+
+MY_P="$PN-${COMMIT_ID}"
+SRC_URI="http://src.carnivore.it/users/common/af_alg/snapshot/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wall -fPIC \
+ -shared -Wl,-soname,libaf_alg.so -lcrypto -o libaf_alg.so \
+ e_af_alg.c
+}
+
+src_install() {
+ exeinto /usr/$(get_libdir)/engines
+ doexe libaf_alg.so
+ dodoc README
+}
diff --git a/app-crypt/af_alg/metadata.xml b/app-crypt/af_alg/metadata.xml
new file mode 100644
index 000000000000..7bb3d5a0ddaa
--- /dev/null
+++ b/app-crypt/af_alg/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>robbat2@gentoo.org</email>
+<name>Robin H. Johnson</name>
+</maintainer>
+<longdescription lang="en">
+af_alg implements an OpenSSL engine that uses the AF_ALG functionailty found in
+kernel >= 2.6.38 for crypto offload. Be sure to actually check if it's faster,
+as for many modern systems, userspace software implementations are actually
+faster, as they avoid a kernel context switch. However, on embedded systems and
+others with crypto hardware, AF_ALG may be faster. The homepage has more
+details.
+</longdescription>
+</pkgmetadata>
+
diff --git a/app-crypt/asedriveiiie-serial/Manifest b/app-crypt/asedriveiiie-serial/Manifest
new file mode 100644
index 000000000000..a433234ec628
--- /dev/null
+++ b/app-crypt/asedriveiiie-serial/Manifest
@@ -0,0 +1 @@
+DIST asedriveiiie-serial-3.5.tar.bz2 32461 SHA256 77743ecb79f08ebd70d9c254d4fd35331eaa06bef528cc813ecdbb378b274120 SHA512 b74ea2225990c36e86d106fa7e9e844e1f99d87f9869416faf3dfaa1ecaca34b4bdd4e5887746c6b039de325e03ede3ee78aadeaf20d0fabc8deba48a72a93b3 WHIRLPOOL 1adacde0df7dbedf5edb120dfaff9b341c40b5220467412ce58e04fc6a7dd7083b7b757305aa86cc2e2492e54a39f732c068f1f0fabe8bd711a21dea0bf3c211
diff --git a/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild b/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild
new file mode 100644
index 000000000000..f2047fd1a927
--- /dev/null
+++ b/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="ASEDriveIIIe Serial Card Reader"
+HOMEPAGE="http://www.athena-scs.com"
+SRC_URI="http://www.athena-scs.com/downloads/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+RDEPEND=">=sys-apps/pcsc-lite-1.3.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_install() {
+ local conf="/etc/reader.conf.d/${PN}.conf"
+
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc ChangeLog README
+
+ dodir "$(dirname "${conf}")"
+ insinto "$(dirname "${conf}")"
+ newins "etc/reader.conf" "$(basename "${conf}")"
+}
+
+pkg_postinst() {
+ elog "NOTICE:"
+ elog "1. Update ${conf} file"
+ elog "2. Run update-reader.conf, yes this is a command..."
+ elog "3. Restart pcscd"
+}
+
+pkg_postrm() {
+ #
+ # Without this, pcscd will not start next time.
+ #
+ local conf="/etc/reader.conf.d/${PN}.conf"
+ if ! [ -f "$(grep LIBPATH "${conf}" | sed 's/LIBPATH *//' | sed 's/ *$//g' | head -n 1)" ]; then
+ rm "${conf}"
+ update-reader.conf
+ elog "NOTICE:"
+ elog "You need to restart pcscd"
+ fi
+}
diff --git a/app-crypt/asedriveiiie-serial/metadata.xml b/app-crypt/asedriveiiie-serial/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/app-crypt/asedriveiiie-serial/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/asedriveiiie-usb/Manifest b/app-crypt/asedriveiiie-usb/Manifest
new file mode 100644
index 000000000000..079f0c855b5b
--- /dev/null
+++ b/app-crypt/asedriveiiie-usb/Manifest
@@ -0,0 +1 @@
+DIST asedriveiiie-usb-3.5.tar.bz2 32595 SHA256 3cbdb3491422678fba970a2364c9aba71fa463e6f2fc2321c0618cdd311cc3a2 SHA512 aa718a1f4b28c9186e120bb8e2216389a8a9f54ac3f299a9cd72c398594fcf23229ac4a14e5358cc02e6fcd2ce3abe0e1e4125e4dac8d302bdc325a3f410744f WHIRLPOOL adc59ccffecd9c82caa02496164c1d93b0354e0beb950a6111de482ad5a63ca801173f83d60045e79ffa200353863af748fe39b4507a0e7f701173ba5d3ab2a5
diff --git a/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild b/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild
new file mode 100644
index 000000000000..4f56b014daae
--- /dev/null
+++ b/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="ASEDriveIIIe USB Card Reader"
+HOMEPAGE="http://www.athena-scs.com"
+SRC_URI="http://www.athena-scs.com/downloads/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+RDEPEND=">=sys-apps/pcsc-lite-1.3.0
+ =virtual/libusb-0*"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc ChangeLog README
+}
+
+pkg_postinst() {
+ elog "NOTICE:"
+ elog "You should restart pcscd."
+}
diff --git a/app-crypt/asedriveiiie-usb/metadata.xml b/app-crypt/asedriveiiie-usb/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/app-crypt/asedriveiiie-usb/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/asekey/Manifest b/app-crypt/asekey/Manifest
new file mode 100644
index 000000000000..4f8d7a57444c
--- /dev/null
+++ b/app-crypt/asekey/Manifest
@@ -0,0 +1 @@
+DIST asekey-3.7.tar.bz2 33304 SHA256 5561c54d0629489fcf689ebacc4f8bc3b6305b02ef5675a5d9669dc6669fd6e7 SHA512 29a01f8250d5fb26a4ba2aca562211cadf403c9e986f9fa6930faf477c374e13095c025b2917e6e837cbe8d83f3a3e023a527598b151ef1c704247c7e7c40647 WHIRLPOOL 3e38ef00b20abca33a980b0ffe05db9469945a574b3e71f9c4dbbea87a41857b9a0a69db748698ed368dcb5e34989c6b917b3c39c2e55f4a26e9923cafbc5149
diff --git a/app-crypt/asekey/asekey-3.7.ebuild b/app-crypt/asekey/asekey-3.7.ebuild
new file mode 100644
index 000000000000..d546b09f4e8b
--- /dev/null
+++ b/app-crypt/asekey/asekey-3.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils udev
+
+DESCRIPTION="ASEKey USB SIM Card Reader"
+HOMEPAGE="http://www.athena-scs.com/"
+SRC_URI="${HOMEPAGE}/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -> ${P}.tar.bz2"
+LICENSE="BSD LGPL-2.1"
+
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-apps/pcsc-lite[udev]"
+RDEPEND="${RDEPEND}
+ virtual/libusb:0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-bundle.patch"
+ sed -i -e 's/GROUP="pcscd"/ENV{PCSCD}="1"/' "92_pcscd_${PN}.rules" || die
+}
+
+src_configure() {
+ econf --with-udev-rules-dir="$(get_udevdir)/rules.d"
+}
+
+src_install() {
+ default
+ dodoc ChangeLog README
+}
diff --git a/app-crypt/asekey/files/asekey-3.7-bundle.patch b/app-crypt/asekey/files/asekey-3.7-bundle.patch
new file mode 100644
index 000000000000..fd233001718e
--- /dev/null
+++ b/app-crypt/asekey/files/asekey-3.7-bundle.patch
@@ -0,0 +1,24 @@
+diff --git a/Info.plist b/Info.plist
+index ed473da..9d59815 100644
+--- a/Info.plist
++++ b/Info.plist
+@@ -14,6 +14,7 @@
+ <string>ASEKey</string>
+ <string>ASEKey</string>
+ </array>
++ <key>CFBundleExecutable</key>
+ <array>
+ <string>libASEKey.so</string>
+ <string>libASEKey.so</string>
+diff --git a/Makefile b/Makefile
+index 285ceff..1b06fd1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,6 @@ clean:
+
+ install: all
+ install -c -d "${DRIVER_DIR}/Contents/${KERNEL_NAME}"
+- install -c -m 0755 libASEKey.so "${DRIVER_DIR}"
+ install -c -m 0644 Info.plist "${DRIVER_DIR}/Contents/"
+ install -c -m 0755 libASEKey.so "${DRIVER_DIR}/Contents/${KERNEL_NAME}"
+ install -c -d "${UDEV_DIR}"
diff --git a/app-crypt/asekey/metadata.xml b/app-crypt/asekey/metadata.xml
new file mode 100644
index 000000000000..b02ffbb5d348
--- /dev/null
+++ b/app-crypt/asekey/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/bcrypt/Manifest b/app-crypt/bcrypt/Manifest
new file mode 100644
index 000000000000..2e9b9ad082e3
--- /dev/null
+++ b/app-crypt/bcrypt/Manifest
@@ -0,0 +1 @@
+DIST bcrypt-1.1.tar.gz 36781 SHA256 b9c1a7c0996a305465135b90123b0c63adbb5fa7c47a24b3f347deb2696d417d SHA512 4cc939e997b125b48a66c20469d9743ec227dbee080d89b1ab2515a3c41749c6e8fb6d2d4276cd23eaf6bed0614989431f1f87c23220a94ad595024f8985d68b WHIRLPOOL 9ff061cb2aba0e7cca7ba131ee2789b4136b9251a6704f3713eb897a549a6619e38b9efcced9647d17aa4eb9baea80cb477af53cbfdc9e21cc96079127412a94
diff --git a/app-crypt/bcrypt/bcrypt-1.1.ebuild b/app-crypt/bcrypt/bcrypt-1.1.ebuild
new file mode 100644
index 000000000000..07266aa2a6a8
--- /dev/null
+++ b/app-crypt/bcrypt/bcrypt-1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A file encryption utility using Paul Kocher's implementation of the blowfish algorithm"
+HOMEPAGE="http://bcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bcrypt/${P}.tar.gz"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+ tc-export CC
+ emake || die
+}
+
+src_install() {
+ dobin bcrypt || die
+ dodoc README || die
+ doman bcrypt.1 || die
+}
diff --git a/app-crypt/bcrypt/files/bcrypt-1.1-Makefile.patch b/app-crypt/bcrypt/files/bcrypt-1.1-Makefile.patch
new file mode 100644
index 000000000000..1b210392427e
--- /dev/null
+++ b/app-crypt/bcrypt/files/bcrypt-1.1-Makefile.patch
@@ -0,0 +1,19 @@
+--- Makefile.old 2006-11-23 13:58:19.000000000 +0100
++++ Makefile 2006-11-23 13:59:52.000000000 +0100
+@@ -1,13 +1,12 @@
+ DEFAULTS = Makefile includes.h blowfish.h functions.h config.h
+-CC = gcc
+-CFLAGS = -O2 -Wall
++CFLAGS += -Wall
+ COMPILE = ${CC} ${CFLAGS}
+ OBJS = main.o blowfish.o rwfile.o keys.o wrapbf.o endian.o wrapzl.o
+-LDFLAGS = -L/usr/local/lib -lz
++LIBS = -lz
+ PREFIX = /usr/local
+
+ bcrypt: ${OBJS} Makefile
+- ${COMPILE} -o bcrypt ${OBJS} ${LDFLAGS}
++ ${COMPILE} ${LDFLAGS} -o bcrypt ${OBJS} ${LIBS}
+
+ install: bcrypt Makefile
+ mkdir -p ${PREFIX}/bin;\
diff --git a/app-crypt/bcrypt/metadata.xml b/app-crypt/bcrypt/metadata.xml
new file mode 100644
index 000000000000..eb17ed1ab0b2
--- /dev/null
+++ b/app-crypt/bcrypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <upstream>
+ <remote-id type="sourceforge">bcrypt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/bcwipe/Manifest b/app-crypt/bcwipe/Manifest
new file mode 100644
index 000000000000..49a47b5ab22b
--- /dev/null
+++ b/app-crypt/bcwipe/Manifest
@@ -0,0 +1,2 @@
+DIST BCWipe-1.9-8.tar.gz 131414 SHA256 6f5261716da15e3df07569ca2516334f7d132f0069420082fc71faf2aaf04fc0 SHA512 fe0b72b5279f8dc85c7ac2bee9c3b4ba13df542750faa25556b4a9a03eff323a5822e9e736440e4677c6aa6011a9ecf02acb51b7e934b30f4354826e798d7aa2 WHIRLPOOL 28fbf43435433a4858813329d474dd67e61af615616f9a3283e4b98b7bf9bdebd7ce84c1c787d4ba08a9f7f8ae53293c331cd2bcef3321c0de4ea932a570d618
+DIST BCWipe.doc.tgz 21218 SHA256 afa50bf8653bb6bee108f0ae8b3dc35d289dde3d5c513b7e9ae7fe373635df4f SHA512 5aa402669ded46b6dc680293f18aea4ab20a7d6b7d9d7bf8e63003e557b953e8f8019431ea69d96d2236121e754bc456b3700a0895f4fff0573d2e9bac2e2ee3 WHIRLPOOL 2f6475d9395d2424cbabb046085ce0a016ecad4e76f195e51fb385e57f68f13313587b52c2776ad29798b682eaa8503bae4186029b698a2405f08187180a904f
diff --git a/app-crypt/bcwipe/bcwipe-1.9.8.ebuild b/app-crypt/bcwipe/bcwipe-1.9.8.ebuild
new file mode 100644
index 000000000000..791fe6542845
--- /dev/null
+++ b/app-crypt/bcwipe/bcwipe-1.9.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit eutils versionator
+
+MY_PV="$(replace_version_separator 2 -)"
+
+DESCRIPTION="Secure file removal utility"
+HOMEPAGE="http://www.jetico.com/"
+SRC_URI="http://www.jetico.com/linux/BCWipe-${MY_PV}.tar.gz
+ doc? ( http://www.jetico.com/linux/BCWipe.doc.tgz )"
+
+LICENSE="bestcrypt"
+SLOT="0"
+IUSE="doc"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.9.7-fix_warnings.patch \
+ "${FILESDIR}"/${P}-fix-flags.patch
+}
+
+src_test() {
+ echo "abc123" >> testfile
+ ./bcwipe -f testfile || die "bcwipe test failed"
+ [[ -f testfile ]] && die "test file still exists. bcwipe should have deleted it"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ if use doc ; then
+ dohtml -r ../bcwipe-help || die "dohtml failed"
+ fi
+}
+
+pkg_postinst() {
+ ewarn "The BestCrypt drivers are not free - Please purchace a license from "
+ ewarn "http://www.jetico.com/"
+ ewarn "full details /usr/share/doc/${PF}/html/bcwipe-help/wu_licen.htm"
+}
diff --git a/app-crypt/bcwipe/files/bcwipe-1.9.7-fix_warnings.patch b/app-crypt/bcwipe/files/bcwipe-1.9.7-fix_warnings.patch
new file mode 100644
index 000000000000..f24a6acdb600
--- /dev/null
+++ b/app-crypt/bcwipe/files/bcwipe-1.9.7-fix_warnings.patch
@@ -0,0 +1,20 @@
+--- schemes.c
++++ schemes.c
+@@ -15,6 +15,7 @@
+ *
+ *******************************************************************/
+ #include "config.h"
++#include <ctype.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+--- wipe.c
++++ wipe.c
+@@ -42,6 +42,7 @@
+ #include <sys/ioctl.h>
+ #include <signal.h>
+ #include <time.h>
++#include <sys/time.h>
+ #include <ctype.h>
+
+ #if HAVE_SYS_DISKIO_H /* HP-UX */
diff --git a/app-crypt/bcwipe/files/bcwipe-1.9.8-fix-flags.patch b/app-crypt/bcwipe/files/bcwipe-1.9.8-fix-flags.patch
new file mode 100644
index 000000000000..ac91518e0270
--- /dev/null
+++ b/app-crypt/bcwipe/files/bcwipe-1.9.8-fix-flags.patch
@@ -0,0 +1,11 @@
+--- Makefile.in 2011-02-23 01:07:29.841894634 +0100
++++ Makefile.in 2011-02-23 01:07:46.626793943 +0100
+@@ -174,7 +174,7 @@
+ bcwipe_SOURCES = wipe.c wipe.h options.c options.h schemes.c schemes.h sha1.c sha1.h sha1random.c sha1random.h log.c log.h standard.h rand.h rand.c prng.c
+ man_MANS = bcwipe.1
+ EXTRA_DIST = $(man_MANS) bcwipe.spec.in osxpkg.sh.in
+-AM_CFLAGS = -g -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++AM_CFLAGS = -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
diff --git a/app-crypt/bcwipe/metadata.xml b/app-crypt/bcwipe/metadata.xml
new file mode 100644
index 000000000000..b02ffbb5d348
--- /dev/null
+++ b/app-crypt/bcwipe/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
new file mode 100644
index 000000000000..2a80a6db5aea
--- /dev/null
+++ b/app-crypt/bestcrypt/Manifest
@@ -0,0 +1,3 @@
+DIST BestCrypt-2.0-0.tar.gz 1999791 SHA256 53007d398d137426cb7e24a98d32a8227d5ad20bca623ba9a9ac125f34971df7 SHA512 ccd0b6d91947808cc5396355d3c1e62260b537cd7e4f236017e009a7ecc64c9a7fdf53a937538c9e02c1e303c0b962c9d5debbb37cd8b24ead34aaf33fb6b9e5 WHIRLPOOL 74e04c297664cb3080ec83d1c9791bca61ce72e065462ca0f7f77a69b0c5828814598f9778a6d4c9669f09c431ba365e8d00defa674f4f172fc90677815ff984
+DIST BestCrypt-2.0-4.tar.gz 2024711 SHA256 041b3c3766c921583b8e89a9437b7486653b68fc20517a11fca18468ff203335 SHA512 62d2c6204ad0cc0b0b081cfdae082ae0b54ed958a9bb5d81f4ff7c3b0882d64169d179ed8b421f19976eb76ea40b6da97b8ada798a0ea3360847c113f908d019 WHIRLPOOL b4dc6a0c39ce5e8ac41b9cd24a1ddb92718769c81cd2ce1c8ed6cf1fb1408c01b76f425fab9ca25808690fe7cae8df7d5d50a3efc2f4d9bc32374794f2cbf05b
+DIST BestCrypt-2.0.6.tar.gz 2060735 SHA256 e0286b7dfc662a480340845648a3afdcf9b2f2e38d9b327bc8adf7efa50fc4e0 SHA512 392fc8067099ae046b54ef695b49c9722a30e0a0c66953da51aa0881a306fe2a9e10e1bc6084b20e904a7830eb998c4f44da5813b9951c74e1cd3893689457d3 WHIRLPOOL d2c4e764f2e2b4b7f15c777ac3b84771e29a7a79cd4d6a8b19f6c3c7cd15c11f5a5ec6969d5194d655e9f90a08d7f2826d7e478ba333b5835bb8068fa89bf8d9
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.0.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.0.ebuild
new file mode 100644
index 000000000000..ad0824247af2
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-2.0.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils linux-mod toolchain-funcs versionator
+
+MY_PN="bcrypt"
+MY_PV="$(replace_version_separator 2 -)"
+DESCRIPTION="commercially licensed transparent filesystem encryption"
+HOMEPAGE="http://www.jetico.com/"
+SRC_URI="http://www.jetico.com/linux/BestCrypt-${MY_PV}.tar.gz"
+
+LICENSE="bestcrypt"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+pkg_setup() {
+ CONFIG_CHECK="MODULES"
+ linux-mod_pkg_setup
+
+ MODULE_NAMES="bestcrypt(block::kernel/kmod)
+ bc_3des(crypto::kernel/kmod/crypto/algs/3des)
+ bc_bf128(crypto::kernel/kmod/crypto/algs/bf128)
+ bc_bf448(crypto::kernel/kmod/crypto/algs/bf448)
+ bc_blowfish(crypto::kernel/kmod/crypto/algs/blowfish)
+ bc_cast(crypto::kernel/kmod/crypto/algs/cast)
+ bc_des(crypto::kernel/kmod/crypto/algs/des)
+ bc_gost(crypto::kernel/kmod/crypto/algs/gost)
+ bc_idea(crypto::kernel/kmod/crypto/algs/idea)
+ bc_rijn(crypto::kernel/kmod/crypto/algs/rijn)"
+ BUILD_TARGETS="module"
+ BUILD_PARAMS=" \
+ KERNEL_DIR=\"${KV_DIR}\""
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-build.patch"
+}
+
+src_compile() {
+ MAKEOPTS="-j1" linux-mod_src_compile
+ MAKEOPTS="-j1" emake \
+ CFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ linux-mod_src_install
+
+ emake install PREFIX="${ED}" install
+
+ newinitd "${FILESDIR}/bcrypt3" bcrypt
+ sed -e '/\(bc_rc6\|bc_serpent\|bc_twofish\)/d' -i "${D}etc/init.d/bcrypt"
+ dodoc HIDDEN_PART README
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "The BestCrypt drivers are not free - Please purchace a license from "
+ ewarn "http://www.jetico.com/"
+ ewarn
+
+ linux-mod_pkg_postinst
+}
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.4.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.4.ebuild
new file mode 100644
index 000000000000..9ea8eb819602
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-2.0.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils linux-mod toolchain-funcs versionator
+
+MY_PN="bcrypt"
+MY_PV="$(replace_version_separator 2 -)"
+DESCRIPTION="commercially licensed transparent filesystem encryption"
+HOMEPAGE="http://www.jetico.com/"
+SRC_URI="http://www.jetico.com/linux/BestCrypt-${MY_PV}.tar.gz"
+
+LICENSE="bestcrypt"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+pkg_setup() {
+ CONFIG_CHECK="MODULES"
+ linux-mod_pkg_setup
+
+ MODULE_NAMES="bestcrypt(block::kernel/kmod)
+ bc_3des(crypto::kernel/kmod/crypto/algs/3des)
+ bc_bf128(crypto::kernel/kmod/crypto/algs/bf128)
+ bc_bf448(crypto::kernel/kmod/crypto/algs/bf448)
+ bc_blowfish(crypto::kernel/kmod/crypto/algs/blowfish)
+ bc_cast(crypto::kernel/kmod/crypto/algs/cast)
+ bc_des(crypto::kernel/kmod/crypto/algs/des)
+ bc_gost(crypto::kernel/kmod/crypto/algs/gost)
+ bc_idea(crypto::kernel/kmod/crypto/algs/idea)
+ bc_rijn(crypto::kernel/kmod/crypto/algs/rijn)"
+ BUILD_TARGETS="module"
+ BUILD_PARAMS=" \
+ BC_KERNEL_DIR=\"${KERNEL_DIR}\""
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-build.patch"
+}
+
+src_compile() {
+ MAKEOPTS="-j1" linux-mod_src_compile
+ MAKEOPTS="-j1" emake \
+ CFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ linux-mod_src_install
+
+ emake install PREFIX="${ED}" install
+
+ newinitd "${FILESDIR}/bcrypt3" bcrypt
+ sed -e '/\(bc_rc6\|bc_serpent\|bc_twofish\)/d' -i "${D}etc/init.d/bcrypt"
+ dodoc HIDDEN_PART README
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "The BestCrypt drivers are not free - Please purchace a license from "
+ ewarn "http://www.jetico.com/"
+ ewarn
+
+ linux-mod_pkg_postinst
+}
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.6.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.6.ebuild
new file mode 100644
index 000000000000..7dfc7d64ac54
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-2.0.6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils linux-mod toolchain-funcs versionator
+
+MY_PN="BestCrypt"
+DESCRIPTION="commercially licensed transparent filesystem encryption"
+HOMEPAGE="http://www.jetico.com/"
+SRC_URI="http://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="bestcrypt"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/linux-sources
+ app-shells/bash"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+ CONFIG_CHECK="MODULES"
+ linux-mod_pkg_setup
+
+ MODULE_NAMES="bestcrypt(block::kernel/kmod)
+ bc_3des(crypto::kernel/kmod/crypto/algs/3des)
+ bc_bf128(crypto::kernel/kmod/crypto/algs/bf128)
+ bc_bf448(crypto::kernel/kmod/crypto/algs/bf448)
+ bc_blowfish(crypto::kernel/kmod/crypto/algs/blowfish)
+ bc_cast(crypto::kernel/kmod/crypto/algs/cast)
+ bc_des(crypto::kernel/kmod/crypto/algs/des)
+ bc_gost(crypto::kernel/kmod/crypto/algs/gost)
+ bc_idea(crypto::kernel/kmod/crypto/algs/idea)
+ bc_rijn(crypto::kernel/kmod/crypto/algs/rijn)"
+ BUILD_TARGETS="module"
+ BUILD_PARAMS=" \
+ BC_KERNEL_DIR=\"${KERNEL_DIR}\""
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-build.patch"
+}
+
+src_compile() {
+ MAKEOPTS="-j1" linux-mod_src_compile \
+ CXX="$(tc-getCXX)"
+ MAKEOPTS="-j1" emake \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ AR="$(tc-getAR)" \
+ CFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ linux-mod_src_install
+
+ emake install PREFIX="${ED}" install
+
+ newinitd "${FILESDIR}/bcrypt3" bcrypt
+ sed -e '/\(bc_rc6\|bc_serpent\|bc_twofish\)/d' -i "${D}etc/init.d/bcrypt"
+ dodoc HIDDEN_PART README
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "The BestCrypt drivers are not free - Please purchace a license from "
+ ewarn "http://www.jetico.com/"
+ ewarn
+
+ linux-mod_pkg_postinst
+}
diff --git a/app-crypt/bestcrypt/files/bcrypt3 b/app-crypt/bestcrypt/files/bcrypt3
new file mode 100644
index 000000000000..8f6dd386237b
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bcrypt3
@@ -0,0 +1,104 @@
+#!/sbin/runscript
+#
+# bestcrypt Encrypted File Systems.
+#
+# Version: 1.2
+#
+# Revision: $Id$
+#
+# Author: Jetico Inc. (support@jetico.com)
+#
+# Modified by Stefan Tittel (with thanks to steveb) to work around
+# the "xargs: environment too large for exec"-error occuring in
+# the gentoo 1.4 linux distribution.
+
+# chkconfig: 2345 85 98
+# description: BestCrypt init script
+
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+# See how we were called.
+
+KERNEL_VERSION=`uname -r|sed 's/\(.\..\).*/\1/'`
+
+start() {
+ ebegin "Initializing BestCrypt"
+ declare -i status=0
+ rm -rf /dev/bcrypt?* 2>/dev/null
+ if [ $KERNEL_VERSION = "2.2" ]; then
+ mknod -m 666 /dev/bcrypt0 b 7 128
+ mknod -m 666 /dev/bcrypt1 b 7 129
+ mknod -m 666 /dev/bcrypt2 b 7 130
+ mknod -m 666 /dev/bcrypt3 b 7 131
+ mknod -m 666 /dev/bcrypt4 b 7 132
+ mknod -m 666 /dev/bcrypt5 b 7 133
+ mknod -m 666 /dev/bcrypt6 b 7 134
+ mknod -m 666 /dev/bcrypt7 b 7 135
+ mknod -m 666 /dev/bcrypt8 b 7 136
+ mknod -m 666 /dev/bcrypt9 b 7 137
+ mknod -m 666 /dev/bcrypt10 b 7 138
+ mknod -m 666 /dev/bcrypt11 b 7 139
+ mknod -m 666 /dev/bcrypt12 b 7 140
+ mknod -m 666 /dev/bcrypt13 b 7 141
+ mknod -m 666 /dev/bcrypt14 b 7 142
+ mknod -m 666 /dev/bcrypt15 b 7 143
+ else
+ if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ];
+ then
+ mknod -m 666 /dev/bcrypt0 b 188 0
+ mknod -m 666 /dev/bcrypt1 b 188 1
+ mknod -m 666 /dev/bcrypt2 b 188 2
+ mknod -m 666 /dev/bcrypt3 b 188 3
+ mknod -m 666 /dev/bcrypt4 b 188 4
+ mknod -m 666 /dev/bcrypt5 b 188 5
+ mknod -m 666 /dev/bcrypt6 b 188 6
+ mknod -m 666 /dev/bcrypt7 b 188 7
+ mknod -m 666 /dev/bcrypt8 b 188 8
+ mknod -m 666 /dev/bcrypt9 b 188 9
+ mknod -m 666 /dev/bcrypt10 b 188 10
+ mknod -m 666 /dev/bcrypt11 b 188 11
+ mknod -m 666 /dev/bcrypt12 b 188 12
+ mknod -m 666 /dev/bcrypt13 b 188 13
+ mknod -m 666 /dev/bcrypt14 b 188 14
+ mknod -m 666 /dev/bcrypt15 b 188 15
+ fi
+ fi
+ modprobe bc || status=1
+ modprobe bc_blowfish || status=1
+ modprobe bc_des || status=1
+ modprobe bc_gost || status=1
+ modprobe bc_twofish || status=1
+ modprobe bc_bf448 || status=1
+ modprobe bc_bf128 || status=1
+ modprobe bc_3des || status=1
+ modprobe bc_idea || status=1
+ modprobe bc_rijn || status=1
+ modprobe bc_cast || status=1
+ modprobe bc_rc6 || status=1
+ modprobe bc_serpent || status=1
+ eend ${status}
+}
+
+stop() {
+ ebegin "Unmounting encrypted filesystems"
+
+# The original line causing the "xargs: environment too large for exec error".
+ # grep BestCrypt /etc/mtab |awk '{print $2}'|xargs -r -n 1 bctool umount
+
+# The line for which it work's fine now.
+ for i in $(grep BestCrypt /etc/mtab | awk '{print $2}') ; do bctool umount ${i} ; done
+
+ eend $?
+ ebegin "Shutting down BestCrypt modules"
+ for i in `lsmod |egrep "^bc_.*" |awk '{print $1}' `; do
+ rmmod $i
+ done
+ if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ];
+ then
+ rm -f /dev/bcrypt?* 2>/dev/null
+ fi
+ rmmod bc
+ eend $?
+}
diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.0-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.0-build.patch
new file mode 100644
index 000000000000..876f30ba005d
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-2.0.0-build.patch
@@ -0,0 +1,59 @@
+diff --git a/Makefile b/Makefile
+index 63baafb..995d48e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,8 @@ KGSHA_LIB = $(KGSHA_BUILD_DIR)/lib$(KGSHA_LIB_NAME).a
+ KGGHOST_LIB = $(KGGHOST_BUILD_DIR)/lib$(KGGHOST_LIB_NAME).a
+ SPACEMAP_LIB = $(SPACEMAP_BUILD_DIR)/lib$(SPACEMAP_LIB_NAME).a
+
+-BC_EXTRA_CFLAGS= -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++BC_EXTRA_CFLAGS= $(CFLAGS) -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++BC_EXTRA_LDFLAGS = $(LDFLAGS)
+
+ #
+ # commands
+@@ -86,7 +87,7 @@ BCTOOL_OBJS = container/linux/file.o \
+ src/bctool-rawlink.o
+
+ BCTOOL_CFLAGS = $(BC_EXTRA_CFLAGS) -DBC_LINUX -Wall -I. -Icertificate/
+-BCTOOL_LDFLAGS = -L$(TARGET_DIR) -l$(KERN_LIB_NAME) -l$(KGSHA_LIB_NAME) \
++BCTOOL_LDFLAGS = $(BC_EXTRA_LDFLAGS) -L$(TARGET_DIR) -l$(KERN_LIB_NAME) -l$(KGSHA_LIB_NAME) \
+ -l$(KGGHOST_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME) \
+ -ludev -lpthread -l$(FS_LIB_NAME)
+
+@@ -101,7 +102,7 @@ $(shell mkdir -p $(TARGET_DIR)/kernel)
+ #
+
+ # default target builds console tool with modules
+-all: Makefile helpers module bctool-app
++all: Makefile helpers bctool-app
+ true
+
+ # GUI executable with helpers and console tool
+@@ -216,7 +217,7 @@ module-clean: force-look
+ #
+
+ # install for default target
+-install: module-install bctool-app-install helpers-install
++install: bctool-app-install helpers-install
+ true
+
+ # uninstall for default target
+@@ -224,6 +225,7 @@ uninstall: before-uninstall module-uninstall bctool-app-uninstall helpers-uninst
+ true
+
+ helpers-install:
++ install -o root -m 755 -d $(PREFIX)/sbin
+ install -o root -m 4755 -s $(TARGET_DIR)/bcmount_helper $(PREFIX)/sbin
+ install -o root -m 4755 -s $(TARGET_DIR)/bcumount_helper $(PREFIX)/sbin
+ install -o root -m 4755 -s $(TARGET_DIR)/bcrrpart_helper $(PREFIX)/sbin
+@@ -247,7 +249,9 @@ before-uninstall: force-look
+
+ # install for main executable only
+ bctool-app-install: force-look
++ install -o root -m 755 -d $(PREFIX)/usr/bin
+ install -o root -m 0755 -s build/bctool $(PREFIX)/usr/bin/
++ install -o root -m 755 -d $(PREFIX)/$(MAN_PATH)/man8
+ install -m 644 bctool.8 $(PREFIX)/$(MAN_PATH)/man8/
+
+ # uninstall for main executable only
diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch
new file mode 100644
index 000000000000..8154833890ac
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch
@@ -0,0 +1,108 @@
+From 38ef9fdb4b6690825fe3e54b6b44173e00316a94 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 6 Jul 2014 21:28:11 +0300
+Subject: [PATCH 1/3] build: respect CFLAGS/LDFLAGS
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 17abf61..e89bb76 100644
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,8 @@ KGSHA_LIB = $(KGSHA_BUILD_DIR)/lib$(KGSHA_LIB_NAME).a
+ KGGHOST_LIB = $(KGGHOST_BUILD_DIR)/lib$(KGGHOST_LIB_NAME).a
+ SPACEMAP_LIB = $(SPACEMAP_BUILD_DIR)/lib$(SPACEMAP_LIB_NAME).a
+
+-BC_EXTRA_CFLAGS= -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++BC_EXTRA_CFLAGS= $(CFLAGS) -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++BC_EXTRA_LDFLAGS = $(LDFLAGS)
+
+ #
+ # commands
+@@ -86,7 +87,7 @@ BCTOOL_OBJS = container/linux/file.o \
+ src/bctool-rawlink.o
+
+ BCTOOL_CFLAGS = $(BC_EXTRA_CFLAGS) -DBC_LINUX -Wall -I. -Icertificate/
+-BCTOOL_LDFLAGS = -L$(TARGET_DIR) -l$(KERN_LIB_NAME) -l$(KGSHA_LIB_NAME) \
++BCTOOL_LDFLAGS = $(BC_EXTRA_LDFLAGS) -L$(TARGET_DIR) -l$(KERN_LIB_NAME) -l$(KGSHA_LIB_NAME) \
+ -l$(KGGHOST_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME) \
+ -ludev -lpthread -l$(FS_LIB_NAME)
+
+--
+1.8.5.5
+
+From 632ba530d94675c62213ec9f2bd9a37a411a6050 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 6 Jul 2014 21:30:49 +0300
+Subject: [PATCH 2/3] build: create directories before put file + use install
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e89bb76..3cd36fd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -238,6 +238,7 @@ uninstall: before-uninstall module-uninstall console-uninstall helpers-uninstall
+ true
+
+ helpers-install:
++ install -o root -m 0755 -d $(PREFIX)/sbin
+ install -o root -m 4755 -s $(TARGET_DIR)/bcmount_helper $(PREFIX)/sbin
+ install -o root -m 4755 -s $(TARGET_DIR)/bcumount_helper $(PREFIX)/sbin
+ install -o root -m 4755 -s $(TARGET_DIR)/bcrrpart_helper $(PREFIX)/sbin
+@@ -261,9 +262,9 @@ before-uninstall: force-look
+
+ # install for console only
+ console-install: force-look
+- mkdir -p $(PREFIX)/usr/bin
++ install -o root -m 0755 -d $(PREFIX)/usr/bin
+ install -o root -m 0755 -s build/bctool $(PREFIX)/usr/bin/
+- mkdir -p $(PREFIX)/$(MAN_PATH)/man8
++ install -o root -m 0755 -d $(PREFIX)/$(MAN_PATH)/man8
+ install -m 644 bctool.8 $(PREFIX)/$(MAN_PATH)/man8/
+
+ # uninstall for console only
+--
+1.8.5.5
+
+From 4bce59bd9bc5a201caf5f2ff3e2080e7e5a01733 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 6 Jul 2014 21:34:21 +0300
+Subject: [PATCH 3/3] build: do not auto build/install module
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3cd36fd..a3fd59e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -98,7 +98,7 @@ TESTS_TARGET = $(TARGET_DIR)/tests/bctool-tests
+ #
+
+ # default target builds console tool with modules
+-all: Makefile helpers module console
++all: Makefile helpers console
+ true
+
+ rebuild: clean all
+@@ -226,7 +226,7 @@ module-clean: force-look
+ #
+
+ # install for default target
+-install: module-install console-install helpers-install
++install: console-install helpers-install
+ true
+
+ # used by RPM creation script
+--
+1.8.5.5
+
diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch
new file mode 100644
index 000000000000..966053072d32
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch
@@ -0,0 +1,341 @@
+From 4bce59bd9bc5a201caf5f2ff3e2080e7e5a01733 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 6 Jul 2014 21:34:21 +0300
+Subject: [PATCH 3/3] build: do not auto build/install module
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3cd36fd..a3fd59e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -98,5 +98,5 @@ TESTS_TARGET = $(TARGET_DIR)/tests/bctool-tests
+
+ # default target builds console tool with modules
+-all: Makefile helpers module console
++all: Makefile helpers console
+ true
+
+@@ -226,5 +226,5 @@ module-clean: force-look
+
+ # install for default target
+-install: module-install console-install helpers-install
++install: console-install helpers-install
+ true
+
+--
+1.8.5.5
+
+From f7f71ec155385aea3dec495d46d07452943fe729 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Tue, 17 Mar 2015 21:05:22 +0200
+Subject: [PATCH] build: allow override programs
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 11 +++++++----
+ certificate/CertificateLib/Makefile | 4 +++-
+ disk/Makefile | 6 ++++--
+ fslib/Makefile | 16 +++++++++-------
+ kernel/Makefile | 5 +++--
+ keygens/kgghost/Makefile | 7 +++++--
+ keygens/kgsha/Makefile | 7 +++++--
+ mount/Makefile | 9 +++++----
+ spacemap/Makefile | 6 ++++--
+ tests/Makefile | 12 ++++++------
+ 10 files changed, 51 insertions(+), 32 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6af2319..359d022 100644
+--- a/Makefile
++++ b/Makefile
+@@ -56,6 +56,9 @@ KGSHA_LIB = $(KGSHA_BUILD_DIR)/lib$(KGSHA_LIB_NAME).a
+ KGGHOST_LIB = $(KGGHOST_BUILD_DIR)/lib$(KGGHOST_LIB_NAME).a
+ SPACEMAP_LIB = $(SPACEMAP_BUILD_DIR)/lib$(SPACEMAP_LIB_NAME).a
+
++CC = gcc
++CXX = g++
++
+ BC_EXTRA_CFLAGS= $(CFLAGS) -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ BC_EXTRA_LDFLAGS = $(LDFLAGS)
+
+@@ -125,7 +128,7 @@ helpers: create-dirs
+ console: spacemap-lib certificate-lib fs-lib kernel-lib keygen-libs $(TARGET)
+ true
+ $(TARGET): $(BCTOOL_OBJS)
+- g++ $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET)
++ $(CXX) $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET)
+
+ # GUI executable only (w/o console and helpers)
+ panel: certificate-lib kernel-lib keygen-libs fs-lib
+@@ -339,10 +342,10 @@ module-uninstall:
+ bash ./scripts/remove_mods
+
+ %.o:%.cpp
+- g++ -c $(BCTOOL_CFLAGS) $< -o $@
++ $(CXX) -c $(BCTOOL_CFLAGS) $< -o $@
+
+ %.o:%.cc
+- g++ -c $(BCTOOL_CFLAGS) $< -o $@
++ $(CXX) -c $(BCTOOL_CFLAGS) $< -o $@
+
+ %.o:%.c
+- gcc -c $(BCTOOL_CFLAGS) $< -o $@
++ $(CC) -c $(BCTOOL_CFLAGS) $< -o $@
+diff --git a/certificate/CertificateLib/Makefile b/certificate/CertificateLib/Makefile
+index d28ccc7..810a30a 100644
+--- a/certificate/CertificateLib/Makefile
++++ b/certificate/CertificateLib/Makefile
+@@ -1,5 +1,7 @@
+
+-CP = cp
++CC = gcc
++CXX = g++
++AR = ar
+ CFLAGS += -Wall -fno-strict-aliasing -O3
+ #-Werror
+
+diff --git a/disk/Makefile b/disk/Makefile
+index e3915b0..1a9ff01 100644
+--- a/disk/Makefile
++++ b/disk/Makefile
+@@ -1,14 +1,16 @@
+ DISKMON_OBJS = disk.o diskmon.o
++
++CXX = g++
+ CFLAGS += -Wall -I. -I../ -p -gdwarf-2 #-DBC_DEBUG
+ LDFLAGS += -ludev
+
+ all:diskmon Makefile
+
+ diskmon:$(DISKMON_OBJS)
+- g++ $(DISKMON_OBJS) $(LDFLAGS) -o diskmon
++ $(CXX) $(DISKMON_OBJS) $(LDFLAGS) -o diskmon
+
+ %.o:%.cc
+- g++ $(CFLAGS) -c $< -o $@
++ $(CXX) $(CFLAGS) -c $< -o $@
+
+ clean:
+ rm -rf diskmon *.o
+diff --git a/fslib/Makefile b/fslib/Makefile
+index a6f96f4..bbe6cae 100644
+--- a/fslib/Makefile
++++ b/fslib/Makefile
+@@ -1,3 +1,5 @@
++CC = gcc
++AR = ar
+
+ FSLIB_CFLAGS = $(CFLAGS) -Wall -O0 -DFSLIB_DEBUG -g # -O3
+ FSLIB_CFLAGS += -I. -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 #-fvisibility=hidden
+@@ -15,25 +17,25 @@ FSLIB_TOOLS = file_hfs test_hfs test_info test_free_space diskinfo
+ all: Makefile $(FSLIB) $(FSLIB_TOOLS)
+
+ $(FSLIB): $(OBJS)
+- ar rcs $(FSLIB) $(OBJS)
++ $(AR) rcs $(FSLIB) $(OBJS)
+
+ test_hfs: $(FSLIB) test/test_hfs.o
+- gcc test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs
++ $(CC) test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs
+
+ file_hfs: $(FSLIB) test/file_hfs.o
+- gcc test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs
++ $(CC) test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs
+
+ test_info: $(FSLIB) test/test_info.o
+- gcc test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info
++ $(CC) test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info
+
+ test_free_space: $(FSLIB) test/test_free_space.o
+- gcc test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space
++ $(CC) test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space
+
+ diskinfo: $(FSLIB) test/diskinfo.o
+- gcc test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g -o diskinfo
++ $(CC) test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g -o diskinfo
+
+ .c.o:
+- gcc $(FSLIB_CFLAGS) -c $< -o $@
++ $(CC) $(FSLIB_CFLAGS) -c $< -o $@
+
+ clean:
+ rm -rf *~ *.o test/*.o $(OBJS) $(FSLIB) $(FSLIB_TOOLS)
+diff --git a/kernel/Makefile b/kernel/Makefile
+index 1a71617..4f9760d 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -3,6 +3,7 @@ OBJECTS = $(SOURCES:.cc=.o)
+ TARGET_DIR = ./build/
+ TARGET = $(TARGET_DIR)/libbckernel.a
+ BC_CFLAGS = $(BC_EXTRA_CFLAGS) -fPIC -c -Wall -ludev -L../build/ -lspacemap -I../ -fvisibility=hidden #-fvisibility-inlines-hidden
++CXX = g++
+
+
+ ### Build ###
+@@ -21,12 +22,12 @@ module: create-dirs force_look
+
+ kernel-lib: create-dirs $(TARGET)
+ $(TARGET): $(OBJECTS)
+- ar rcs $(TARGET) $(OBJECTS)
++ $(AR) rcs $(TARGET) $(OBJECTS)
+
+ $(OBJECTS): Makefile $(SOURCES) BCKernel.h
+ set -e; \
+ for i in $(SOURCES); do \
+- g++ -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \
++ $(CXX) -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \
+ done
+
+ create-dirs: $(TARGET_DIR)
+diff --git a/keygens/kgghost/Makefile b/keygens/kgghost/Makefile
+index 8f6cc59..fe59ac7 100644
+--- a/keygens/kgghost/Makefile
++++ b/keygens/kgghost/Makefile
+@@ -5,10 +5,13 @@ KGGHOST_OBJS = hash.o pbe.o keyblock.o datablock.o kgghost.o
+ KGGHOST_CFLAGS = -Wall -p -ggdb -I. -I../../ -I../../certificate -DBC_LINUX
+ KGGHOST_CFLAGS += $(BC_EXTRA_CFLAGS)
+
++CXX = g++
++AR = ar
++
+ all: $(KGGHOST) Makefile
+
+ $(KGGHOST):$(KGGHOST_OBJS) $(CERTIFICATE_LIB)
+- ar rcs $(KGGHOST) $(KGGHOST_OBJS)
++ $(AR) rcs $(KGGHOST) $(KGGHOST_OBJS)
+
+ $(CERTIFICATE_LIB):
+ make -C ../../certificate/CertificateLib
+@@ -17,7 +20,7 @@ $(KERNEL_LIB):
+ make -C ../../kernel/build
+
+ %.o:%.cpp
+- g++ $(KGGHOST_CFLAGS) -c -o $@ $<
++ $(CXX) $(KGGHOST_CFLAGS) -c -o $@ $<
+
+ clean:
+ rm -f *.o *.ver *~ $(KGGHOST)
+diff --git a/keygens/kgsha/Makefile b/keygens/kgsha/Makefile
+index f1a89f9..57f55ca 100644
+--- a/keygens/kgsha/Makefile
++++ b/keygens/kgsha/Makefile
+@@ -10,10 +10,13 @@ KGSHA_OBJS = hash.o datablock.o kgsha.o
+ KGSHA_CFLAGS = -Wall -p -gdwarf-2 -I. -I../../ -I../../certificate -DBC_LINUX
+ KGSHA_CFLAGS += $(EXTRA_CFLAGS)
+
++CXX = g++
++AR = ar
++
+ all: $(KGSHA) $(KGSHA_OBJS) Makefile hidden_sector.h defs.h datablock.h
+
+ $(KGSHA): $(KGSHA_OBJS) $(CERTIFICATE_LIB) $(KERN_LIB)
+- ar rcs $(KGSHA) $(KGSHA_OBJS)
++ $(AR) rcs $(KGSHA) $(KGSHA_OBJS)
+
+ $(CERT_LIB):
+ make -C ../../certificate/CertificateLib
+@@ -22,7 +25,7 @@ $(KERN_LIB):
+ make -C ../../kernel/
+
+ %.o:%.cpp
+- g++ $(KGSHA_CFLAGS) -c -o $@ $<
++ $(CXX) $(KGSHA_CFLAGS) -c -o $@ $<
+
+ clean:
+ rm -f *.o *.ver *~ $(KGSHA)
+diff --git a/mount/Makefile b/mount/Makefile
+index 7a3d66b..0e60095 100644
+--- a/mount/Makefile
++++ b/mount/Makefile
+@@ -1,22 +1,23 @@
+
+ HELPERS = bcrrpart_helper bcmount_helper bcumount_helper
+
++CC = gcc
+ OBJS = common.o
+ CFLAGS += -Wall -O3
+
+ all: $(HELPERS) Makefile
+
+ bcrrpart_helper: $(OBJS) rrpart.o
+- gcc $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper
++ $(CC) $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper
+
+ bcmount_helper: $(OBJS) mount.o
+- gcc $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper
++ $(CC) $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper
+
+ bcumount_helper: $(OBJS) umount.o
+- gcc $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper
++ $(CC) $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper
+
+ %.o:%.c
+- gcc $(CFLAGS) -c -o $@ $<
++ $(CC) $(CFLAGS) -c -o $@ $<
+
+ clean:
+ rm -f *.o *.ver *~ $(HELPERS)
+diff --git a/spacemap/Makefile b/spacemap/Makefile
+index 6dff240..7dd2ad9 100644
+--- a/spacemap/Makefile
++++ b/spacemap/Makefile
+@@ -5,17 +5,19 @@ LIB_NAME = spacemap
+ STATIC_TARGET = lib$(LIB_NAME).a
+ OBJECT_CFLAGS = -fPIC -g -c -Wall -ludev -fvisibility=hidden #-fvisibility-inlines-hidden
+
++CXX = g++
++AR = ar
+
+ all: static
+ true
+
+ static: $(OBJECTS)
+- ar rcs $(STATIC_TARGET) $(OBJECTS)
++ $(AR) rcs $(STATIC_TARGET) $(OBJECTS)
+
+ $(OBJECTS): $(SOURCES)
+ set -e; \
+ for i in $(SOURCES); do \
+- g++ $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \
++ $(CXX) $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \
+ done
+
+ clean:
+diff --git a/tests/Makefile b/tests/Makefile
+index c6d78f0..419020b 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -2,8 +2,8 @@ TESTS_PWD = ../build/tests/
+ TESTS_TARGET = $(TESTS_PWD)/bctool-tests
+ TESTS_SOURCES = tests-main.c ../container/cipher.cc ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/linux/file.cpp
+ TESTS_CFLAGS = -I../ -I../certificate/ -L../build/ -L../build/kernel/ -DBC_LINUX -ludev -g
+-CP = gcc
+-CPP = g++
++CC = gcc
++CXX = g++
+ CERT_LIB_NAME = certificate
+ KERN_LIB_NAME = bckernel
+ SPACEMAP_LIB_NAME = spacemap
+@@ -15,11 +15,11 @@ all: $(TESTS_TARGET)
+ cp insert-modules.sh remove-modules.sh bcmod-loaded.sh $(TESTS_PWD)
+
+ $(TESTS_TARGET): $(TESTS_SOURCES) Makefile
+- $(CPP) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev
++ $(CXX) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev
+ cp kernel/print-struct-size.c $(TESTS_PWD)
+- $(CP) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
+- $(CPP) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
+- $(CP) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c
++ $(CC) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
++ $(CXX) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
++ $(CC) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c
+
+ clean:
+ rm -rf $(TESTS_PWD)
+--
+2.0.5
+
diff --git a/app-crypt/bestcrypt/metadata.xml b/app-crypt/bestcrypt/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/app-crypt/bestcrypt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/bsign/Manifest b/app-crypt/bsign/Manifest
new file mode 100644
index 000000000000..f3277e00c2c9
--- /dev/null
+++ b/app-crypt/bsign/Manifest
@@ -0,0 +1 @@
+DIST bsign_0.4.5.tar.gz 77471 SHA256 a80b27286a3b1b1be6df7b93d27457a4a6941a1eaf797070b1044412f47d3106 SHA512 a4dba37d648f683bb5b14bc9aafeb72fb0bd06e21cedb1a4bbd73dfc0a5f7bb22b5b33ef8727b5070d727afb2d97489ed4b9be28bf1025c9e618ccf47f1ef634 WHIRLPOOL 067ff40119578e6208beeba7ebe9ea21fcb0667abe1ca9780f858a250048035705faad5009d5dfa6814cd4778338722c596caab469d3f8b6d7da05794f1fcbd9
diff --git a/app-crypt/bsign/bsign-0.4.5-r1.ebuild b/app-crypt/bsign/bsign-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..c2b4476d4cd2
--- /dev/null
+++ b/app-crypt/bsign/bsign-0.4.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="embed secure hashes (SHA1) and digital signatures (GNU Privacy Guard) into files"
+HOMEPAGE="http://packages.debian.org/sid/bsign"
+SRC_URI="mirror://debian/pool/main/b/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86 ~x86-linux"
+IUSE="static-libs"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-non-gnu.patch # for Darwin, BSD, Solaris, etc.
+ epatch "${FILESDIR}"/${P}-build.patch
+ epatch "${FILESDIR}"/${P}-scripts.patch
+ eautoreconf
+}
+
+src_configure() {
+ use static-libs && append-ldflags -static
+ default
+}
+
+src_install() {
+ dobin bsign_sign bsign_verify bsign_hash bsign_check
+ newbin o/bsign-unstripped bsign
+ doman bsign.1
+ dodoc README
+}
diff --git a/app-crypt/bsign/bsign-0.4.5.ebuild b/app-crypt/bsign/bsign-0.4.5.ebuild
new file mode 100644
index 000000000000..ab50a477b541
--- /dev/null
+++ b/app-crypt/bsign/bsign-0.4.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="embed secure hashes (SHA1) and digital signatures (GNU Privacy Guard) into files"
+HOMEPAGE="http://packages.debian.org/sid/bsign"
+SRC_URI="mirror://debian/pool/main/b/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~ppc-macos ~x86 ~x86-linux"
+IUSE="static-libs"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-non-gnu.patch # for Darwin, BSD, Solaris, etc.
+
+ if ! use static-libs || [[ ${CHOST} == *-darwin* ]]; then
+ sed -i -e '/^LFLAGS/s/-static//' Makefile.in
+ fi
+
+ sed -i -e "/^CFLAGS/d" \
+ -e "/^CXXFLAGS/d" configure.in
+ eautoreconf
+ tc-export CC CXX
+}
+
+src_install() {
+ dobin bsign_sign bsign_verify bsign_hash bsign_check || die
+ newbin o/bsign-unstripped bsign || die
+ doman bsign.1 || die
+ dodoc README || die
+}
diff --git a/app-crypt/bsign/files/bsign-0.4.5-build.patch b/app-crypt/bsign/files/bsign-0.4.5-build.patch
new file mode 100644
index 000000000000..c6e40ada4cb2
--- /dev/null
+++ b/app-crypt/bsign/files/bsign-0.4.5-build.patch
@@ -0,0 +1,31 @@
+diff -urNp bsign-0.4.5/configure.in bsign-0.4.5.new/configure.in
+--- bsign-0.4.5/configure.in 2002-01-18 03:16:44.000000000 +0200
++++ bsign-0.4.5.new/configure.in 2013-06-16 00:54:36.470673947 +0300
+@@ -14,12 +14,8 @@ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+
+-CFLAGS=-g
+-CXXFLAGS=-g
+-
+ if test "${GXX}" = "yes" ; then
+ CFLAGS_W=" -Wall -Wno-parentheses -Wno-unused"
+- CFLAGS="${CFLAGS}"
+ fi
+
+ dnl Checks for header files.
+diff -urNp bsign-0.4.5/Makefile.in bsign-0.4.5.new/Makefile.in
+--- bsign-0.4.5/Makefile.in 2002-01-27 22:56:56.000000000 +0200
++++ bsign-0.4.5.new/Makefile.in 2013-06-16 00:56:30.254676986 +0300
+@@ -56,9 +56,8 @@ CFLAGS=@CFLAGS@ @DEFS@
+ #CFLAGS_O=-O2 -fomit-frame-pointer
+ #CFLAGS_P=$(CFLAGS) -pg
+ CFLAGS_=-g $(CFLAGS_I)@CFLAGS_W@ $(CFLAGS_O) $(CFLAGS_P)
+-CXXFLAGS=$(CFLAGS)
+-CXXFLAGS_=$(CFLAGS_)
+-LFLAGS=-g -static @LDFLAGS@ @LIBS@
++CXXFLAGS=@CXXFLAGS@ @DEFS@
++LFLAGS=-g @LDFLAGS@ @LIBS@
+ #LFLAGS=-g @LDFLAGS@ @LIBS@
+ #LFLAGS=-pg ${LFLAGS}
+ DEPEND=depend.m
diff --git a/app-crypt/bsign/files/bsign-0.4.5-non-gnu.patch b/app-crypt/bsign/files/bsign-0.4.5-non-gnu.patch
new file mode 100644
index 000000000000..b07d78450ee1
--- /dev/null
+++ b/app-crypt/bsign/files/bsign-0.4.5-non-gnu.patch
@@ -0,0 +1,42 @@
+--- Makefile.in
++++ Makefile.in
+@@ -62,7 +62,7 @@
+ #LFLAGS=-g @LDFLAGS@ @LIBS@
+ #LFLAGS=-pg ${LFLAGS}
+ DEPEND=depend.m
+-ECHO=@/bin/echo
++ECHO=@echo
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
+ INSTALL_DATA=@INSTALL_DATA@
+@@ -192,11 +192,11 @@
+ #
+
+ .version: .version_major .version_minor .version_patch
+- @/bin/echo -n `cat .version_major`.`cat .version_minor`.`cat \
++ @echo -n `cat .version_major`.`cat .version_minor`.`cat \
+ .version_patch` > .version
+
+ _version.h: .version
+- @/bin/echo -e \#define SZ_VERSION \"`cat .version`\" > _version.h
++ @echo -e \#define SZ_VERSION \"`cat .version`\" > _version.h
+
+ .PHONY: transmit
+ transmit: # distribution-archive
+@@ -209,12 +209,12 @@
+
+ version.sed: _version.h
+ @echo Creating version-specific sed script...
+- @/bin/echo s/\<\<version\>\>/`cat .version`/ > version.sed
+- @/bin/echo s/\<\<date\>\>/`date +"%d%b%y" \
++ @echo s/\<\<version\>\>/`cat .version`/ > version.sed
++ @echo s/\<\<date\>\>/`date +"%d%b%y" \
+ | sed -e y/abceglnoprtuvy/ABCEGLNOPRTUVY/`/ >> version.sed
+- @/bin/echo s/\<\<tar-file\>\>/${PACKAGE}-`cat .version`.tar.gz/ \
++ @echo s/\<\<tar-file\>\>/${PACKAGE}-`cat .version`.tar.gz/ \
+ >> version.sed
+- @/bin/echo s/\<\<lsm-file\>\>/${PACKAGE}-`cat .version`.lsm/ >> version.sed
++ @echo s/\<\<lsm-file\>\>/${PACKAGE}-`cat .version`.lsm/ >> version.sed
+
+ .PHONY: ${PACKAGE}.lsm
+ ${PACKAGE}.lsm: version.sed LSM
diff --git a/app-crypt/bsign/files/bsign-0.4.5-scripts.patch b/app-crypt/bsign/files/bsign-0.4.5-scripts.patch
new file mode 100644
index 000000000000..97f79e68e29c
--- /dev/null
+++ b/app-crypt/bsign/files/bsign-0.4.5-scripts.patch
@@ -0,0 +1,48 @@
+diff -urNp bsign-0.4.5/bsign_check bsign-0.4.5.new2/bsign_check
+--- bsign-0.4.5/bsign_check 2002-01-27 22:49:04.000000000 +0200
++++ bsign-0.4.5.new2/bsign_check 2013-06-16 01:00:55.862655310 +0300
+@@ -9,7 +9,7 @@
+ # LOCATIONS gives the path includes and excludes that guide where
+ # bsign looks for input files.
+
+-LOCATIONS=-i / -e /boot -e /cdrom -e /dev -e /proc -e $BASE_PATH
++LOCATIONS="-i / -e /boot -e /cdrom -e /dev -e /proc -e $BASE_PATH"
+
+ # MAIL_TO is the list of email addresses that will receive email when
+ # this script terminates. The mail will contain the output of
+diff -urNp bsign-0.4.5/bsign_hash bsign-0.4.5.new2/bsign_hash
+--- bsign-0.4.5/bsign_hash 2002-01-27 22:49:04.000000000 +0200
++++ bsign-0.4.5.new2/bsign_hash 2013-06-16 01:00:43.543657092 +0300
+@@ -9,7 +9,7 @@
+ # LOCATIONS gives the path includes and excludes that guide where
+ # bsign looks for input files.
+
+-LOCATIONS=-i / -e /boot -e /cdrom -e /dev -e /proc
++LOCATIONS="-i / -e /boot -e /cdrom -e /dev -e /proc"
+
+ # --- End of customization macros
+
+diff -urNp bsign-0.4.5/bsign_sign bsign-0.4.5.new2/bsign_sign
+--- bsign-0.4.5/bsign_sign 2002-01-27 20:44:09.000000000 +0200
++++ bsign-0.4.5.new2/bsign_sign 2013-06-16 01:00:17.737660680 +0300
+@@ -23,7 +23,7 @@ KEY_PATH=$BASE_PATH
+ # LOCATIONS gives the path includes and excludes that guide where
+ # bsign looks for input files.
+
+-LOCATIONS=-i / -e /boot -e /cdrom -e /dev -e /proc -e $BASE_PATH
++LOCATIONS="-i / -e /boot -e /cdrom -e /dev -e /proc -e $BASE_PATH"
+
+ # --- End of customization macros
+
+diff -urNp bsign-0.4.5/bsign_verify bsign-0.4.5.new2/bsign_verify
+--- bsign-0.4.5/bsign_verify 2002-01-27 20:44:09.000000000 +0200
++++ bsign-0.4.5.new2/bsign_verify 2013-06-16 01:00:28.114659254 +0300
+@@ -23,7 +23,7 @@ KEY_PATH=$BASE_PATH
+ # LOCATIONS gives the path includes and excludes that guide where
+ # bsign looks for input files.
+
+-LOCATIONS=-i / -e /boot -e /cdrom -e /dev -e /proc -e $BASE_PATH
++LOCATIONS="-i / -e /boot -e /cdrom -e /dev -e /proc -e $BASE_PATH"
+ #LOCATIONS=-i /bin -i /sbin -i /usr/bin -i /usr/sbin
+
+ # MAIL_TO is the list of email addresses that will receive email when
diff --git a/app-crypt/bsign/metadata.xml b/app-crypt/bsign/metadata.xml
new file mode 100644
index 000000000000..e2e168b2d9c2
--- /dev/null
+++ b/app-crypt/bsign/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <longdescription>
+ This package embeds secure hashes (SHA1) and digital signatures (GNU
+ Privacy Guard) into files for verification and authentication.
+ Currently, target file types are all ELF format: executables, kernel
+ modules, schared and static link libraries. This program has
+ functionality similar to tripwire and integrit without the need to
+ maintain a database.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-crypt/cardpeek/Manifest b/app-crypt/cardpeek/Manifest
new file mode 100644
index 000000000000..7e2efedb9c29
--- /dev/null
+++ b/app-crypt/cardpeek/Manifest
@@ -0,0 +1,3 @@
+DIST cardpeek-0.7.1.tar.gz 599238 SHA256 fa7f4fcabf211fefb968a5a49099e9a07430995556b7d59e95eeefef59538546 SHA512 8ea7f69e096de37543fec779372355a6f6cad709e43a4a66a072b453f962ebe55d25e432fb426cd88824f7165d724ddc6da55a6106e571608162b8094823be45 WHIRLPOOL 95f41d53840969beb3b98729c22ed8fe1e781ab6fe36ad3387cddf52963c2d56f5bca95955681cea839ce64ab6afddfc4d3cbf403e320d8dfec37ac0bd3a68bd
+DIST cardpeek-0.7.2.tar.gz 1130295 SHA256 9908b38a91b4df80ec5a6d6a89780dd41684dc1f203587c1bcc8e4a13cb24ed2 SHA512 9fd1790794b8d092859670bb36a0cdd235e7d098d563032ccdb8143eac00bb77532f1ab918897c4b753afd184079975de34a6f645e31eadb28b6c5a81d344ecd WHIRLPOOL 777397ca535d820453e4d315be495fc5cf845feea457c666cf935d19b8e2c7556b51e4e23f8d009c6165626c450fe5b92413841d0ee56fd6f1d549716ee05e56
+DIST cardpeek-0.8.2.tar.gz 1361187 SHA256 5c616aca68918ce35c8c8378006afdb524f9eef76a2ccc296f5365d389b46c61 SHA512 184539ef926a6ac63d41926b05160d6b91c0ca041d1b40a3e2f5314f9cb35730fbcb9be7c08d2be6f94bc121021168c45235bfa4ccac0fbd28c47159c7a89602 WHIRLPOOL 88e81a52fa485cd56a6e40f99cd5bcfb0532bb86b4c6ac4a789d0118de1468004ddb8963f778eaf5329a5bccf663a2040dc3c2a32d2c0f9124778239212e783d
diff --git a/app-crypt/cardpeek/cardpeek-0.7.1.ebuild b/app-crypt/cardpeek/cardpeek-0.7.1.ebuild
new file mode 100644
index 000000000000..59e6b7abb37e
--- /dev/null
+++ b/app-crypt/cardpeek/cardpeek-0.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Tool to read the contents of smartcards"
+HOMEPAGE="https://code.google.com/p/cardpeek/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.12:2
+ sys-apps/pcsc-lite
+ =dev-lang/lua-5.1*
+ dev-libs/openssl"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
new file mode 100644
index 000000000000..f3ee99d21072
--- /dev/null
+++ b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Tool to read the contents of smartcards"
+HOMEPAGE="https://code.google.com/p/cardpeek/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.12:2
+ sys-apps/pcsc-lite
+ =dev-lang/lua-5.1*
+ dev-libs/openssl"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/app-crypt/cardpeek/cardpeek-0.8.2.ebuild b/app-crypt/cardpeek/cardpeek-0.8.2.ebuild
new file mode 100644
index 000000000000..8bc01faf957a
--- /dev/null
+++ b/app-crypt/cardpeek/cardpeek-0.8.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Tool to read the contents of smartcards"
+HOMEPAGE="http://pannetrat.com/Cardpeek"
+SRC_URI="http://downloads.pannetrat.com/install/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="sys-apps/pcsc-lite
+ =dev-lang/lua-5.2*
+ x11-libs/gtk+:3
+ net-misc/curl
+ dev-libs/openssl"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/app-crypt/cardpeek/metadata.xml b/app-crypt/cardpeek/metadata.xml
new file mode 100644
index 000000000000..e70ecc2e1e74
--- /dev/null
+++ b/app-crypt/cardpeek/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
new file mode 100644
index 000000000000..e0867cea2f6e
--- /dev/null
+++ b/app-crypt/ccid/Manifest
@@ -0,0 +1,2 @@
+DIST ccid-1.4.15.tar.bz2 487625 SHA256 5436182246f15b3e78b1ad6707022b02dc400e3f50c4cb5e5d340a4e716d990a SHA512 393eb65db0fb31b58d4010c10cae6c7592078b02d0e77b7741330cc3b1e5dd768fa08dbaf75db39c547e3603fa70aa1c8aaf3b536266314f2f04d2ff2b6fb29c WHIRLPOOL 0dd511454cf8e39303318b61f9e2390f2ef27b763e80e9270f55ee15966ced8378f3f3ee5440b6380481f970f03ae37bbb2221da6c3d2d658622ea4cdc3aee3f
+DIST ccid-1.4.18.tar.bz2 492113 SHA256 5fdba97a2d2eb1c652b7dd4aa0bb8cee4814bab0cf61aecb84b32b57272541aa SHA512 ff7e331431909fe9fffd4f7aae0a2395b3b755da9c898aa6a6b629f7f516c240b820669146791deb443c646dc8fc56f9100c9f987b3e7d13c24f24f81f06b1f0 WHIRLPOOL 86107ac379e5523c31aa1499e1ecd5a1f6dab5b7f748800b5a22ff2b6470e9bb590407cb8a98ad65870a832149fe8835aa42dff9a30027f0bce843640439ce1e
diff --git a/app-crypt/ccid/ccid-1.4.15.ebuild b/app-crypt/ccid/ccid-1.4.15.ebuild
new file mode 100644
index 000000000000..f1955a27567d
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.15.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+STUPID_NUM="3989"
+
+inherit eutils toolchain-funcs udev autotools-utils
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
+SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
+IUSE="twinserial +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+ usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+ kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README AUTHORS )
+
+src_configure() {
+ local myeconfargs=(
+ LEX=:
+ $(use_enable twinserial)
+ $(use_enable usb libusb)
+ )
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ if use kernel_linux; then
+ # note: for eudev support, rules probably will always need to be
+ # installed to /usr
+
+ # ccid >=1.4.11 version changed the rules drastically in a minor
+ # release to nolonger use the pcscd group. Using the old ones in
+ # the mean time.
+ udev_newrules "${FILESDIR}"/92_pcscd_ccid.rules 92-pcsc-ccid.rules
+ fi
+}
diff --git a/app-crypt/ccid/ccid-1.4.18.ebuild b/app-crypt/ccid/ccid-1.4.18.ebuild
new file mode 100644
index 000000000000..c35b1eabc5f7
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.18.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+STUPID_NUM="4111"
+
+inherit eutils toolchain-funcs udev autotools-utils
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
+SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+IUSE="twinserial +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+ usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+ kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README AUTHORS )
+
+src_configure() {
+ local myeconfargs=(
+ LEX=:
+ $(use_enable twinserial)
+ $(use_enable usb libusb)
+ )
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ if use kernel_linux; then
+ # note: for eudev support, rules probably will always need to be
+ # installed to /usr
+
+ # ccid >=1.4.11 version changed the rules drastically in a minor
+ # release to no longer use the pcscd group. Using the old ones in
+ # the mean time.
+ udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+ fi
+}
diff --git a/app-crypt/ccid/files/92_pcscd_ccid-2.rules b/app-crypt/ccid/files/92_pcscd_ccid-2.rules
new file mode 100644
index 000000000000..88e0d8c646ba
--- /dev/null
+++ b/app-crypt/ccid/files/92_pcscd_ccid-2.rules
@@ -0,0 +1,50 @@
+# udev rules to set the access rights of CCID smart card readers
+# so they can be used by pcscd
+
+# $Id$
+
+# Gemplus PCMCIA Card
+#SUBSYSTEMS=="pcmcia", DRIVERS=="serial_cs", ACTION=="add", ATTRS{prod_id1}=="Gemplus", ATTRS{prod_id2}=="SerialPort", ATTRS{prod_id3}=="GemPC Card", RUN+="/usr/sbin/pcscd --hotplug"
+
+# If not adding the device, go away
+ACTION!="add", GOTO="pcscd_ccid_rules_end"
+SUBSYSTEM!="usb", GOTO="pcscd_ccid_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="pcscd_ccid_rules_end"
+
+# Kobil mIDentity
+ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="4081", RUN+="/usr/sbin/Kobil_mIDentity_switch"
+
+# generic CCID device (bInterfaceClass = 0x0b)
+# change group from default "root" to "pcscd"
+ENV{ID_USB_INTERFACES}=="*:0b0000:*", ENV{PCSCD}="1"
+
+# set USB power management to auto. "power/level" has been deprecated in
+# Linux 2.6.35 and replaced by "power/control"
+ENV{ID_USB_INTERFACES}==":0b0000:", RUN+="/bin/sh -c 'if test -e /sys/$env{DEVPATH}/power/control; then echo auto > /sys/$env{DEVPATH}/power/control; elif test -e /sys/$env{DEVPATH}/power/level; then echo auto > /sys/$env{DEVPATH}/power/level; fi'"
+
+# non CCID generic (InterfaceClass: 0xFF)
+# CherrySmartTerminalST2XXX.txt
+ATTRS{idVendor}=="046a", ATTRS{idProduct}=="003e", ENV{PCSCD}="1"
+# DellSK-3106.txt
+ATTRS{idVendor}=="413c", ATTRS{idProduct}=="2100", ENV{PCSCD}="1"
+# MySmartPad.txt
+ATTRS{idVendor}=="09be", ATTRS{idProduct}=="0002", ENV{PCSCD}="1"
+# SCR3310-NTTCom USB SmartCard Reader
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="511a", ENV{PCSCD}="1"
+# SCR331-DI USB Smart Card Reader
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5120", ENV{PCSCD}="1"
+# SCR331-DI.txt
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5111", ENV{PCSCD}="1"
+# SDI010.txt
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5121", ENV{PCSCD}="1"
+# SPR532.txt
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="e003", ENV{PCSCD}="1"
+# Verisign_secure_storage_token.txt
+ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="1359", ENV{PCSCD}="1"
+# Verisign_secure_token.txt
+ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="ace0", ENV{PCSCD}="1"
+# SchlumbergerSema Cyberflex Access e-gate
+ATTRS{idVendor}=="0973", ATTRS{idProduct}=="0003", ENV{PCSCD}="1"
+
+# All done
+LABEL="pcscd_ccid_rules_end"
diff --git a/app-crypt/ccid/files/92_pcscd_ccid.rules b/app-crypt/ccid/files/92_pcscd_ccid.rules
new file mode 100644
index 000000000000..5b26aca3e423
--- /dev/null
+++ b/app-crypt/ccid/files/92_pcscd_ccid.rules
@@ -0,0 +1,50 @@
+# udev rules to set the access rights of CCID smart card readers
+# so they can be used by pcscd
+
+# $Id$
+
+# Gemplus PCMCIA Card
+#SUBSYSTEMS=="pcmcia", DRIVERS=="serial_cs", ACTION=="add", ATTRS{prod_id1}=="Gemplus", ATTRS{prod_id2}=="SerialPort", ATTRS{prod_id3}=="GemPC Card", RUN+="/usr/sbin/pcscd --hotplug"
+
+# If not adding the device, go away
+ACTION!="add", GOTO="pcscd_ccid_rules_end"
+SUBSYSTEM!="usb", GOTO="pcscd_ccid_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="pcscd_ccid_rules_end"
+
+# Kobil mIDentity
+ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="4081", RUN+="/usr/sbin/Kobil_mIDentity_switch"
+
+# generic CCID device (bInterfaceClass = 0x0b)
+# change group from default "root" to "pcscd"
+ENV{ID_USB_INTERFACES}=="*:0b0000:*", ENV{PCSCD}="1"
+
+# set USB power management to auto. "power/level" has been deprecated in
+# Linux 2.6.35 and replaced by "power/control"
+ENV{ID_USB_INTERFACES}==":0b0000:", RUN+="/bin/sh -c 'echo auto > /sys/$devpath/power/level ; echo auto > /sys/$devpath/power/control'"
+
+# non CCID generic (InterfaceClass: 0xFF)
+# CherrySmartTerminalST2XXX.txt
+ATTRS{idVendor}=="046a", ATTRS{idProduct}=="003e", ENV{PCSCD}="1"
+# DellSK-3106.txt
+ATTRS{idVendor}=="413c", ATTRS{idProduct}=="2100", ENV{PCSCD}="1"
+# MySmartPad.txt
+ATTRS{idVendor}=="09be", ATTRS{idProduct}=="0002", ENV{PCSCD}="1"
+# SCR3310-NTTCom USB SmartCard Reader
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="511a", ENV{PCSCD}="1"
+# SCR331-DI USB Smart Card Reader
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5120", ENV{PCSCD}="1"
+# SCR331-DI.txt
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5111", ENV{PCSCD}="1"
+# SDI010.txt
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5121", ENV{PCSCD}="1"
+# SPR532.txt
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="e003", ENV{PCSCD}="1"
+# Verisign_secure_storage_token.txt
+ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="1359", ENV{PCSCD}="1"
+# Verisign_secure_token.txt
+ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="ace0", ENV{PCSCD}="1"
+# SchlumbergerSema Cyberflex Access e-gate
+ATTRS{idVendor}=="0973", ATTRS{idProduct}=="0003", ENV{PCSCD}="1"
+
+# All done
+LABEL="pcscd_ccid_rules_end"
diff --git a/app-crypt/ccid/metadata.xml b/app-crypt/ccid/metadata.xml
new file mode 100644
index 000000000000..77a09421d608
--- /dev/null
+++ b/app-crypt/ccid/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <use>
+ <flag name="twinserial">Enable twinserial reader</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-crypt/ccrypt/Manifest b/app-crypt/ccrypt/Manifest
new file mode 100644
index 000000000000..5604385f95ca
--- /dev/null
+++ b/app-crypt/ccrypt/Manifest
@@ -0,0 +1,2 @@
+DIST ccrypt-1.10.tar.gz 669491 SHA256 87d66da2170facabf6f2fc073586ae2c7320d4689980cfca415c74688e499ba0 SHA512 b0130998f9830f63e8181340b3138260ab3c2014174e74fbcca77299dc9e0f807471fbfb7cc403dec7d0809f136e8afcb4c9bfd4ee5e43a1b3cc7185e14c3188 WHIRLPOOL aa65659fecadfaf1a9323b5a80c00eeda41ff7e3db40151abb678ad1c14de1310ba7954d2042baf6bb230ac2fdc52368a367cf91cb7a9ab5d0fec51d5937872b
+DIST ccrypt-1.9.tar.gz 667059 SHA256 6538cb75f7f45faf20f912c7b0d284831b0afced9fc61984b8d45a990276ebaf SHA512 fb4cbf6787f26303735e0eb3d038952b518c2466ac232a625ea9bd5e99400bb9d88a0cc41a690caa9de942f86365c567a802a1faf735306155aab14ea67464b9 WHIRLPOOL 122dd2687bbbb4496fc330e52ba1570d735541e4e08e8614a33a417a4d7abf1c29604dd11a836a2a3c696643a7b46acb8c126248b9eb6fc61c6d9d0baedb20dd
diff --git a/app-crypt/ccrypt/ccrypt-1.10.ebuild b/app-crypt/ccrypt/ccrypt-1.10.ebuild
new file mode 100644
index 000000000000..8fa89b86a42a
--- /dev/null
+++ b/app-crypt/ccrypt/ccrypt-1.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+DESCRIPTION="Encryption and decryption"
+HOMEPAGE="http://ccrypt.sourceforge.net"
+SRC_URI="http://ccrypt.sourceforge.net/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+src_install () {
+ emake \
+ DESTDIR="${D}" \
+ htmldir="${EPREFIX}/usr/share/doc/${PF}" \
+ install || die "emake install failed"
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/app-crypt/ccrypt/ccrypt-1.9.ebuild b/app-crypt/ccrypt/ccrypt-1.9.ebuild
new file mode 100644
index 000000000000..ba4865465d17
--- /dev/null
+++ b/app-crypt/ccrypt/ccrypt-1.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+DESCRIPTION="Encryption and decryption"
+HOMEPAGE="http://ccrypt.sourceforge.net"
+SRC_URI="http://ccrypt.sourceforge.net/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+src_install () {
+ emake \
+ DESTDIR="${D}" \
+ htmldir="${EPREFIX}/usr/share/doc/${PF}" \
+ install || die "emake install failed"
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/app-crypt/ccrypt/metadata.xml b/app-crypt/ccrypt/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/app-crypt/ccrypt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/chntpw/Manifest b/app-crypt/chntpw/Manifest
new file mode 100644
index 000000000000..477187210275
--- /dev/null
+++ b/app-crypt/chntpw/Manifest
@@ -0,0 +1,2 @@
+DIST chntpw-source-110511.zip 758936 SHA256 593514ca8601adb4091d951499b916dfdac2bd34b325d307237fa52ca572b5b7 SHA512 2a0b3638df40481d0650a5fb524b37896db253db83eb8e12836a3f59f12df59bea89ae92710e28bd08dc01f6fa806789be118397fd097732f7132571d3057d56 WHIRLPOOL d3a9e61109f8cc2721ee734cfd6f5da914fc6397e762de3a4e9192b568c24c9c7088d77630dfb93e709f043a54244c5344a2b6fbfdc1bd36881ee4299b805812
+DIST chntpw-source-140201.zip 1404098 SHA256 96e20905443e24cba2f21e51162df71dd993a1c02bfa12b1be2d0801a4ee2ccc SHA512 a26d747f6e077d1bb3e9b8077781f8c37dd978e07b7426495862f15c9004572b706c34736fc4d1ed8856b1a43335d726b4d87c688f7f9a11fd6cc3a74d71a7fa WHIRLPOOL 87284c123d2ae1965d069d4d97cda23ce757305b3521f84089e43a9f1fa8aaa48f8fbad5bba19b3a439cfb16d270e0f77f528664fdba895c65c100492eb9e42a
diff --git a/app-crypt/chntpw/chntpw-110511.ebuild b/app-crypt/chntpw/chntpw-110511.ebuild
new file mode 100644
index 000000000000..80037eb2b7d1
--- /dev/null
+++ b/app-crypt/chntpw/chntpw-110511.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="Offline Windows NT Password & Registry Editor"
+HOMEPAGE="http://pogostick.net/~pnh/ntpasswd/"
+SRC_URI="http://pogostick.net/~pnh/ntpasswd/${PN}-source-${PV}.zip"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static"
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ static? ( dev-libs/openssl[static-libs] )"
+
+src_prepare() {
+ sed -i -e '/-o/s:$(CC):$(CC) $(LDFLAGS):' Makefile || die
+
+ if ! use static ; then
+ sed -i -e "/^all:/s/ \(chntpw\|reged\).static//g" Makefile || die
+ fi
+
+ emake clean
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} -DUSEOPENSSL -Wall" \
+ LIBS="-lcrypto"
+}
+
+src_install() {
+ dobin chntpw cpnt reged
+
+ if use static; then
+ dobin {chntpw,reged}.static
+ fi
+
+ dodoc {HISTORY,README,regedit,WinReg}.txt
+}
diff --git a/app-crypt/chntpw/chntpw-140201.ebuild b/app-crypt/chntpw/chntpw-140201.ebuild
new file mode 100644
index 000000000000..97a56ace6e9e
--- /dev/null
+++ b/app-crypt/chntpw/chntpw-140201.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Offline Windows NT Password & Registry Editor"
+HOMEPAGE="http://pogostick.net/~pnh/ntpasswd/"
+SRC_URI="http://pogostick.net/~pnh/ntpasswd/${PN}-source-${PV}.zip"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static"
+
+RDEPEND="dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ static? ( dev-libs/openssl:0[static-libs] )"
+
+src_prepare() {
+ sed -i -e '/-o/s:$(CC):$(CC) $(LDFLAGS):' Makefile || die
+
+ if ! use static ; then
+ sed -i -e "/^all:/s/ \(chntpw\|reged\).static//g" Makefile || die
+ fi
+
+ emake clean
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} -DUSEOPENSSL -Wall" \
+ LIBS="-lcrypto"
+}
+
+src_install() {
+ dobin chntpw cpnt reged
+
+ if use static; then
+ dobin {chntpw,reged}.static
+ fi
+
+ dodoc {HISTORY,README,regedit,WinReg}.txt
+}
diff --git a/app-crypt/chntpw/metadata.xml b/app-crypt/chntpw/metadata.xml
new file mode 100644
index 000000000000..b02ffbb5d348
--- /dev/null
+++ b/app-crypt/chntpw/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/ckpass/Manifest b/app-crypt/ckpass/Manifest
new file mode 100644
index 000000000000..977cbf49d767
--- /dev/null
+++ b/app-crypt/ckpass/Manifest
@@ -0,0 +1 @@
+DIST ckpass-0.2.tar.gz 95921 SHA256 4027708b9518e7d320958f186f6b932001a3501c88773a88191fe5c976fe0686 SHA512 aca439caea2e3736539f5ec6bb235e51c59fed627eb9b414e629ad246c301e6f1dc90594826f6d95be9963aa4af0dae64419d08a44beb0a02d16a9fdf42a9a0b WHIRLPOOL 462fa8b7a82176ce01d1801525cf2b06ba6702cc2a7bf6e2d38d15a2879366e22524721f990ae36ba7a1c004eeab103ac23490faea9b6fd20a682dc70cf85afa
diff --git a/app-crypt/ckpass/ckpass-0.2.ebuild b/app-crypt/ckpass/ckpass-0.2.ebuild
new file mode 100644
index 000000000000..ce9bc76539fb
--- /dev/null
+++ b/app-crypt/ckpass/ckpass-0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="An ncurses based password database client that is compatible with KeePass 1.x format databases"
+HOMEPAGE="http://ckpass.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-libs/libkpass-6"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-tinfo.patch
+ eautoreconf
+}
+
+DOCS=( AUTHORS )
diff --git a/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch b/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch
new file mode 100644
index 000000000000..8d99bc93ad8f
--- /dev/null
+++ b/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,7 @@
+
+ AC_CHECK_LIB([c], [main], [], AC_MSG_ERROR(requires libc))
+ AC_CHECK_LIB([ncurses], [main], [], AC_MSG_ERROR(requires libncurses))
++AC_SEARCH_LIBS([acs_map],[tinfo], [], AC_MSG_ERROR(requires a library providing acs_map))
+ AC_CHECK_LIB([form], [main], [], AC_MSG_ERROR(requires libform))
+ AC_CHECK_LIB([kpass], [main], [], AC_MSG_ERROR(requires libkpass))
+
diff --git a/app-crypt/ckpass/metadata.xml b/app-crypt/ckpass/metadata.xml
new file mode 100644
index 000000000000..90b0f372afc0
--- /dev/null
+++ b/app-crypt/ckpass/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>joker@gentoo.org</email>
+ <name>Christian Birchinger</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">ckpass</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
new file mode 100644
index 000000000000..277b1b9031e4
--- /dev/null
+++ b/app-crypt/codecrypt/Manifest
@@ -0,0 +1,2 @@
+DIST codecrypt-1.4.1.tar.gz 411794 SHA256 a3b26bb4d9488bf0569d69db3de57f5109ce64c7900b568fc6da78c4c3fe920f SHA512 d6c03d5e45346ed5c12350ae04e50eed936d45fce9e08ec2ddba8edb1bbbcfc2a3b7415a3f686af2e05630cab3c4ccfea2fe85c6fc471cface7e9038dd37425f WHIRLPOOL b37a5804a81876347ef690bfd7832c7e2a298313fec52b0517c36701fe5e34a8c701c62bd92d562a7f7d8a02b65e060bfc66acf9419f006a0bf60ae4aae049a1
+DIST codecrypt-1.6.tar.gz 436127 SHA256 8d3ea24228160546f747feff3909f21814c280bbce41bfe71956c0a9069f95a5 SHA512 d4e696956d034e2f3d212697c325bb90e6a998865890700e143572953e76e3b8adf3680a9b1fdf3ff8f24cd1c94125da97b587978b6870791a4307e1a75be08d WHIRLPOOL b8a335219b904b6bde11d4a11e612cc4b13962aa5ebe8ecaa99321f6fba5ac30a6b63d212eb4761279048361f69eb338248643157fd1d413caae436a9ec15070
diff --git a/app-crypt/codecrypt/codecrypt-1.4.1.ebuild b/app-crypt/codecrypt/codecrypt-1.4.1.ebuild
new file mode 100644
index 000000000000..20d2f0053b45
--- /dev/null
+++ b/app-crypt/codecrypt/codecrypt-1.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Post-quantum cryptography tool"
+HOMEPAGE="http://e-x-a.org/codecrypt/"
+SRC_URI="http://e-x-a.org/codecrypt/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cryptopp"
+
+DEPEND="dev-libs/gmp
+ cryptopp? ( dev-libs/crypto++ )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf \
+ $(use_with cryptopp)
+}
diff --git a/app-crypt/codecrypt/codecrypt-1.6.ebuild b/app-crypt/codecrypt/codecrypt-1.6.ebuild
new file mode 100644
index 000000000000..20d2f0053b45
--- /dev/null
+++ b/app-crypt/codecrypt/codecrypt-1.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Post-quantum cryptography tool"
+HOMEPAGE="http://e-x-a.org/codecrypt/"
+SRC_URI="http://e-x-a.org/codecrypt/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cryptopp"
+
+DEPEND="dev-libs/gmp
+ cryptopp? ( dev-libs/crypto++ )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf \
+ $(use_with cryptopp)
+}
diff --git a/app-crypt/codecrypt/metadata.xml b/app-crypt/codecrypt/metadata.xml
new file mode 100644
index 000000000000..6b725ff17ca7
--- /dev/null
+++ b/app-crypt/codecrypt/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>exa.exa@gmail.com</email>
+ <name>Mirek Kratochvil</name>
+ <description>Proxied Maintainer</description>
+ </maintainer>
+ <longdescription lang="en">
+ This is a GnuPG-like unix program for encryption and signing
+ that uses only quantum-computer-resistant algorithms
+ </longdescription>
+ <use>
+ <flag name='cryptopp'>
+ Build algorithms that need Crypto++ support
+ <pkg>dev-libs/crypto++</pkg>
+ </flag>
+ </use>
+</pkgmetadata>
+
diff --git a/app-crypt/codegroup/Manifest b/app-crypt/codegroup/Manifest
new file mode 100644
index 000000000000..60a9d07905ae
--- /dev/null
+++ b/app-crypt/codegroup/Manifest
@@ -0,0 +1 @@
+DIST codegroup-20080907.zip 69123 SHA256 fe0dfb5b320b97afd0b639c76a796426bcad50a33a05399ecddde0189133b45b SHA512 3cf7816fe1c4c3b70cabb6e8518f6057cd04e735bef5569aff4b8753005ab33e5c4ac80bc434a45fef75267964ffe25fbfae9d72cffe6db075b4cafeb2b80e93 WHIRLPOOL 16e2e437bdb7b56e0c0d8990edb5071d24ee2f51920a9239c96a2c04f57be7fc42600baff4a0d9a7f835db957a8000576e1a96f1b51ab3944ef07117faf25cbc
diff --git a/app-crypt/codegroup/codegroup-20080907-r1.ebuild b/app-crypt/codegroup/codegroup-20080907-r1.ebuild
new file mode 100644
index 000000000000..f019f7e1c442
--- /dev/null
+++ b/app-crypt/codegroup/codegroup-20080907-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="encode / decode binary file as five letter codegroups"
+HOMEPAGE="http://www.fourmilab.ch/codegroup/"
+SRC_URI="http://www.fourmilab.ch/${PN}/${PN}.zip -> ${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+ dobin ${PN} || die
+
+ doman ${PN}.1 || die
+ dodoc ${PN}.{html,jpg} || die
+}
diff --git a/app-crypt/codegroup/files/codegroup-20080907-Makefile.patch b/app-crypt/codegroup/files/codegroup-20080907-Makefile.patch
new file mode 100644
index 000000000000..4fabba6cb3c6
--- /dev/null
+++ b/app-crypt/codegroup/files/codegroup-20080907-Makefile.patch
@@ -0,0 +1,20 @@
+--- codegroup-20080907/work/Makefile
++++ codegroup-20080907/work/Makefile
+@@ -1,6 +1,7 @@
+
+ PROGS = codegroup
+-CFLAGS = -O -Wall
++CFLAGS =
++LDFLAGS =
+ PAGER = more
+
+ all: $(PROGS)
+@@ -9,7 +10,7 @@
+ rm -f $(PROGS) *.o *.bak *.zip core code.* *.out
+
+ codegroup: codegroup.o
+- $(CC) codegroup.o -o codegroup $(CFLAGS)
++ $(CC) codegroup.o -o codegroup $(CFLAGS) $(LDFLAGS)
+
+ # Create zipped archive
+
diff --git a/app-crypt/codegroup/metadata.xml b/app-crypt/codegroup/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/app-crypt/codegroup/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/app-crypt/coolkey/Manifest b/app-crypt/coolkey/Manifest
new file mode 100644
index 000000000000..41cc6c66ddf7
--- /dev/null
+++ b/app-crypt/coolkey/Manifest
@@ -0,0 +1,2 @@
+DIST coolkey-1.1.0-patches-002.tar.gz 20574 SHA256 42767673025f7410bc1169231f7759abe4de69d8fa204fc8acfbe228b543129a SHA512 94050979f04f24924331b8a7c38b60de207d32b964caa39714aefd9f616ab7dd4e58b51e2c49fdb63b4dec1acce0c7245ae0a025ef76d457162b7200193dc663 WHIRLPOOL 55fee8ff261b8b3b8e16af05c1a6e7b4acd8eacaa0c73f5dd7bdf4918929097918be0f1ec2feaa5385d991d2a472672c7306dee60f4d61d313b2c47ec691f66a
+DIST coolkey-1.1.0.tar.gz 432808 SHA256 8448e3abb81bffc593c96b577dcfbc05b40e8684188456c31be15fae73d730f7 SHA512 4b61de9b40abcf620fbb519d5e3cf1e93ebdd0470854cb63a597fc91e0182998217353014327f7bc4f255d22515d8ea2b08d36b3a831f5f09134fdcd418bc08b WHIRLPOOL 60408f606a5cf5d9ec1ba3938a96a6f938c8d9f4b7ace2677ff35ce125104995675bf0decae92575e82dfc1a2eeaa26c4197ad174a4d3901250c43d906976c24
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r6.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r6.ebuild
new file mode 100644
index 000000000000..4b3fe498f018
--- /dev/null
+++ b/app-crypt/coolkey/coolkey-1.1.0-r6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils
+
+PATCHVER="002"
+
+DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
+HOMEPAGE="http://directory.fedora.redhat.com/wiki/CoolKey"
+SRC_URI="http://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
+ mirror://gentoo/${P}-patches-${PATCHVER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+ dev-libs/nss[utils]
+ sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+ >=app-crypt/ccid-1.4.0
+ virtual/pkgconfig"
+
+pkg_setup() {
+ pk="pk11install"
+ dbdir="/etc/pki/nssdb"
+ ck_mod_name="CoolKey PKCS #11 Module"
+
+ if ! [[ -x $dbdir ]]; then
+ ewarn "No /etc/pki/nssdb found; check under \$HOME/.pki and"
+ ewarn "follow the suggested commands using the correct path."
+ fi
+}
+
+src_prepare() {
+ epatch "${WORKDIR}/${PN}-patches"/*
+}
+
+src_configure() {
+ econf --enable-pk11install $(use_enable debug) \
+ || die "configure failed"
+}
+
+src_compile() {
+ emake CFLAGS+="-fno-strict-aliasing" -j1 || die "make failed"
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ diropts -m 1777
+ keepdir /var/cache/coolkey
+}
+
+pkg_postinst() {
+ if [[ -x $dbdir ]]; then
+ if ! $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
+ elog "You still need to install libcoolkey in your PKCS11 library:"
+ elog "$pk -p $dbdir 'name=$ck_mod_name library=libcoolkeypk11.so'"
+
+ fi
+ else
+ elog ""
+ elog "You still need to setup your PKCS11 library, or at least"
+ elog "find where it is (perhaps \$HOME/.pki/nssdb). Once you"
+ elog "find it, use 'modutil -rawlist -dbdir \$db' to look for"
+ elog "libcoolkeypk11.so, and if not found, add it using:"
+ elog ""
+ elog "$pk -p \$db 'name=$ck_mod_name library=libcoolkeypk11.so'"
+ elog ""
+ elog "where \$db is the full path to your pki/nssdb directory."
+ elog ""
+ fi
+}
+
+pkg_postrm() {
+ if [[ -x $dbdir ]]; then
+ if $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
+ elog "You should remove libcoolkey from your PKCS11 library."
+ fi
+ fi
+}
diff --git a/app-crypt/coolkey/metadata.xml b/app-crypt/coolkey/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/app-crypt/coolkey/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/crackpkcs12/Manifest b/app-crypt/crackpkcs12/Manifest
new file mode 100644
index 000000000000..883315c0d607
--- /dev/null
+++ b/app-crypt/crackpkcs12/Manifest
@@ -0,0 +1 @@
+DIST crackpkcs12-0.2.9.tar.gz 93931 SHA256 0c9aa4e643986e71866f185cb0fa09c74cb1f4c95ff48ffd013a5a4677bf49e0 SHA512 6c2463a7a76d2e2ef728b37f46f818ad279e3bd828254f54ac6c0d44e737436d7d026af2a54a54e07910d9b54058b3c5764e4066f7a8e40ca75ae7d8970f9eaa WHIRLPOOL 4886c14768b6b4fdf2ca02adad2e4b2a00486084cb5cfa5f29459254d00c6dac287877ea913a4900036bb3367e3cb5c7ac0f68d931ac0ed02fd7bb760f3dd4f8
diff --git a/app-crypt/crackpkcs12/crackpkcs12-0.2.9.ebuild b/app-crypt/crackpkcs12/crackpkcs12-0.2.9.ebuild
new file mode 100644
index 000000000000..e5d598e2512c
--- /dev/null
+++ b/app-crypt/crackpkcs12/crackpkcs12-0.2.9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="multithreaded program to crack PKCS#12 files"
+HOMEPAGE="http://crackpkcs12.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}"
diff --git a/app-crypt/crackpkcs12/metadata.xml b/app-crypt/crackpkcs12/metadata.xml
new file mode 100644
index 000000000000..33c685bf362c
--- /dev/null
+++ b/app-crypt/crackpkcs12/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>vapier@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">crackpkcs12</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/cryptkeeper/Manifest b/app-crypt/cryptkeeper/Manifest
new file mode 100644
index 000000000000..51017343cf63
--- /dev/null
+++ b/app-crypt/cryptkeeper/Manifest
@@ -0,0 +1 @@
+DIST cryptkeeper-0.9.5.tar.gz 222671 SHA256 1f9805d31562e448bf9bc11fdc2879f908ba42bfef5ad6adfa3877fc3b306984 SHA512 824c8b941d46904dd7f4b12a5f217aba25c848e016473d44ec71739baec78a7782dd00bb5d0c5dafc947235eddf558b8fe01a92e23b88b23352a05d0389cea3d WHIRLPOOL 7cf04ef6626cfc49d773ba67b83ab54f5d47d16a88d1541a9d1d8d3d2add9c744403759904ed2fce1feda0f9a654eeec39e8fd0c169418823b60300917b63ab4
diff --git a/app-crypt/cryptkeeper/cryptkeeper-0.9.5.ebuild b/app-crypt/cryptkeeper/cryptkeeper-0.9.5.ebuild
new file mode 100644
index 000000000000..53e0fff666b0
--- /dev/null
+++ b/app-crypt/cryptkeeper/cryptkeeper-0.9.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit base eutils gnome2
+
+DESCRIPTION="EncFS system tray applet for GNOME"
+HOMEPAGE="http://tom.noflag.org.uk/cryptkeeper.html"
+SRC_URI="http://tom.noflag.org.uk/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="gnome-base/gconf:2
+ >=sys-fs/encfs-1.7.2
+ >=sys-fs/fuse-2.8.0
+ gnome-extra/zenity"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-binutils-gold.patch"
+ "${FILESDIR}/${P}-fix_cryptkeeper.desktop.patch"
+ "${FILESDIR}/${P}-fix-ftbfs-gcc-4.7-672010.patch"
+ "${FILESDIR}/${P}-is_mounted_overflow_fix.patch"
+)
+
+DOCS="TODO"
+
+src_prepare() {
+ base_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ econf $(use_enable nls)
+}
diff --git a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-binutils-gold.patch b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-binutils-gold.patch
new file mode 100644
index 000000000000..875222592505
--- /dev/null
+++ b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-binutils-gold.patch
@@ -0,0 +1,15 @@
+Description: Fixes a build failure using binutils-gold
+Author: Franceco Namuri <francesco@namuri.it>
+Index: cryptkeeper-0.9.5/configure
+===================================================================
+--- cryptkeeper-0.9.5.orig/configure 2009-10-18 13:58:01.000000000 +0200
++++ cryptkeeper-0.9.5/configure 2011-12-11 12:04:13.045285159 +0100
+@@ -6707,7 +6707,7 @@
+
+ CFLAGS="$CFLAGS $DEP_CFLAGS $GNOME_KEYRING_CFLAGS"
+ CXXFLAGS="$CFLAGS"
+-LIBS="$DEP_LIBS $GNOME_KEYRING_LIBS"
++LIBS="-lX11 $DEP_LIBS $GNOME_KEYRING_LIBS"
+
+ #AC_PROG_LIBTOOL
+
diff --git a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix-ftbfs-gcc-4.7-672010.patch b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix-ftbfs-gcc-4.7-672010.patch
new file mode 100644
index 000000000000..e9f9f018bc25
--- /dev/null
+++ b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix-ftbfs-gcc-4.7-672010.patch
@@ -0,0 +1,18 @@
+Description: add missing include to avoid FTBFS with gcc 4.7
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/672010
+Forwarded: no
+Author: Paul Tagliamonte <tag@pault.ag>
+Reviewed-by: gregor herrmann <gregoa@debian.org>
+Last-Update: 2012-05-15
+
+--- a/src/lsof.cpp 2012-05-09 21:27:01.138367215 -0400
++++ b/src/lsof.cpp 2012-05-09 21:26:52.398367682 -0400
+@@ -21,6 +21,7 @@
+ #include <vector>
+ #include <assert.h>
+ #include <cstring>
++#include <unistd.h>
+ #include "lsof.h"
+
+ fsuser::fsuser(const char *pid, const char *name)
diff --git a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix_cryptkeeper.desktop.patch b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix_cryptkeeper.desktop.patch
new file mode 100644
index 000000000000..464f3ca77953
--- /dev/null
+++ b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix_cryptkeeper.desktop.patch
@@ -0,0 +1,17 @@
+Description: Fixes the category of cryptkeeper menu item
+Author: Francesco Namuri <francesco@namuri.it>
+Index: cryptkeeper-0.9.5/cryptkeeper.desktop
+===================================================================
+--- cryptkeeper-0.9.5.orig/cryptkeeper.desktop 2011-12-11 12:04:59.053286893 +0100
++++ cryptkeeper-0.9.5/cryptkeeper.desktop 2011-12-11 12:05:02.777287034 +0100
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Cryptkeeper
+ Exec=cryptkeeper
+ Icon=cryptkeeper
+-Categories=Application;System;
++Categories=System;GTK;Security;
+ Terminal=false
+ Type=Application
+ StartupNotify=false
diff --git a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-is_mounted_overflow_fix.patch b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-is_mounted_overflow_fix.patch
new file mode 100644
index 000000000000..c2a9a0ca0085
--- /dev/null
+++ b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-is_mounted_overflow_fix.patch
@@ -0,0 +1,53 @@
+commit 86b960a528df7118ab43b629bbd906db7459300d
+Author: Jon Dowland <jmtd@debian.org>
+Date: Sun May 22 12:48:39 2011 +0100
+
+ fix is_mounted (memory leaks and NULL access)
+
+ Ensure that the return of realpath is checked for NULL before
+ access. Ensure that the return value is free'd before it falls
+ out of scope. Related tidying up.
+
+diff --git a/src/encfs_wrapper.cpp b/src/encfs_wrapper.cpp
+index 347337b..961818b 100644
+--- a/src/encfs_wrapper.cpp
++++ b/src/encfs_wrapper.cpp
+@@ -33,24 +33,24 @@
+
+ bool is_mounted(const char *mount_dir)
+ {
++ struct mntent *m;
+ FILE *f = setmntent("/etc/mtab", "r");
+- char *mount_dir_expanded = realpath(mount_dir, NULL);
+- if (mount_dir_expanded == NULL) {
+- // no such file or dir, ...
+- // so: not mounted
+- // perror("cryptkeeper, is_mounted");
++ char *mount_dir_expanded, *mnt_dir_expanded;
++
++ if (!(mount_dir_expanded = realpath(mount_dir, NULL)))
+ return false;
+- }
+- for (;;) {
+- char *mnt_dir_expanded;
+- struct mntent *m = getmntent(f);
+- if (!m) break;
+- mnt_dir_expanded = realpath(m->mnt_dir, NULL);
+- if (strcmp(mount_dir_expanded, mnt_dir_expanded)==0) {
++
++ while(m = getmntent(f)) {
++ if(mnt_dir_expanded = realpath(m->mnt_dir, NULL)) {
++ if (strcmp(mount_dir_expanded, mnt_dir_expanded)==0) {
++ free(mnt_dir_expanded);
++ free(mount_dir_expanded);
++ return true;
++ }
+ free(mnt_dir_expanded);
+- return true;
+- }
++ }
+ }
++ free(mount_dir_expanded);
+ return false;
+ }
+
diff --git a/app-crypt/cryptkeeper/metadata.xml b/app-crypt/cryptkeeper/metadata.xml
new file mode 100644
index 000000000000..ad4f9bee6d8f
--- /dev/null
+++ b/app-crypt/cryptkeeper/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>phobosk@kbfx.net</email>
+ <name>PhobosK</name>
+ <description>Proxy maintainer. Assign bugs to him.</description>
+</maintainer>
+<longdescription>
+Cryptkeeper is a Linux system tray applet that manages EncFS encrypted folders.
+It allows users to mount and unmount encfs folders, to change the password and
+to create new crypted folders. It integrates with a preferred file manager.
+</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
new file mode 100644
index 000000000000..6957e01efdc3
--- /dev/null
+++ b/app-crypt/dieharder/Manifest
@@ -0,0 +1,2 @@
+DIST dieharder-2.28.1.tgz 766985 SHA256 748ec4716e64de38807e126f10335e45136fa789056e9f647a6bf73698205286 SHA512 35e210fd0fff9ecb3e68494058a9943e6684dd98d3a3ff70776b52a7de7fcbda28f10084f23f3872793da365ed8e16c0a91941266272e6e97575c9b146b17e14 WHIRLPOOL 8f17197f095831cc63601367ab73bac2ac19fda129ee321543883ee69477f9a253abaf3cc9a1e376bb531093bae56119dfd49f29deb29cad1ac411bccfa72a02
+DIST dieharder-3.31.1.tgz 1149780 SHA256 6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f SHA512 e01ed4266b4fe5d5fadde3c92c30e430d0ca5f7fedd26b26ed2ab98b7602aa9c35bb5c8fd9314ef2f5235b5087645ab13e5e6550156e26643baa5aeb77088dc5 WHIRLPOOL eb10fffbe839b2448b1955841dd4c3dee45f21ab89eb5107e82c3fef8706f7386ee6b6c21aa947c2cbe1f16075c7882975c9eff5fb17876799c15ccce9b5eca1
diff --git a/app-crypt/dieharder/dieharder-2.28.1.ebuild b/app-crypt/dieharder/dieharder-2.28.1.ebuild
new file mode 100644
index 000000000000..943426c5e666
--- /dev/null
+++ b/app-crypt/dieharder/dieharder-2.28.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+WANT_AUTOCONF="2.5"
+inherit autotools eutils
+
+DESCRIPTION="An advanced suite for testing the randomness of RNG's"
+HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php"
+SRC_URI="http://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sci-libs/gsl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-qafixes.patch
+ eautoreconf
+}
+
+src_compile() {
+ emake all-recursive || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc NEWS README* NOTES || die
+ docinto "dieharder"
+ dodoc dieharder/README dieharder/NOTES || die
+ docinto "libdieharder"
+ dodoc libdieharder/README libdieharder/NOTES || die
+}
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
new file mode 100644
index 000000000000..49db3e0147f0
--- /dev/null
+++ b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="An advanced suite for testing the randomness of RNG's"
+HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php"
+SRC_URI="http://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="sci-libs/gsl"
+DEPEND="${RDEPEND}
+ doc? ( dev-tex/latex2html )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-build.patch"
+ eautoreconf
+}
+
+src_compile() {
+ emake -j1
+ use doc && emake -C manual
+}
+
+src_install() {
+ default
+ dodoc NOTES
+ docinto "dieharder"
+ dodoc dieharder/README dieharder/NOTES
+ docinto "libdieharder"
+ dodoc libdieharder/README libdieharder/NOTES
+
+ if use doc ; then
+ dodoc ChangeLog dieharder.html
+ docinto "manual"
+ dodoc manual/dieharder.pdf manual/dieharder.ps
+ fi
+}
diff --git a/app-crypt/dieharder/dieharder-3.31.1.ebuild b/app-crypt/dieharder/dieharder-3.31.1.ebuild
new file mode 100644
index 000000000000..92d7ad4d6817
--- /dev/null
+++ b/app-crypt/dieharder/dieharder-3.31.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="An advanced suite for testing the randomness of RNG's"
+HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php"
+SRC_URI="http://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="sci-libs/gsl"
+DEPEND="${RDEPEND}
+ doc? ( dev-tex/latex2html )"
+
+src_compile() {
+ emake all-recursive
+ use doc && emake -C manual
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README NOTES
+ docinto "dieharder"
+ dodoc dieharder/README dieharder/NOTES
+ docinto "libdieharder"
+ dodoc libdieharder/README libdieharder/NOTES
+
+ if use doc ; then
+ dodoc ChangeLog dieharder.html
+ docinto "manual"
+ dodoc manual/dieharder.pdf manual/dieharder.ps
+ fi
+}
diff --git a/app-crypt/dieharder/files/dieharder-2.28.1-qafixes.patch b/app-crypt/dieharder/files/dieharder-2.28.1-qafixes.patch
new file mode 100644
index 000000000000..265d566c801c
--- /dev/null
+++ b/app-crypt/dieharder/files/dieharder-2.28.1-qafixes.patch
@@ -0,0 +1,33 @@
+--- libdieharder/static_get_bits.c 2008-09-08 08:37:18.000000000 -0400
++++ libdieharder/static_get_bits.c.new 2010-12-21 09:39:02.000000000 -0500
+@@ -44,7 +44,7 @@
+ }
+ if(nbits > 32){
+ fprintf(stderr,"Warning! dieharder cannot yet work with\b");
+- fprintf(stderr," %u > 32 bit chunks. Exiting!\n\n");
++ fprintf(stderr," %u > 32 bit chunks. Exiting!\n\n", nbits);
+ exit(0);
+ }
+
+--- libdieharder/bits.c 2008-09-08 08:37:18.000000000 -0400
++++ libdieharder/bits.c.new 2010-12-21 09:45:51.000000000 -0500
+@@ -944,7 +944,7 @@
+ */
+ MYDEBUG(D_BITS) {
+ printf("bu = %d bl = %d\n",bu,bl);
+- printf(" init %2d: |");
++ printf(" init %2d: |",bleft);
+ dumpbits(&bits_rand[0],bu);
+ printf("|");
+ dumpbits(&bits_rand[1],bu);
+--- libdieharder/marsaglia_tsang_gcd.c 2008-09-08 08:37:19.000000000 -0400
++++ libdieharder/marsaglia_tsang_gcd.c.new 2010-12-21 09:47:40.000000000 -0500
+@@ -289,7 +289,7 @@
+ Vtest_destroy(&vtest_u);
+
+ if(verbose == D_USER_TEMPLATE || verbose == D_ALL){
+- printf("# user_marsaglia_tsang_gcd(): ks_pvalue_k[%u] = %10.5f ks_pvalue_w[%u] = %10.5f\n",kspi,ks_pvalue[kspi],ks_pvalue2[kspi]);
++ printf("# user_marsaglia_tsang_gcd(): ks_pvalue_k[%u] = %10.5f ks_pvalue_w[%u] = %10.5f\n",kspi,ks_pvalue[kspi],kspi,ks_pvalue2[kspi]);
+ }
+
+ kspi++;
diff --git a/app-crypt/dieharder/files/dieharder-3.31.1-build.patch b/app-crypt/dieharder/files/dieharder-3.31.1-build.patch
new file mode 100644
index 000000000000..4cbd5021c77c
--- /dev/null
+++ b/app-crypt/dieharder/files/dieharder-3.31.1-build.patch
@@ -0,0 +1,27 @@
+diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h
+index 2138ebf..f6d471b 100644
+--- a/include/dieharder/libdieharder.h
++++ b/include/dieharder/libdieharder.h
+@@ -6,6 +6,8 @@
+
+ #include "copyright.h"
+
++#define _GNU_SOURCE
++
+ /* To enable large file support */
+ #define _FILE_OFFSET_BITS 64
+
+@@ -16,13 +18,11 @@
+ #include <sys/time.h>
+
+ /* This turns on uint macro in c99 */
+-#define __USE_MISC 1
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+ /* This turns on M_PI in math.h */
+-#define __USE_BSD 1
+ #include <math.h>
+ #include <limits.h>
+ #include <gsl/gsl_rng.h>
diff --git a/app-crypt/dieharder/metadata.xml b/app-crypt/dieharder/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/app-crypt/dieharder/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/dirmngr/Manifest b/app-crypt/dirmngr/Manifest
new file mode 100644
index 000000000000..6b6bad27ca15
--- /dev/null
+++ b/app-crypt/dirmngr/Manifest
@@ -0,0 +1 @@
+DIST dirmngr-1.1.1.tar.bz2 566929 SHA256 d2280b8c314db80cdaf101211a47826734443436f5c3545cc1b614c50eaae6ff SHA512 922512f22853c49cf291207c81862c68ba51c89646036288592d6b2f57709d35ac53f9f550569986c04daec20403ab8ec85b08893443af417950916b869c8419 WHIRLPOOL 84a174d42418723e346c7af8d9bb9aa12e4602cbba9510f492ef10d29f4900768ede986d2c7c93cee129ce03e5aeca08357490ec050b54e1250e2e4b36150617
diff --git a/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild b/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..d9c8bd8d558d
--- /dev/null
+++ b/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="DirMngr is a daemon to handle CRL and certificate requests for GnuPG"
+HOMEPAGE="http://www.gnupg.org/download/index.en.html#dirmngr"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="nls"
+
+RDEPEND=">=net-nds/openldap-2.1.26
+ >=dev-libs/libgpg-error-1.4
+ >=dev-libs/libgcrypt-1.4.0:0
+ >=dev-libs/libksba-1.0.2
+ >=dev-libs/pth-1.3.7
+ nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+ >=dev-libs/libassuan-2
+ nls? ( >=sys-devel/gettext-0.12.1 )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-pth.patch"
+}
+
+src_configure() {
+ econf --docdir="/usr/share/doc/${PF}" $(use_enable nls) \
+ LDAPLIBS="-lldap -llber"
+}
+
+src_install() {
+ default
+ dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
diff --git a/app-crypt/dirmngr/files/dirmngr-1.1.1-pth.patch b/app-crypt/dirmngr/files/dirmngr-1.1.1-pth.patch
new file mode 100644
index 000000000000..862458ed1db6
--- /dev/null
+++ b/app-crypt/dirmngr/files/dirmngr-1.1.1-pth.patch
@@ -0,0 +1,17 @@
+Index: src/dirmngr.c
+===================================================================
+--- src/dirmngr.c (revision 348)
++++ src/dirmngr.c (working copy)
+@@ -665,8 +665,11 @@
+ the option parsing may need services of the libraries. */
+
+ /* Libgcrypt requires us to register the threading model first.
+- Note that this will also do the pth_init. */
++ Note that this will also do the pth_init for libgcrypt < 1.6 */
+
++#if GCRYPT_VERSION_NUMBER >= 0x010600
++ pth_init ();
++#endif
+ /* Init Libgcrypt. */
+ rc = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
+ if (rc)
diff --git a/app-crypt/dirmngr/metadata.xml b/app-crypt/dirmngr/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/app-crypt/dirmngr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
new file mode 100644
index 000000000000..f1fa3a85ccdf
--- /dev/null
+++ b/app-crypt/easy-rsa/Manifest
@@ -0,0 +1,2 @@
+DIST EasyRSA-2.2.2.tgz 10492 SHA256 68da869085dde7c6a964e9c6104b86e4af91c4c592f8ec2a2f6cfc9d20808991 SHA512 b09bd1a71c1bfeb3c2ff63f10b7781badf6d2b4888d97d917565436435b85fb90eebf7727db293bdc44039f23c7f3c3c4e762a22bf7d6e9ed7642a2f07e1ffe4 WHIRLPOOL 27b7d761a317d8787526dbdc1878e62326e6ca13730ddf9b50fe918f010c23d1535dfa4f6bfb76bf26bd005942105a0e862359579faf7b6fe803ad7ca53d627e
+DIST easy-rsa-2.2.0_master.tar.gz 80460 SHA256 d23ddc3a764b40d03ada76f387c92ae4dcf4f5266da54c2bae130325b05eebe2 SHA512 81b5d6e805c5d9fcadf6425dbc311b6a151d857cb837ce9b419b653ee546e5742d13864d25e9ab8caffee95e5116d1611323288e80c65c3c88730533919e2fb4 WHIRLPOOL ff65ca8e3b47123aa3765937d508682afe51c9831e8dbc3e57cb5000088cc69ad5e086618e647e90677481c2d5e7d34733fd7ba50a067810e1a42c876d348823
diff --git a/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild b/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..59e09d68bfb5
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="http://openvpn.net/"
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}_master.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/openssl-0.9.6:0"
+RDEPEND="${DEPEND}
+ !<net-misc/openvpn-2.3"
+
+S="${WORKDIR}/${P}_master"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-2.0.0-pkcs11.patch \
+ "${FILESDIR}"/no-licenses.patch
+}
+
+src_configure() {
+ econf --docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
+}
diff --git a/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild b/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
new file mode 100644
index 000000000000..aa37a2706f81
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_P="EasyRSA-${PV}"
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="http://openvpn.net/"
+SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/${PV}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/openssl-0.9.6:0"
+RDEPEND="${DEPEND}
+ !<net-misc/openvpn-2.3"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-pkcs11.patch"
+}
+
+src_install() {
+ exeinto /usr/share/easy-rsa
+ doexe build-* clean-all inherit-inter list-crl pkitool revoke-full sign-req whichopensslcnf
+ insinto /usr/share/easy-rsa
+ doins vars openssl-*.cnf
+ doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
+}
diff --git a/app-crypt/easy-rsa/files/2.2.2-pkcs11.patch b/app-crypt/easy-rsa/files/2.2.2-pkcs11.patch
new file mode 100644
index 000000000000..8e026c231246
--- /dev/null
+++ b/app-crypt/easy-rsa/files/2.2.2-pkcs11.patch
@@ -0,0 +1,36 @@
+diff --git a/easy-rsa/2.0/openssl-0.9.8.cnf b/easy-rsa/2.0/openssl-0.9.8.cnf
+index 340b8af..89602a2 100755
+--- a/openssl-0.9.8.cnf
++++ b/openssl-0.9.8.cnf
+@@ -283,8 +283,8 @@ authorityKeyIdentifier=keyid:always,issuer:always
+ #pkcs11 = pkcs11_section
+
+ [ pkcs11_section ]
+-engine_id = pkcs11
+-dynamic_path = /usr/lib/engines/engine_pkcs11.so
+-MODULE_PATH = $ENV::PKCS11_MODULE_PATH
+-PIN = $ENV::PKCS11_PIN
+-init = 0
++#engine_id = pkcs11
++#dynamic_path = /usr/lib/engines/engine_pkcs11.so
++#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
++#PIN = $ENV::PKCS11_PIN
++#init = 0
+diff --git a/easy-rsa/2.0/openssl-1.0.0.cnf b/easy-rsa/2.0/openssl-1.0.0.cnf
+index fa258a5..527919d 100755
+--- a/openssl-1.0.0.cnf
++++ b/openssl-1.0.0.cnf
+@@ -278,8 +278,8 @@ authorityKeyIdentifier=keyid:always,issuer:always
+ #pkcs11 = pkcs11_section
+
+ [ pkcs11_section ]
+-engine_id = pkcs11
+-dynamic_path = /usr/lib/engines/engine_pkcs11.so
+-MODULE_PATH = $ENV::PKCS11_MODULE_PATH
+-PIN = $ENV::PKCS11_PIN
+-init = 0
++#engine_id = pkcs11
++#dynamic_path = /usr/lib/engines/engine_pkcs11.so
++#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
++#PIN = $ENV::PKCS11_PIN
++#init = 0
diff --git a/app-crypt/easy-rsa/files/65easy-rsa b/app-crypt/easy-rsa/files/65easy-rsa
new file mode 100644
index 000000000000..cc8b42e22ea5
--- /dev/null
+++ b/app-crypt/easy-rsa/files/65easy-rsa
@@ -0,0 +1 @@
+CONFIG_PROTECT="/usr/share/easy-rsa"
diff --git a/app-crypt/easy-rsa/files/easy-rsa-2.0.0-pkcs11.patch b/app-crypt/easy-rsa/files/easy-rsa-2.0.0-pkcs11.patch
new file mode 100644
index 000000000000..c7115cc357db
--- /dev/null
+++ b/app-crypt/easy-rsa/files/easy-rsa-2.0.0-pkcs11.patch
@@ -0,0 +1,36 @@
+diff --git a/easy-rsa/2.0/openssl-0.9.8.cnf b/easy-rsa/2.0/openssl-0.9.8.cnf
+index 340b8af..89602a2 100755
+--- a/easy-rsa/2.0/openssl-0.9.8.cnf
++++ b/easy-rsa/2.0/openssl-0.9.8.cnf
+@@ -283,8 +283,8 @@ authorityKeyIdentifier=keyid:always,issuer:always
+ #pkcs11 = pkcs11_section
+
+ [ pkcs11_section ]
+-engine_id = pkcs11
+-dynamic_path = /usr/lib/engines/engine_pkcs11.so
+-MODULE_PATH = $ENV::PKCS11_MODULE_PATH
+-PIN = $ENV::PKCS11_PIN
+-init = 0
++#engine_id = pkcs11
++#dynamic_path = /usr/lib/engines/engine_pkcs11.so
++#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
++#PIN = $ENV::PKCS11_PIN
++#init = 0
+diff --git a/easy-rsa/2.0/openssl-1.0.0.cnf b/easy-rsa/2.0/openssl-1.0.0.cnf
+index fa258a5..527919d 100755
+--- a/easy-rsa/2.0/openssl-1.0.0.cnf
++++ b/easy-rsa/2.0/openssl-1.0.0.cnf
+@@ -278,8 +278,8 @@ authorityKeyIdentifier=keyid:always,issuer:always
+ #pkcs11 = pkcs11_section
+
+ [ pkcs11_section ]
+-engine_id = pkcs11
+-dynamic_path = /usr/lib/engines/engine_pkcs11.so
+-MODULE_PATH = $ENV::PKCS11_MODULE_PATH
+-PIN = $ENV::PKCS11_PIN
+-init = 0
++#engine_id = pkcs11
++#dynamic_path = /usr/lib/engines/engine_pkcs11.so
++#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
++#PIN = $ENV::PKCS11_PIN
++#init = 0
diff --git a/app-crypt/easy-rsa/files/no-licenses.patch b/app-crypt/easy-rsa/files/no-licenses.patch
new file mode 100644
index 000000000000..40290cb6eb14
--- /dev/null
+++ b/app-crypt/easy-rsa/files/no-licenses.patch
@@ -0,0 +1,14 @@
+--- Makefile.in 2013-05-22 12:38:10.685814374 +0200
++++ Makefile.in.new 2013-05-22 12:40:30.484539547 +0200
+@@ -186,10 +186,7 @@
+
+ EXTRA_DIST = easy-rsa
+ SUBDIRS = doc distro
+-dist_doc_DATA = \
+- COPYRIGHT.GPL \
+- COPYING
+-
++dist_doc_DATA =
+ dist_easyrsa_DATA =
+ all: all-recursive
+
diff --git a/app-crypt/easy-rsa/metadata.xml b/app-crypt/easy-rsa/metadata.xml
new file mode 100644
index 000000000000..169b8535ec00
--- /dev/null
+++ b/app-crypt/easy-rsa/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>djc@gentoo.org</email>
+ <name>Dirkjan Ochtman</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">OpenVPN/easy-rsa</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
new file mode 100644
index 000000000000..464867747785
--- /dev/null
+++ b/app-crypt/efitools/Manifest
@@ -0,0 +1,2 @@
+DIST efitools-1.4.1.tar.gz 91444 SHA256 6946e7894118012ca12503a6e55a4f8f17310d0eb02d8f1ab8947d9012ad8b51 SHA512 0994fdd9f934575691f740631dfbcc67f15e56f873cba10657536389d61b5bb955b0de91261f0486bfa5381e27f42b5dd0b6ea55fe3643f8b0dae2f9b1916ef1 WHIRLPOOL 7eb973fd0239fa41d2ff82ccfda526725032c0da64d0cd5223a7d66abf42c951f4ba2d3613c024c3bceebf6e032af88527f6a35eff76f258f19e12431cbac0bd
+DIST efitools-1.4.2.tar.gz 97303 SHA256 df7b9d7570b2fb85ee060e14b1952233d28e277f5b2f839c225f093890e5d843 SHA512 19433b6ccc95a18649b05376c0090f4325345d1a9ccf2601e9b4818a7a888379ab1bb620022f393498e520073f06e10962f5322632219fc21da390e4e5cd4c9f WHIRLPOOL 43000942f99fdf888bf2d2447eb28ca5eba9440194f5de71fd4532ad61a3735b23a08e4fdef4f89a9fd06e30537e9f6305e5f320e1c27ab60a6c4cb91762d74d
diff --git a/app-crypt/efitools/efitools-1.4.1-r1.ebuild b/app-crypt/efitools/efitools-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..c6dd05a574ac
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.4.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl
+ sys-apps/util-linux"
+DEPEND="${RDEPEND}
+ sys-apps/help2man
+ sys-boot/gnu-efi
+ app-editors/vim-core
+ app-crypt/sbsigntool
+ virtual/pkgconfig"
diff --git a/app-crypt/efitools/efitools-1.4.1-r2.ebuild b/app-crypt/efitools/efitools-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..952a8ec9e9bb
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.4.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl
+ sys-apps/util-linux"
+DEPEND="${RDEPEND}
+ sys-apps/help2man
+ sys-boot/gnu-efi
+ dev-perl/File-Slurp
+ app-crypt/sbsigntool
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}"/xxdi.patch
+ chmod 755 "${WORKDIR}/${P}/xxdi.pl"
+}
diff --git a/app-crypt/efitools/efitools-1.4.1.ebuild b/app-crypt/efitools/efitools-1.4.1.ebuild
new file mode 100644
index 000000000000..0e95ec146ea5
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.4.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl
+ sys-apps/util-linux"
+DEPEND="${RDEPEND}
+ sys-apps/help2man
+ sys-boot/gnu-efi
+ virtual/pkgconfig"
diff --git a/app-crypt/efitools/efitools-1.4.2-r1.ebuild b/app-crypt/efitools/efitools-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..dabedc534abf
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.4.2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="http://blog.hansenpartnership.com/wp-uploads/2013/efitools-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl
+ sys-apps/util-linux"
+DEPEND="${RDEPEND}
+ sys-apps/help2man
+ >=sys-boot/gnu-efi-3.0u
+ app-crypt/sbsigntool
+ virtual/pkgconfig
+ dev-perl/File-Slurp"
diff --git a/app-crypt/efitools/efitools-1.4.2.ebuild b/app-crypt/efitools/efitools-1.4.2.ebuild
new file mode 100644
index 000000000000..9d061cce3e8c
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.4.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="http://blog.hansenpartnership.com/wp-uploads/2013/efitools-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl
+ sys-apps/util-linux"
+DEPEND="${RDEPEND}
+ sys-apps/help2man
+ sys-boot/gnu-efi
+ app-crypt/sbsigntool
+ virtual/pkgconfig"
diff --git a/app-crypt/efitools/files/xxdi.patch b/app-crypt/efitools/files/xxdi.patch
new file mode 100644
index 000000000000..ec62125ea4ad
--- /dev/null
+++ b/app-crypt/efitools/files/xxdi.patch
@@ -0,0 +1,110 @@
+From gregkh@linuxfoundation.org Sun Sep 1 14:55:47 2013
+Date: Sun, 1 Sep 2013 14:58:15 -0700
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+To: James Bottomley <James.Bottomley@HansenPartnership.com>
+Cc: JBottomley@Parallels.com, greg@kroah.com
+Subject: [efitools PATCH] Makefile/Make.rules: don't rely on vim-core
+Message-ID: <20130901215815.GA8749@kroah.com>
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+Subject: Makefile/Make.rules: don't rely on vim-core
+
+This adds the xxdi.pl script to replace the call to 'xxd -i', removing a
+build dependancy on vim-core, which some distros don't really want to
+have (i.e. Gentoo and its build derivatives like ChromeOS and CoreOS.)
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Make.rules | 2 +-
+ Makefile | 2 +-
+ xxdi.pl | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 52 insertions(+), 2 deletions(-)
+ create mode 100755 xxdi.pl
+
+diff --git a/Make.rules b/Make.rules
+index 419b3b9..309b231 100644
+--- a/Make.rules
++++ b/Make.rules
+@@ -38,7 +38,7 @@ endif
+ nm -D $@ | grep ' U ' && exit 1 || exit 0
+
+ %.h: %.auth
+- xxd -i $< > $@
++ ./xxdi.pl $< > $@
+
+ %.hash: %.efi hash-to-efi-sig-list
+ ./hash-to-efi-sig-list $< $@
+diff --git a/Makefile b/Makefile
+index 52f4551..a39cafe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -62,7 +62,7 @@ DB.auth: DB.esl KEK.crt sign-efi-sig-list
+
+ hashlist.h: HashTool.hash
+ cat $^ > /tmp/tmp.hash
+- xxd -i /tmp/tmp.hash > $@
++ ./xxdi.pl /tmp/tmp.hash > $@
+ rm -f /tmp/tmp.hash
+
+
+diff --git a/xxdi.pl b/xxdi.pl
+new file mode 100755
+index 0000000..acc974c
+--- /dev/null
++++ b/xxdi.pl
+@@ -0,0 +1,50 @@
++#!/usr/bin/env perl
++#
++# xxdi.pl - perl implementation of 'xxd -i' mode
++#
++# Copyright 2013 Greg Kroah-Hartman <gregkh@linuxfoundation.org>
++# Copyright 2013 Linux Foundation
++#
++# Released under the GPLv2.
++#
++# Implements the "basic" functionality of 'xxd -i' in perl to keep build
++# systems from having to build/install/rely on vim-core, which not all
++# distros want to do. But everyone has perl, so use it instead.
++#
++
++use strict;
++use warnings;
++use File::Slurp qw(slurp);
++
++my $indata = slurp(@ARGV ? $ARGV[0] : \*STDIN);
++my $len_data = length($indata);
++my $num_digits_per_line = 12;
++my $var_name;
++my $outdata;
++
++# Use the variable name of the file we read from, converting '/' and '.
++# to '_', or, if this is stdin, just use "stdin" as the name.
++if (@ARGV) {
++ $var_name = $ARGV[0];
++ $var_name =~ s/\//_/g;
++ $var_name =~ s/\./_/g;
++} else {
++ $var_name = "stdin";
++}
++
++$outdata .= "unsigned char $var_name\[] = {";
++
++# trailing ',' is acceptable, so instead of duplicating the logic for
++# just the last character, live with the extra ','.
++for (my $key= 0; $key < $len_data; $key++) {
++ if ($key % $num_digits_per_line == 0) {
++ $outdata .= "\n\t";
++ }
++ $outdata .= sprintf("0x%.2x, ", ord(substr($indata, $key, 1)));
++}
++
++$outdata .= "\n};\nunsigned int $var_name\_len = $len_data;\n";
++
++binmode STDOUT;
++print {*STDOUT} $outdata;
++
+--
+1.8.4.6.g82e253f.dirty
+
+
diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml
new file mode 100644
index 000000000000..6b2229b74c9d
--- /dev/null
+++ b/app-crypt/efitools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>gregkh@gentoo.org</email>
+ <description>do whatever</description>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
new file mode 100644
index 000000000000..b5b1c58bfc28
--- /dev/null
+++ b/app-crypt/eid-mw/Manifest
@@ -0,0 +1,2 @@
+DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
+DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
diff --git a/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild b/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild
new file mode 100644
index 000000000000..10b99b1172ff
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator mozextension multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ ESVN_REPO_URI="http://eid-mw.googlecode.com/svn/trunk/"
+ inherit subversion autotools
+ SRC_URI=""
+else
+ MY_P="${PN}-${PV/_p/-}"
+ SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-250016.gz -> ${MY_P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+ S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be"
+
+IUSE="+gtk +xpi"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+ >=sys-apps/pcsc-lite-1.2.9
+ xpi? ( || ( >=www-client/firefox-bin-3.6.24
+ >=www-client/firefox-3.6.20 ) )
+ !app-misc/beid-runtime"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+if [[ ${PV} == "9999" ]]; then
+ src_prepare() {
+ eautoreconf
+ }
+else
+ src_prepare() {
+ epatch "${FILESDIR}"/fix-nodialog-bug.patch
+ }
+fi
+
+src_configure() {
+ econf $(use_enable gtk dialogs) --disable-static
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ if use xpi; then
+ declare MOZILLA_FIVE_HOME
+ if has_version '>=www-client/firefox-3.6.20'; then
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ fi
+ if has_version '>=www-client/firefox-bin-3.6.24'; then
+ MOZILLA_FIVE_HOME="/opt/firefox"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ fi
+ fi
+ rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+}
diff --git a/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild b/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild
new file mode 100644
index 000000000000..9ef575a906b3
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator mozextension multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+ https://github.com/Fedict/${PN}.git"
+ inherit git-2 autotools
+ SRC_URI=""
+else
+ MY_P="${PN}-${PV/_p/-}"
+ SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz -> ${MY_P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+ S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be"
+
+IUSE="+gtk +xpi"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+ >=sys-apps/pcsc-lite-1.2.9
+ xpi? ( || ( >=www-client/firefox-bin-3.6.24
+ >=www-client/firefox-3.6.20 ) )
+ !app-misc/beid-runtime"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+if [[ ${PV} == "9999" ]]; then
+ src_prepare() {
+ eautoreconf
+ }
+fi
+
+src_configure() {
+ econf $(use_enable gtk dialogs) --disable-static
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ if use xpi; then
+ declare MOZILLA_FIVE_HOME
+ if has_version '>=www-client/firefox-3.6.20'; then
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ fi
+ if has_version '>=www-client/firefox-bin-3.6.24'; then
+ MOZILLA_FIVE_HOME="/opt/firefox"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ fi
+ fi
+ rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
new file mode 100644
index 000000000000..9ef575a906b3
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator mozextension multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+ https://github.com/Fedict/${PN}.git"
+ inherit git-2 autotools
+ SRC_URI=""
+else
+ MY_P="${PN}-${PV/_p/-}"
+ SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz -> ${MY_P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+ S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be"
+
+IUSE="+gtk +xpi"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+ >=sys-apps/pcsc-lite-1.2.9
+ xpi? ( || ( >=www-client/firefox-bin-3.6.24
+ >=www-client/firefox-3.6.20 ) )
+ !app-misc/beid-runtime"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+if [[ ${PV} == "9999" ]]; then
+ src_prepare() {
+ eautoreconf
+ }
+fi
+
+src_configure() {
+ econf $(use_enable gtk dialogs) --disable-static
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ if use xpi; then
+ declare MOZILLA_FIVE_HOME
+ if has_version '>=www-client/firefox-3.6.20'; then
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ fi
+ if has_version '>=www-client/firefox-bin-3.6.24'; then
+ MOZILLA_FIVE_HOME="/opt/firefox"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ fi
+ fi
+ rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+}
diff --git a/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
new file mode 100644
index 000000000000..1f70c781dd95
--- /dev/null
+++ b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
@@ -0,0 +1,38 @@
+Index: eid-mw-4.0.2/common/src/socket/socket.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/socket/socket.cpp
++++ eid-mw-4.0.2/common/src/socket/socket.cpp
+@@ -21,6 +21,8 @@
+ #include "../eiderrors.h"
+ #include <iostream>
+
++#include <unistd.h>
++
+ namespace eIDMW
+ {
+
+Index: eid-mw-4.0.2/common/src/socket/socketserver.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/socket/socketserver.cpp
++++ eid-mw-4.0.2/common/src/socket/socketserver.cpp
+@@ -26,6 +26,7 @@
+ #include <netinet/in.h>
+ #include <sys/ioctl.h>
+ #include <errno.h>
++#include <unistd.h>
+ #ifndef SOCKET_ERROR
+ #define SOCKET_ERROR -1
+ #endif
+Index: eid-mw-4.0.2/common/src/util.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/util.cpp
++++ eid-mw-4.0.2/common/src/util.cpp
+@@ -27,6 +27,8 @@
+
+ #include <stdlib.h>
+
++#include <unistd.h>
++
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
diff --git a/app-crypt/eid-mw/files/fix-nodialog-bug.patch b/app-crypt/eid-mw/files/fix-nodialog-bug.patch
new file mode 100644
index 000000000000..5ea003216241
--- /dev/null
+++ b/app-crypt/eid-mw/files/fix-nodialog-bug.patch
@@ -0,0 +1,20 @@
+Index: cardlayer/src/pinpadlib.h
+===================================================================
+--- cardlayer/src/pinpadlib.h (revision 1501)
++++ cardlayer/src/pinpadlib.h (revision 1502)
+@@ -43,13 +43,14 @@
+ #endif
+ #ifndef NO_DIALOGS
+ #include "../dialogs/src/dialogs.h"
++#endif
+ #ifdef __APPLE__
+ typedef void* BEID_DIALOGHANDLE;
+ #else
+ typedef unsigned long BEID_DIALOGHANDLE;
+ #endif
+-#endif
+
++
+ namespace eIDMW
+ {
+ #ifdef EIDMW_PF_EXPORT
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
new file mode 100644
index 000000000000..964772a1c4bb
--- /dev/null
+++ b/app-crypt/eid-mw/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>vincent.hardy.be@gmail.com</email>
+</maintainer>
+<maintainer>
+ <email>flameeyes@gentoo.org</email>
+</maintainer>
+<longdescription>
+eid-mw is Belgian Electronic Identity Card (eID) middleware supplied by the Belgian Federal Government.
+
+With your eID, you can:
+- identify yourself when necessary. All you have to do is insert the card in the reader. All your details then appear automatically on the PC screen.
+- authenticate yourself. This is a way of checking that you are who you say you are. That can be handy on the internet or to enable your children to chat in safety.
+- place a legally binding electronic signature on electronic documents.
+
+These three functions form the basis of the countless applications for your eID. Go to http://welcome-to-e-belgium.be/en/ and check out what can you do with it? and discover all the things you can use the eID for.
+</longdescription>
+<use>
+ <flag name="gtk">
+ Enable the dialog pages, by using <pkg>x11-libs/gtk+:2</pkg>
+ </flag>
+ <flag name="xpi">
+ Build and install an extension for Mozilla browsers.
+ </flag>
+</use>
+</pkgmetadata>
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
new file mode 100644
index 000000000000..83dd33e97c20
--- /dev/null
+++ b/app-crypt/ekeyd/Manifest
@@ -0,0 +1,2 @@
+DIST ekeyd-1.1.4.tar.gz 100911 SHA256 147ca4ff964ab7b344a08d3cd6f9b1bf03ba18776a1941d603681d8102cce0c8 SHA512 40632722827e07ebc643fa32af9910b28053873329772681dba2b029ad0b3c63d1d6bba3fdd0549b84e23779d2e2ae0323a53e1fdf93eb963570bab2227b63e6 WHIRLPOOL 1dc89c735befeeb8fb2d840d27ddcce0b8b15cffb8be0b9e6fa978f0c14bc9cef8345b8b1f4a3c6140031b1a01d92c26674e011acec3c6605ddf7b5c2e56d248
+DIST ekeyd_1.1.5.orig.tar.gz 101366 SHA256 4aa8abe4bd8bb4517be3f751a75ae270ac2855ba4ba465099a3f29a2c8602ec4 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a WHIRLPOOL bfa6cbea82bea8aeed7a86cc5cc0e8e95bd9ceba00d57f78a0bd5bcf6694d4c37db1a43ff01a92493d83a33b41c2a17ddac366c6d2281b848d5f239b4240ea39
diff --git a/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild b/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
new file mode 100644
index 000000000000..98fbb92777e3
--- /dev/null
+++ b/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils multilib linux-info toolchain-funcs udev
+
+DESCRIPTION="Entropy Key userspace daemon"
+HOMEPAGE="http://www.entropykey.co.uk/"
+SRC_URI="http://www.entropykey.co.uk/res/download/${P}.tar.gz"
+
+LICENSE="MIT GPL-2" # GPL-2 (only) for init script
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="usb kernel_linux munin minimal"
+REQUIRED_USE="minimal? ( !munin !usb )"
+
+EKEYD_RDEPEND="dev-lang/lua
+ usb? ( virtual/libusb:0 )"
+EKEYD_DEPEND="${EKEYD_RDEPEND}"
+EKEYD_RDEPEND="${EKEYD_RDEPEND}
+ dev-lua/luasocket
+ kernel_linux? ( virtual/udev )
+ usb? ( !kernel_linux? ( sys-apps/usbutils ) )
+ munin? ( net-analyzer/munin )"
+
+RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
+ !app-crypt/ekey-egd-linux
+ sys-apps/openrc"
+DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
+
+CONFIG_CHECK="~USB_ACM"
+
+pkg_setup() {
+ if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+ local osname
+
+ # Override automatic detection: upstream provides this with uname,
+ # we don't like using uname.
+ case ${CHOST} in
+ *-linux-*)
+ osname=linux;;
+ *-freebsd*)
+ osname=freebsd;;
+ *-kfrebsd-gnu)
+ osname=gnukfreebsd;;
+ *-openbsd*)
+ osname=openbsd;;
+ *)
+ die "Unsupported operating system!"
+ ;;
+ esac
+
+ # We don't slot LUA so we don't really need to have the variables
+ # set at all.
+ emake -C host \
+ CC="$(tc-getCC)" \
+ LUA_V= LUA_INC= \
+ OSNAME=${osname} \
+ OPT="${CFLAGS}" \
+ BUILD_ULUSBD=$(use usb && echo yes || echo no) \
+ $(use minimal && echo egd-linux)
+}
+
+src_install() {
+ exeinto /usr/libexec
+ newexe host/egd-linux ekey-egd-linux
+ newman host/egd-linux.8 ekey-egd-linux.8
+
+ newconfd "${FILESDIR}"/ekey-egd-linux.conf.2 ekey-egd-linux
+ newinitd "${FILESDIR}"/ekey-egd-linux.init.2 ekey-egd-linux
+
+ dodoc doc/* AUTHORS ChangeLog THANKS
+
+ use minimal && return
+ # from here on, install everything that is not part of the minimal
+ # support.
+
+ emake -C host \
+ DESTDIR="${D}" \
+ MANZCMD=cat MANZEXT= \
+ install-ekeyd $(use usb && echo install-ekey-ulusbd)
+
+ # We move the daemons around to avoid polluting the available
+ # commands.
+ dodir /usr/libexec
+ mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
+
+ newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
+
+ if use usb && ! use kernel_linux; then
+ newinitd "${FILESDIR}"/ekey-ulusbd.init.2 ekey-ulusbd
+ newconfd "${FILESDIR}"/ekey-ulusbd.conf.2 ekey-ulusbd
+ fi
+
+ if use kernel_linux; then
+ local rules=udev/fedora15/60-entropykey.rules
+ use usb && rules=udev/fedora15/60-entropykey-uds.rules
+
+ udev_newrules ${rules} 70-${PN}.rules
+
+ exeinto "$(get_udevdir)"
+ doexe udev/entropykey.sh
+ fi
+
+ if use munin; then
+ exeinto /usr/libexec/munin/plugins
+ doexe munin/ekeyd_stat_
+
+ insinto /etc/munin/plugin-conf.d
+ newins munin/plugin-conf.d_ekeyd ekeyd
+ fi
+}
+
+pkg_postinst() {
+ elog "${CATEGORY}/${PN} now install also the EGD client service ekey-egd-linux."
+ elog "To use this service, you need enable EGDTCPSocket for the ekeyd service"
+ elog "managing the key(s)."
+ elog ""
+ elog "The daemon will send more entropy to the kernel once the available pool"
+ elog "falls below the value set in the kernel.random.write_wakeup_threshold"
+ elog "sysctl entry."
+ elog ""
+ ewarn "Since version 1.1.4-r1, ekey-egd-linux will *not* set the watermark for"
+ ewarn "you, instead you'll have to configure the sysctl in /etc/sysctl.conf"
+
+ use minimal && return
+ # from here on, document everything that is not part of the minimal
+ # support.
+
+ elog ""
+ elog "To make use of your EntropyKey, make sure to execute ekey-rekey"
+ elog "the first time, and then start the ekeyd service."
+ elog ""
+ elog "By default ekeyd will feed the entropy directly to the kernel's pool;"
+ elog "if your system has jumps in load average, you might prefer using the"
+ elog "EGD compatibility mode, by enabling EGDTCPSocket for ekeyd and then"
+ elog "starting the ekey-egd-linux service."
+ elog ""
+ elog "The same applies if you intend to provide entropy for multiple hosts"
+ elog "over the network. If you want to have the ekey-egd-linux service on"
+ elog "other hosts, you can enable the 'minimal' USE flag."
+ elog ""
+ elog "The service supports multiplexing if you wish to use multiple"
+ elog "keys, just symlink /etc/init.d/ekeyd → /etc/init.d/ekeyd.identifier"
+ elog "and it'll be looking for /etc/entropykey/identifier.conf"
+ elog ""
+
+ if use usb; then
+ if use kernel_linux; then
+ elog "You're going to use the userland USB daemon, the udev rules"
+ elog "will be used accordingly. If you want to use the CDC driver"
+ elog "please disable the usb USE flag."
+ else
+ elog "You're going to use the userland USB daemon, since your OS"
+ elog "does not support udev, you should start the ekey-ulusbd"
+ elog "service before ekeyd."
+ fi
+
+ ewarn "The userland USB daemon has multiple known issues. If you can,"
+ ewarn "please consider disabling the 'usb' USE flag and instead use the"
+ ewarn "CDC-ACM access method."
+ else
+ if use kernel_linux; then
+ elog "Some versions of Linux have a faulty CDC ACM driver that stops"
+ elog "EntropyKey from working properly; please check the compatibility"
+ elog "table at http://www.entropykey.co.uk/download/"
+ else
+ elog "Make sure your operating system supports the CDC ACM driver"
+ elog "or otherwise you won't be able to use the EntropyKey."
+ fi
+ elog ""
+ elog "If you're unsure about the working state of the CDC ACM driver"
+ elog "enable the usb USE flag and use the userland USB daemon"
+ fi
+}
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5.ebuild
new file mode 100644
index 000000000000..241b2f756baf
--- /dev/null
+++ b/app-crypt/ekeyd/ekeyd-1.1.5.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils multilib linux-info toolchain-funcs udev systemd
+
+DESCRIPTION="Entropy Key userspace daemon"
+HOMEPAGE="http://www.entropykey.co.uk/"
+SRC_URI="mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_${PV}.orig.tar.gz"
+
+LICENSE="MIT GPL-2" # GPL-2 (only) for init script
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kernel_linux munin minimal"
+REQUIRED_USE="minimal? ( !munin )"
+
+EKEYD_RDEPEND="dev-lang/lua"
+EKEYD_DEPEND="${EKEYD_RDEPEND}"
+EKEYD_RDEPEND="${EKEYD_RDEPEND}
+ dev-lua/luasocket
+ kernel_linux? ( virtual/udev )
+ munin? ( net-analyzer/munin )"
+
+RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
+ !app-crypt/ekey-egd-linux
+ sys-apps/openrc"
+DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
+
+CONFIG_CHECK="~USB_ACM"
+
+pkg_setup() {
+ if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-const_char_usage.patch";
+ epatch "${FILESDIR}/${P}-enoent.patch";
+ epatch "${FILESDIR}/${P}-path-fixes.patch";
+ epatch "${FILESDIR}/${P}-udev-rule.patch";
+ epatch "${FILESDIR}/${P}-remove-werror.patch";
+ epatch "${FILESDIR}/${P}-misc.patch";
+}
+
+src_compile() {
+ local osname
+
+ # Override automatic detection: upstream provides this with uname,
+ # we don't like using uname.
+ case ${CHOST} in
+ *-linux-*)
+ osname=linux;;
+ *-freebsd*)
+ osname=freebsd;;
+ *-kfrebsd-gnu)
+ osname=gnukfreebsd;;
+ *-openbsd*)
+ osname=openbsd;;
+ *)
+ die "Unsupported operating system!"
+ ;;
+ esac
+
+ # We don't slot LUA so we don't really need to have the variables
+ # set at all.
+ emake -C host \
+ CC="$(tc-getCC)" \
+ LUA_V= LUA_INC= \
+ OSNAME=${osname} \
+ OPT="${CFLAGS}" \
+ BUILD_ULUSBD=no \
+ $(use minimal && echo egd-linux)
+}
+
+src_install() {
+ exeinto /usr/libexec
+ newexe host/egd-linux ekey-egd-linux
+ newman host/egd-linux.8 ekey-egd-linux.8
+
+ newconfd "${FILESDIR}"/ekey-egd-linux.conf.2 ekey-egd-linux
+ newinitd "${FILESDIR}"/ekey-egd-linux.init.2 ekey-egd-linux
+
+ dodoc doc/* AUTHORS ChangeLog THANKS
+
+ use minimal && return
+ # from here on, install everything that is not part of the minimal
+ # support.
+
+ emake -C host \
+ DESTDIR="${D}" \
+ MANZCMD=cat MANZEXT= \
+ install-ekeyd
+
+ # We move the daemons around to avoid polluting the available
+ # commands.
+ dodir /usr/libexec
+ mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
+
+ systemd_dounit "${FILESDIR}/ekeyd.service"
+
+ newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
+
+ if use kernel_linux; then
+ local rules="${FILESDIR}/90-ekeyd.rules"
+ udev_newrules ${rules} 90-${PN}.rules
+ fi
+
+ if use munin; then
+ exeinto /usr/libexec/munin/plugins
+ doexe munin/ekeyd_stat_
+
+ insinto /etc/munin/plugin-conf.d
+ newins munin/plugin-conf.d_ekeyd ekeyd
+ fi
+}
+
+pkg_postinst() {
+ elog "${CATEGORY}/${PN} now install also the EGD client service ekey-egd-linux."
+ elog "To use this service, you need enable EGDTCPSocket for the ekeyd service"
+ elog "managing the key(s)."
+ elog ""
+ elog "The daemon will send more entropy to the kernel once the available pool"
+ elog "falls below the value set in the kernel.random.write_wakeup_threshold"
+ elog "sysctl entry."
+ elog ""
+ ewarn "Since version 1.1.4-r1, ekey-egd-linux will *not* set the watermark for"
+ ewarn "you, instead you'll have to configure the sysctl in /etc/sysctl.conf"
+
+ use minimal && return
+ # from here on, document everything that is not part of the minimal
+ # support.
+
+ elog ""
+ elog "To make use of your EntropyKey, make sure to execute ekey-rekey"
+ elog "the first time, and then start the ekeyd service."
+ elog ""
+ elog "By default ekeyd will feed the entropy directly to the kernel's pool;"
+ elog "if your system has jumps in load average, you might prefer using the"
+ elog "EGD compatibility mode, by enabling EGDTCPSocket for ekeyd and then"
+ elog "starting the ekey-egd-linux service."
+ elog ""
+ elog "The same applies if you intend to provide entropy for multiple hosts"
+ elog "over the network. If you want to have the ekey-egd-linux service on"
+ elog "other hosts, you can enable the 'minimal' USE flag."
+ elog ""
+ elog "The service supports multiplexing if you wish to use multiple"
+ elog "keys, just symlink /etc/init.d/ekeyd → /etc/init.d/ekeyd.identifier"
+ elog "and it'll be looking for /etc/entropykey/identifier.conf"
+ elog ""
+
+ if use kernel_linux; then
+ elog "Some versions of Linux have a faulty CDC ACM driver that stops"
+ elog "EntropyKey from working properly; please check the compatibility"
+ elog "table at http://www.entropykey.co.uk/download/"
+ else
+ elog "Make sure your operating system supports the CDC ACM driver"
+ elog "or otherwise you won't be able to use the EntropyKey."
+ fi
+ elog ""
+ elog "If you're unsure about the working state of the CDC ACM driver"
+ elog "enable the usb USE flag and use the userland USB daemon"
+}
diff --git a/app-crypt/ekeyd/files/90-ekeyd.rules b/app-crypt/ekeyd/files/90-ekeyd.rules
new file mode 100644
index 000000000000..2532ba852efc
--- /dev/null
+++ b/app-crypt/ekeyd/files/90-ekeyd.rules
@@ -0,0 +1,16 @@
+# Entropy key udev rules
+#
+# Centos/RHEL 6 rules for udev version 147
+#
+# These rules create devices under /dev/entropykey/<serialnumber>
+#
+# Copyright 2011-2014 Simtec Electronics
+#
+# For licence terms refer to the COPYING file distributed with the source.
+
+ACTION=="add", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", SYMLINK+="entropykey/$env{ID_SERIAL_SHORT}"
+
+ACTION=="add", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", RUN+="/usr/sbin/ekeydctl add /dev/entropykey/$env{ID_SERIAL_SHORT}"
+
+ACTION=="remove", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", RUN+="/usr/sbin/ekeydctl remove $env{ID_SERIAL_SHORT}"
+
diff --git a/app-crypt/ekeyd/files/ekey-egd-linux.conf.2 b/app-crypt/ekeyd/files/ekey-egd-linux.conf.2
new file mode 100644
index 000000000000..8c0b089d94b5
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekey-egd-linux.conf.2
@@ -0,0 +1,10 @@
+# Configuration file for ekey-egd-linux
+
+# Hostname or IP address to connect to.
+#HOST="localhost"
+# Port number to connect to.
+#PORT="8888"
+# Time between reconnect attempts.
+#RECONNECTINTERVAL=10
+# Set the number of 1024 bit blocks to request each time
+#BLOCKS=2
diff --git a/app-crypt/ekeyd/files/ekey-egd-linux.init.2 b/app-crypt/ekeyd/files/ekey-egd-linux.init.2
new file mode 100644
index 000000000000..c843d19e1171
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekey-egd-linux.init.2
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+: ${HOST:=localhost}
+: ${PORT:=8888}
+: ${RECONNECTINTERVAL:=10}
+: ${BLOCKS:=2}
+
+description="EntropyKey EGD client"
+
+pidfile=/var/run/$SVCNAME.pid
+
+command=/usr/libexec/ekey-egd-linux
+command_args="-H ${HOST} -p ${PORT} -r ${RECONNECTINTERVAL} -b ${BLOCKS} -D ${pidfile}"
+
+depend() {
+ use net
+ after ekeyd
+
+ provide entropy
+}
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.conf.2 b/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
new file mode 100644
index 000000000000..eb12afc36a14
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
@@ -0,0 +1,17 @@
+# Copyright 2009-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# The userland USB daemon has to know the USB path of the EntopyKey to
+# work properly; in alternative to providing these statically, they
+# can be found by giving the serial of the key.
+#
+# The serial will also be used to set the default path to open the
+# socket to.
+
+EKEY_SERIAL=""
+#USB_BUS=""
+#USB_DEV=""
+
+# this is set by default
+# SOCKET_PATH="/var/run/ekey-ulusbd-${EKEY_SERIAL}"
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.init.2 b/app-crypt/ekeyd/files/ekey-ulusbd.init.2
new file mode 100644
index 000000000000..c448e8974de6
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekey-ulusbd.init.2
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 2009-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+INSTANCE="${SVCNAME#*.}"
+if [ -z "${INSTANCE}" -o "${SVCNAME}" = "ekey-ulusbd" ]; then
+ INSTANCE="ekey-ulusbd"
+fi
+
+: ${SOCKET_PATH:=/var/run/ekey-ulusbd-${EKEY_SERIAL}}
+
+description="EntropyKey Userland USB Daemon"
+
+pidfile=/var/run/$SVCNAME.pid
+command=/usr/libexec/ekey-ulusbd
+command_args="-P ${pidfile} -p ${SOCKET_PATH}"
+
+depend() {
+ need localmount
+}
+
+start() {
+ if [ -z ${USB_BUS} ]; then
+ set -- $(lsusb -v -d 20df:0001 | \
+ egrep '(^Bus|iSerial)' | \
+ grep -B1 "${EKEY_SERIAL}" | \
+ head -n 1 | \
+ cut -c 5-7,15-18)
+ USB_BUS=$1
+ USB_DEV=$2
+ fi
+
+ ebegin "Starting ${description}"
+ start-stop-daemon \
+ --start --pidfile ${pidfile} \
+ --exec ${command} -- \
+ ${command_args} \
+ -b $(printf %03d ${USB_BUS}) -d $(printf %03d ${USB_DEV}) -D
+ eend $?
+}
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch b/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch
new file mode 100644
index 000000000000..f1491362e83f
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch
@@ -0,0 +1,133 @@
+Index: ekeyd-1.1.4/host/ekeyd.c
+===================================================================
+--- ekeyd-1.1.4.orig/host/ekeyd.c
++++ ekeyd-1.1.4/host/ekeyd.c
+@@ -209,7 +209,7 @@ open_foldback_output(void)
+ return (output_stream != NULL);
+ }
+
+-static const char *usage=
++static const char usage[]=
+ "Usage: %s [-f <configfile>] [-p <pidfile>] [-v] [-h]\n"
+ "Entropy Key Daemon\n\n"
+ "\t-f Read configuration from configfile\n"
+Index: ekeyd-1.1.4/host/ekey-setkey.c
+===================================================================
+--- ekeyd-1.1.4.orig/host/ekey-setkey.c
++++ ekeyd-1.1.4/host/ekey-setkey.c
+@@ -79,7 +79,7 @@ calc_mac(uint8_t *snum, uint8_t *mkey, u
+ return mac;
+ }
+
+-static const char *usage =
++static const char usage[] =
+ "Usage: %s [-d] [-h] [-n] [-f <keyring>] [-m <master>]\n"
+ " [-s <serial>] <path>\n"
+ "Entropy key device long term session key tool\n\n"
+Index: ekeyd-1.1.4/host/ekey-ulusbd.c
+===================================================================
+--- ekeyd-1.1.4.orig/host/ekey-ulusbd.c
++++ ekeyd-1.1.4/host/ekey-ulusbd.c
+@@ -100,7 +100,8 @@ find_usb_device(char *busmatch, char *de
+
+ #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
+ if ((r = usb_detach_kernel_driver_np(devh, EKEY_IFACE)) != 0) {
+- if (r != -ENODATA) {
++ /* libusb_compat-0.1.3 mistakenly translate ENODATA to ENOENT */
++ if (r != -ENODATA && r != -ENOENT) {
+ fprintf(stderr,
+ "Unable to detach Entropy Key at %s/%s from kernel\n",
+ busmatch, devmatch);
+Index: ekeyd-1.1.4/udev/entropykey.sh
+===================================================================
+--- ekeyd-1.1.4.orig/udev/entropykey.sh
++++ ekeyd-1.1.4/udev/entropykey.sh
+@@ -19,9 +19,9 @@ wait_for_usb () {
+ COUNTER=$(( ${COUNTER} + 1 ))
+ test ${COUNTER} -ge 10 && exit 1
+ done
+- $BINPATH/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid -p/var/run/entropykeys/${ENTROPY_KEY_SERIAL} -D
++ /usr/libexec/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid -p/dev/entropykey/${ENTROPY_KEY_SERIAL} -D
+ sleep 1
+- $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++ $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+ exit 0
+ }
+
+@@ -34,18 +34,18 @@ else
+ if test "x${BUSNUM}" = "x" -o "x${DEVNUM}" = "x"; then
+ exit 0
+ fi
+- if test -r "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid"; then
+- kill $(cat "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid") || true
++ if test -r "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid"; then
++ kill $(< "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid") || true
+ fi
+- mkdir -p /var/run/entropykeys
++ mkdir -p /dev/entropykey /dev/.ekeyd-ulusb
+ wait_for_usb &
+ exit 0
+ fi
+ # Update ekeyd with device operation
+- $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++ $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+ if test "x$ACTION" = "xremove"; then
+- rm "/var/run/ekey-ulusbd-${ENTROPYKEY_KEY_SERIAL}.pid"
+- rm "/var/run/entropykeys/${ENTROPYKEY_KEY_SERIAL}"
++ rm "/dev/.ekey-ulusbd/${ENTROPYKEY_KEY_SERIAL}.pid"
++ rm "/dev/entropykey/${ENTROPYKEY_KEY_SERIAL}"
+ fi
+ fi
+
+Index: ekeyd-1.1.4/udev/fedora15/60-entropykey.rules
+===================================================================
+--- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey.rules
++++ ekeyd-1.1.4/udev/fedora15/60-entropykey.rules
+@@ -9,10 +9,10 @@
+ # For licence terms refer to the COPYING file distributed with the source.
+
+ # Detect an Entropy Key being inserted and add info values to environment
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
+
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
+
+ # Add the /dev/entropykey/<serialnumber> symbolic link
+ ENV{ENTROPY_KEY_SERIAL}!="", SYMLINK+="entropykey/$env{ENTROPY_KEY_SERIAL}"
+Index: ekeyd-1.1.4/udev/fedora15/60-entropykey-uds.rules
+===================================================================
+--- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey-uds.rules
++++ ekeyd-1.1.4/udev/fedora15/60-entropykey-uds.rules
+@@ -9,7 +9,7 @@
+ # For licence terms refer to the COPYING file.
+
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
++ACTION=="add|change|remove", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
+
+ # And tell the ekeyd about the device action.
+ ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/entropykey.sh"
+Index: ekeyd-1.1.4/host/Makefile
+===================================================================
+--- ekeyd-1.1.4.orig/host/Makefile
++++ ekeyd-1.1.4/host/Makefile
+@@ -107,7 +107,7 @@ OPT ?= -O2
+ CFLAGS += $(INCLUDES)
+ CFLAGS += -g -Wall $(OPT)
+ CFLAGS += -fno-strict-aliasing
+-CFLAGS += -std=c99 -Wall -pedantic -Wshadow -Werror -D_GNU_SOURCE
++CFLAGS += -std=c99 -Wall -pedantic -Wshadow -D_GNU_SOURCE
+ CFLAGS += '-DCONFIGFILE="$(SYSCONFPREFIX)/ekeyd.conf"'
+ CFLAGS += '-DPIDFILE="$(RUNTIMEPREFIX)/ekeyd.pid"'
+ CFLAGS += '-DKEYRINGFILE="$(SYSCONFPREFIX)/keyring"'
+@@ -148,7 +148,7 @@ daemonise_ulusbd.o: daemonise.c
+ $(COMPILE.c) $(OUTPUT_OPTION) $(PTHFLAGS) $^
+
+ egd-linux: egd-linux.o daemonise.o
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+
+ ekeyd: ekeyd.o daemonise.o lstate.o connection.o stream.o frame.o packet.o keydb.o util.o fds.o krnlop.o foldback.o stats.o nonce.o ../device/frames/pem.o ../device/skeinwrap.o ../device/skein/skein.o ../device/skein/skein_block.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch
new file mode 100644
index 000000000000..81ad8e6a5337
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User kristianf
+# Date 1382916823 -3600
+# Mon Oct 28 00:33:43 2013 +0100
+# Node ID 0d99149615ec5ec70a6d03c685291ddc55babff6
+# Parent fd192324ff9ae4c4c92cdb9c27f5ae100da136a6
+Rewrite static const char *usage
+
+diff -r fd192324ff9a -r 0d99149615ec host/ekey-setkey.c
+--- a/host/ekey-setkey.c Mon Oct 28 00:31:59 2013 +0100
++++ b/host/ekey-setkey.c Mon Oct 28 00:33:43 2013 +0100
+@@ -79,7 +79,7 @@
+ return mac;
+ }
+
+-static const char *usage =
++static const char usage[] =
+ "This is a low level tool. You probably wanted to use ekey-rekey instead.\n\n"
+ "Usage: %s [-d] [-h] [-n] [-f <keyring>] [-m <master>]\n"
+ " [-s <serial>] <path>\n"
+diff -r fd192324ff9a -r 0d99149615ec host/ekeyd.c
+--- a/host/ekeyd.c Mon Oct 28 00:31:59 2013 +0100
++++ b/host/ekeyd.c Mon Oct 28 00:33:43 2013 +0100
+@@ -209,7 +209,7 @@
+ return (output_stream != NULL);
+ }
+
+-static const char *usage=
++static const char usage[] =
+ "Usage: %s [-f <configfile>] [-p <pidfile>] [-v] [-h]\n"
+ "Entropy Key Daemon\n\n"
+ "\t-f Read configuration from configfile\n"
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch
new file mode 100644
index 000000000000..2d4cccbafafa
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User kristianf
+# Date 1382916946 -3600
+# Mon Oct 28 00:35:46 2013 +0100
+# Node ID 0a9e41a05aafb98cc8c21562931cb1cbb5e30c1f
+# Parent 0d99149615ec5ec70a6d03c685291ddc55babff6
+libusb_compat
+
+diff -r 0d99149615ec -r 0a9e41a05aaf host/ekey-ulusbd.c
+--- a/host/ekey-ulusbd.c Mon Oct 28 00:33:43 2013 +0100
++++ b/host/ekey-ulusbd.c Mon Oct 28 00:35:46 2013 +0100
+@@ -100,8 +100,9 @@
+
+ #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
+ if ((r = usb_detach_kernel_driver_np(devh, EKEY_IFACE)) != 0) {
+- if (r != -ENODATA) {
+- fprintf(stderr,
++ /* libusb_compat-0.1.3 mistakenly translate ENODATA to ENOENT */
++ if (r != -ENODATA && r != -ENOENT) {
++ fprintf(stderr,
+ "Unable to detach Entropy Key at %s/%s from kernel\n",
+ busmatch, devmatch);
+ usb_close(devh);
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch
new file mode 100644
index 000000000000..660f0bacf0ac
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch
@@ -0,0 +1,50 @@
+diff -r 724cf5abf164 host/Makefile
+--- a/host/Makefile Mon Oct 28 00:43:49 2013 +0100
++++ b/host/Makefile Mon Oct 28 00:54:01 2013 +0100
+@@ -19,7 +19,7 @@
+ RM ?= rm -f
+ LUA_V ?= 5.1
+ EXTRA_INC ?=
+-LUA_INC ?= -I/usr/include/lua5.1
++LUA_INC ?= -I/usr/include
+ LIBDL ?= -ldl
+ PTHFLAGS ?=
+ PTHLIBS ?= -lpthread
+@@ -31,7 +31,7 @@
+ MANZEXT := .gz
+
+ # Current tool version as returned from tools
+-EKEYD_VERSION_S="1.1.4"
++EKEYD_VERSION_S="1.1.5"
+
+ # Attempt to detect an OS and set build options as appropriate
+ OSNAME=$(shell uname -s | tr A-Z a-z | tr -d /)
+@@ -91,10 +91,7 @@
+ override MANZCMD:=cat
+ override MANZEXT:=
+ endif
+-override LUA_INC:=-I/usr/local/include/lua51
+ override LIBDL:=
+-LIBDIRS += -L/usr/local/lib
+-INCLUDES += -I/usr/local/include
+ endif
+ endif
+ endif
+@@ -114,7 +111,7 @@
+ CFLAGS += '-DEKEYD_VERSION_S=""$(EKEYD_VERSION_S)""'
+ CFLAGS += $(EXTRA_CFLAGS)
+
+-LIBS += -llua$(LUA_V) -lm $(LIBDL)
++LIBS += -llua -lm $(LIBDL)
+ LDFLAGS += $(LIBDIRS)
+
+
+@@ -157,7 +154,7 @@
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+
+ control.inc: bin2c.lua control.lua
+- lua$(LUA_V) bin2c.lua +control.lua result > control.inc.new
++ lua bin2c.lua +control.lua result > control.inc.new
+ mv control.inc.new control.inc
+
+ lstate.o: lstate.c control.inc
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch
new file mode 100644
index 000000000000..0a9a59186d1d
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch
@@ -0,0 +1,49 @@
+# HG changeset patch
+# User kristianf
+# Date 1382917171 -3600
+# Mon Oct 28 00:39:31 2013 +0100
+# Node ID d96c42b36cb125e6e52cff623b7bdad1910284b4
+# Parent 0a9e41a05aafb98cc8c21562931cb1cbb5e30c1f
+entropykey.sh
+
+diff -r 0a9e41a05aaf -r d96c42b36cb1 udev/entropykey.sh
+--- a/udev/entropykey.sh Mon Oct 28 00:35:46 2013 +0100
++++ b/udev/entropykey.sh Mon Oct 28 00:39:31 2013 +0100
+@@ -19,9 +19,10 @@
+ COUNTER=$(( ${COUNTER} + 1 ))
+ test ${COUNTER} -ge 10 && exit 1
+ done
+- $BINPATH/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid -p/var/run/entropykeys/${ENTROPY_KEY_SERIAL} -D
++ /usr/libexec/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid -p/dev/entropykey/${ENTROPY_KEY_SERIAL} -D
++
+ sleep 1
+- $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++ $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+ exit 0
+ }
+
+@@ -34,18 +35,18 @@
+ if test "x${BUSNUM}" = "x" -o "x${DEVNUM}" = "x"; then
+ exit 0
+ fi
+- if test -r "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid"; then
+- kill $(cat "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid") || true
++ if test -r "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid"; then
++ kill $(< "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid") || true
+ fi
+- mkdir -p /var/run/entropykeys
++ mkdir -p /dev/entropykey /dev/.ekeyd-ulusb
+ wait_for_usb &
+ exit 0
+ fi
+ # Update ekeyd with device operation
+- $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++ $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+ if test "x$ACTION" = "xremove"; then
+- rm "/var/run/ekey-ulusbd-${ENTROPYKEY_KEY_SERIAL}.pid"
+- rm "/var/run/entropykeys/${ENTROPYKEY_KEY_SERIAL}"
++ rm "/dev/.ekey-ulusbd/${ENTROPYKEY_KEY_SERIAL}.pid"
++ rm "/dev/entropykey/${ENTROPYKEY_KEY_SERIAL}"
+ fi
+ fi
+
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch
new file mode 100644
index 000000000000..bb5862dee986
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User kristianf
+# Date 1382917429 -3600
+# Mon Oct 28 00:43:49 2013 +0100
+# Node ID 724cf5abf164dd5889a7c72916aa524c3822b8bd
+# Parent 902b9c6908618864319835d69981f9ea902be324
+Makefile
+
+diff -r 902b9c690861 -r 724cf5abf164 host/Makefile
+--- a/host/Makefile Mon Oct 28 00:41:59 2013 +0100
++++ b/host/Makefile Mon Oct 28 00:43:49 2013 +0100
+@@ -107,7 +107,7 @@
+ CFLAGS += $(INCLUDES)
+ CFLAGS += -g -Wall $(OPT)
+ CFLAGS += -fno-strict-aliasing
+-CFLAGS += -std=c99 -Wall -pedantic -Wshadow -Werror -D_GNU_SOURCE
++CFLAGS += -std=c99 -Wall -pedantic -Wshadow -D_GNU_SOURCE
+ CFLAGS += '-DCONFIGFILE="$(SYSCONFPREFIX)/ekeyd.conf"'
+ CFLAGS += '-DPIDFILE="$(RUNTIMEPREFIX)/ekeyd.pid"'
+ CFLAGS += '-DKEYRINGFILE="$(SYSCONFPREFIX)/keyring"'
+@@ -148,7 +148,7 @@
+ $(COMPILE.c) $(OUTPUT_OPTION) $(PTHFLAGS) $^
+
+ egd-linux: egd-linux.o daemonise.o
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+
+ ekeyd: ekeyd.o daemonise.o lstate.o connection.o stream.o frame.o packet.o keydb.o util.o fds.o krnlop.o foldback.o stats.o nonce.o ../device/frames/pem.o ../device/skeinwrap.o ../device/skein/skein.o ../device/skein/skein_block.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch
new file mode 100644
index 000000000000..c4b53a802bf6
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User kristianf
+# Date 1382917319 -3600
+# Mon Oct 28 00:41:59 2013 +0100
+# Node ID 902b9c6908618864319835d69981f9ea902be324
+# Parent d96c42b36cb125e6e52cff623b7bdad1910284b4
+udev rule
+
+diff -r d96c42b36cb1 -r 902b9c690861 udev/fedora15/60-entropykey-uds.rules
+--- a/udev/fedora15/60-entropykey-uds.rules Mon Oct 28 00:39:31 2013 +0100
++++ b/udev/fedora15/60-entropykey-uds.rules Mon Oct 28 00:41:59 2013 +0100
+@@ -9,7 +9,7 @@
+ # For licence terms refer to the COPYING file.
+
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
++ACTION=="add|change|remove", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c /bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
+
+ # And tell the ekeyd about the device action.
+ ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/entropykey.sh"
+diff -r d96c42b36cb1 -r 902b9c690861 udev/fedora15/60-entropykey.rules
+--- a/udev/fedora15/60-entropykey.rules Mon Oct 28 00:39:31 2013 +0100
++++ b/udev/fedora15/60-entropykey.rules Mon Oct 28 00:41:59 2013 +0100
+@@ -9,10 +9,10 @@
+ # For licence terms refer to the COPYING file distributed with the source.
+
+ # Detect an Entropy Key being inserted and add info values to environment
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{builtin}="usb_id"
+
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c /bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
+
+ # Add the /dev/entropykey/<serialnumber> symbolic link
+ ENV{ENTROPY_KEY_SERIAL}!="", SYMLINK+="entropykey/$env{ENTROPY_KEY_SERIAL}"
diff --git a/app-crypt/ekeyd/files/ekeyd.init.2 b/app-crypt/ekeyd/files/ekeyd.init.2
new file mode 100644
index 000000000000..27ef7a11e46b
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd.init.2
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+INSTANCE="${SVCNAME#*.}"
+if [ -z "${INSTANCE}" -o "${SVCNAME}" = "ekeyd" ]; then
+ INSTANCE="ekeyd"
+fi
+
+description="EntropyKey daemon"
+
+pidfile=/var/run/$SVCNAME.pid
+cfgfile=/etc/entropykey/${INSTANCE}.conf
+
+command=/usr/libexec/ekeyd
+command_args="-f ${cfgfile} -p ${pidfile}"
+
+depend() {
+ config $cfgfile
+
+ use udev ekey-ulusbd
+ need localmount
+
+ # quickly parse the configuration file; we only provide entropy
+ # if we're not using the egd server/client split method.
+ if sed -e 's:--.*::' "${cfgfile}" | grep -q SetOutputToKernel; then
+ provide entropy
+ fi
+}
diff --git a/app-crypt/ekeyd/files/ekeyd.service b/app-crypt/ekeyd/files/ekeyd.service
new file mode 100644
index 000000000000..637b424b703d
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Entropy key daemon
+
+[Service]
+ExecStart=/usr/libexec/ekeyd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-crypt/ekeyd/metadata.xml b/app-crypt/ekeyd/metadata.xml
new file mode 100644
index 000000000000..11e009a9ee5d
--- /dev/null
+++ b/app-crypt/ekeyd/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>k_f@gentoo.org</email>
+ <name>Kristian Fiskerstrand</name>
+ </maintainer>
+ <use>
+ <flag name='usb'>
+ Build the libusb-based userland daemon for accessing the
+ EntropyKey (alternative to the CDC USB driver). It is suggested
+ to use this option by default, as the CDC driver in the kernel
+ often seems to be fragile (or the gadget implementation on the
+ EntropyKey is too buggy), and can cause various problems.
+ </flag>
+
+ <flag name='munin'>
+ Install a plugin for <pkg>net-analyzer/munin</pkg> to graph
+ statistical data from ekeyd.
+ </flag>
+
+ <flag name='minimal'>
+ Only install the ekey-egd-linux service rather than the full
+ ekeyd package.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/app-crypt/elettra/Manifest b/app-crypt/elettra/Manifest
new file mode 100644
index 000000000000..6a69e18915bd
--- /dev/null
+++ b/app-crypt/elettra/Manifest
@@ -0,0 +1 @@
+DIST elettra-src-1.0.tar.gz 16102 SHA256 fb0c4e3f624c02a613e34abbf7bc03d8fc0d43b4967c2b51b202d7201d95e05b SHA512 341a83436d9c163391eabbc06600b29e8ee837bb805f2f9ea922ffa8d8dcb9ec53e50ae475e13e2810ac69419b86072cd7e6c44d13c80e43ee67071e6864d5b3 WHIRLPOOL a5aff8c548c71181686b8724c4b2080b3b42b151747573c89cbd82579e8ad5a527204ceb24f04c39fd6f53387702410b9e6edf59968d2f563e94c2f4ead09827
diff --git a/app-crypt/elettra/elettra-1.0.ebuild b/app-crypt/elettra/elettra-1.0.ebuild
new file mode 100644
index 000000000000..456371a5c468
--- /dev/null
+++ b/app-crypt/elettra/elettra-1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+MY_P="${PN}-src-${PV}"
+
+DESCRIPTION="Plausible deniable file cryptography"
+HOMEPAGE="http://www.winstonsmith.info/julia/elettra/"
+SRC_URI="http://www.winstonsmith.info/julia/elettra/${MY_P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+ app-crypt/mhash
+ dev-libs/libmcrypt"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+ $(tc-getCC) ${CFLAGS} ${LDFLAGS} -I. src/*.c \
+ -lz `libmcrypt-config --cflags --libs` -lmhash \
+ -o elettra || die "compilation failed"
+}
+
+src_install() {
+ dobin elettra || die "dobin failed"
+ dodoc README || die "dodoc failed"
+}
diff --git a/app-crypt/elettra/metadata.xml b/app-crypt/elettra/metadata.xml
new file mode 100644
index 000000000000..6eb35690d41d
--- /dev/null
+++ b/app-crypt/elettra/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>lu_zero@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/etcd-ca/Manifest b/app-crypt/etcd-ca/Manifest
new file mode 100644
index 000000000000..ba22e275652e
--- /dev/null
+++ b/app-crypt/etcd-ca/Manifest
@@ -0,0 +1,2 @@
+DIST etcd-ca-0_p20140903.zip 1178338 SHA256 5da9f7afad6dd373d96c5d36dd30e9f43cfc8fc2359bbf2d0c6a864fff139f81 SHA512 f421be2c835e7ed701f698d8a48cf25fe011ba3a831ff8fa3a80f5f074f6b70fed7f71d64c488cce5e12af8b8ae29685a1b19f8f2cd487954019d483d90f5e1c WHIRLPOOL 8f1db212877eb522818a96b45e21946e27fac716acfe924ea45c0b8f20b253905eccfeffa1fdf47c582f6cc8866da812462cd71e2ddc6c5abc969f71737cf749
+DIST etcd-ca-0_p20150423.tar.gz 55031 SHA256 53e5083db3bee32a991a118be0386bfeadafc3173a707941c3a12284a7f97abc SHA512 8c7ecb80e056da77997283ff2defb6df9a9acef250b0fac8e18c2bca71cccfedf6d782b7c9bf6491574d88ac5fa358f9bc5f540aa718a2470655d75f2f54fff4 WHIRLPOOL 3f7b5a77787f6ed6474fb01bfcf02d394616d609d8cb815086b730499eb7293c9125c09abfa4a10a2c6ca375176a82d75fb3fe304fc1f9f53385f9b552ebff12
diff --git a/app-crypt/etcd-ca/etcd-ca-0_p20140903.ebuild b/app-crypt/etcd-ca/etcd-ca-0_p20140903.ebuild
new file mode 100644
index 000000000000..4c2eed67060f
--- /dev/null
+++ b/app-crypt/etcd-ca/etcd-ca-0_p20140903.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+DESCRIPTION="A simple certificate manager written in Go. Easy to use with limited capability"
+HOMEPAGE="https://github.com/coreos/etcd-ca"
+EGIT_COMMIT="812f3626796be16d9db052720ce9c54f5a40bb26"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${P}.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.2"
+RDEPEND=""
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_prepare() {
+ sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
+ -i build || die
+}
+
+src_compile() {
+ CGO_CFLAGS="${CFLAGS}" ./build || die
+}
+
+# go tool: no such tool "cover"; to install:
+# go get code.google.com/p/go.tools/cmd/cover
+#src_test() {
+# ./test || die
+#}
+
+src_install() {
+ dobin "${S}"/bin/${PN}
+ dodoc README.md
+ use doc && dodoc -r Documentation
+}
diff --git a/app-crypt/etcd-ca/etcd-ca-0_p20150423-r1.ebuild b/app-crypt/etcd-ca/etcd-ca-0_p20150423-r1.ebuild
new file mode 100644
index 000000000000..3209ff0718fd
--- /dev/null
+++ b/app-crypt/etcd-ca/etcd-ca-0_p20150423-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+DESCRIPTION="A simple certificate manager written in Go. Easy to use with limited capability"
+HOMEPAGE="https://github.com/coreos/etcd-ca"
+EGIT_COMMIT="31fef42f75294cf8bf1e7facf82648de0c2d87a3"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.2:="
+RDEPEND=""
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_prepare() {
+ sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
+ -i build || die
+}
+
+src_compile() {
+ CGO_CFLAGS="${CFLAGS}" ./build || die
+}
+
+# go tool: no such tool "cover"; to install:
+# go get code.google.com/p/go.tools/cmd/cover
+#src_test() {
+# ./test || die
+#}
+
+src_install() {
+ dobin "${S}"/bin/${PN}
+ dodoc README.md
+ use doc && dodoc -r Documentation
+}
diff --git a/app-crypt/etcd-ca/etcd-ca-0_p20150423.ebuild b/app-crypt/etcd-ca/etcd-ca-0_p20150423.ebuild
new file mode 100644
index 000000000000..78d825dc4f87
--- /dev/null
+++ b/app-crypt/etcd-ca/etcd-ca-0_p20150423.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+DESCRIPTION="A simple certificate manager written in Go. Easy to use with limited capability"
+HOMEPAGE="https://github.com/coreos/etcd-ca"
+EGIT_COMMIT="31fef42f75294cf8bf1e7facf82648de0c2d87a3"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.2"
+RDEPEND=""
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_prepare() {
+ sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
+ -i build || die
+}
+
+src_compile() {
+ CGO_CFLAGS="${CFLAGS}" ./build || die
+}
+
+# go tool: no such tool "cover"; to install:
+# go get code.google.com/p/go.tools/cmd/cover
+#src_test() {
+# ./test || die
+#}
+
+src_install() {
+ dobin "${S}"/bin/${PN}
+ dodoc README.md
+ use doc && dodoc -r Documentation
+}
diff --git a/app-crypt/etcd-ca/metadata.xml b/app-crypt/etcd-ca/metadata.xml
new file mode 100644
index 000000000000..6a37ab4bc329
--- /dev/null
+++ b/app-crypt/etcd-ca/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <bugs-to>https://github.com/coreos/etcd-ca/issues</bugs-to>
+ <changelog>https://github.com/coreos/etcd-ca/commits/master</changelog>
+ <doc>https://github.com/coreos/etcd-ca/blob/master/README.md</doc>
+ <remote-id type="github">coreos/etcd-ca</remote-id>
+ </upstream>
+ <maintainer>
+ <email>zmedico@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/fcrackzip/Manifest b/app-crypt/fcrackzip/Manifest
new file mode 100644
index 000000000000..8c30c1ae42bb
--- /dev/null
+++ b/app-crypt/fcrackzip/Manifest
@@ -0,0 +1 @@
+DIST fcrackzip-1.0.tar.gz 114786 SHA256 4a58c8cb98177514ba17ee30d28d4927918bf0bdc3c94d260adfee44d2d43850 SHA512 c18d45b5a4ec46411d455a0c10cb9faa7a1060a48936a820fff9b1f8af7f7158ac09da44d39673e4bdfaf0f370ee425e8df0a0dbe98a2a930049ecc2a1419048 WHIRLPOOL fa86ec55174bd04aebca3bb5cfc6b70482ed4b9fef4fd9f4fb80ecaf7a16b8bbd99bb39501e587dc9477999b5db695620dc0b365566eade8bf7756a943a2a623
diff --git a/app-crypt/fcrackzip/fcrackzip-1.0.ebuild b/app-crypt/fcrackzip/fcrackzip-1.0.ebuild
new file mode 100644
index 000000000000..daf6b31422c1
--- /dev/null
+++ b/app-crypt/fcrackzip/fcrackzip-1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+DESCRIPTION="a zip password cracker"
+HOMEPAGE="http://oldhome.schmorp.de/marc/fcrackzip.html"
+SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/unzip"
+DEPEND=""
+
+src_prepare() {
+ sed -i -e '/funroll/d' configure || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ mv -vf "${D}"/usr/bin/{zipinfo,fcrack-zipinfo} || die
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/app-crypt/fcrackzip/metadata.xml b/app-crypt/fcrackzip/metadata.xml
new file mode 100644
index 000000000000..2381b9de7c87
--- /dev/null
+++ b/app-crypt/fcrackzip/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <maintainer>
+ <email>ssuominen@gentoo.org</email>
+ <name>Samuli Suominen</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
new file mode 100644
index 000000000000..21d53ace7647
--- /dev/null
+++ b/app-crypt/gcr/Manifest
@@ -0,0 +1,3 @@
+DIST gcr-3.12.2.tar.xz 1331884 SHA256 456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c SHA512 7c74302a4485e6909e39721b0beeeeb5920d218c4e8ab5a1878be33457f2b6d59df165bf2e6b606efc8275b8e45dffe8d28ac202cf835f7f2483237258a4d6b2 WHIRLPOOL 9655f1997ececce77f1b179f89798b5b9363ea94e0f2024772575ca05d88dd3b15432c1e0d69095b020726bc0fab1df023dfd6cc975488360f90e43fd9069a8c
+DIST gcr-3.14.0.tar.xz 1340764 SHA256 2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d SHA512 2538b2575c0d325587f8b5423ac6f9c522a69b415977398dc5c4330ce1de896c966e541eb6e536e87e81013bb2dedea4d0ae8baabdab9318db5b97e0977671b8 WHIRLPOOL 755842ad30608162bb81ed58a027a26be6d12ecb12e037b826841612c2481ea564f727e2bc4e03f13f8100257b2d2ee3dae213b56b5f04319718ff30c5eee2a9
+DIST gcr-3.16.0.tar.xz 1335348 SHA256 ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075 SHA512 1db6e2532d2d0ceb6f339551b009baae5815fcf8a12b76b0eb9e13f301d1205c2e2c9b8f555ae011a84521e55fe9cccb703c3dd539d638b476e0474c34672be4 WHIRLPOOL 88a0d5936b6dd54923fd476f3af0acac9c068268416cb30c65670ae8bf8bec3940cdee84e72e6218c3cf9e59a023508e5961357b2e80a297428e573cddc6bd7b
diff --git a/app-crypt/gcr/files/gcr-3.14.0-race-building.patch b/app-crypt/gcr/files/gcr-3.14.0-race-building.patch
new file mode 100644
index 000000000000..b387f34cfdad
--- /dev/null
+++ b/app-crypt/gcr/files/gcr-3.14.0-race-building.patch
@@ -0,0 +1,29 @@
+From 58de2d787a31175b26687b9a228da0fb1cea5809 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Mon, 29 Sep 2014 20:28:00 +0000
+Subject: gcr: Fix race building gdbus-codegen header and source
+
+https://bugzilla.gnome.org/show_bug.cgi?id=737622
+
+diff --git a/gcr/Makefile.am b/gcr/Makefile.am
+index 0834c67..59f32b7 100644
+--- a/gcr/Makefile.am
++++ b/gcr/Makefile.am
+@@ -161,12 +161,12 @@ gcr/gcr-dbus-generated.c: $(DBUS_XML_DEFINITIONS)
+ $(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
+ gcr/gcr-dbus-generated.c > gcr/gcr-dbus-generated.c.tmp && \
+ mv gcr/gcr-dbus-generated.c.tmp gcr/gcr-dbus-generated.c
+-
+-gcr/gcr-dbus-generated.h: gcr/gcr-dbus-generated.c
+ $(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
+ gcr/gcr-dbus-generated.h > gcr/gcr-dbus-generated.h.tmp && \
+ mv gcr/gcr-dbus-generated.h.tmp gcr/gcr-dbus-generated.h
+
++gcr/gcr-dbus-generated.h: gcr/gcr-dbus-generated.c
++
+ pkgconfig_DATA += \
+ gcr-base-$(GCR_MAJOR).pc
+
+--
+cgit v0.10.1
+
diff --git a/app-crypt/gcr/gcr-3.12.2.ebuild b/app-crypt/gcr/gcr-3.12.2.ebuild
new file mode 100644
index 000000000000..798cc5f846b7
--- /dev/null
+++ b/app-crypt/gcr/gcr-3.12.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://developer.gnome.org/gcr/"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-3
+IUSE="debug gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+ >=app-crypt/gnupg-2
+ >=app-crypt/p11-kit-0.19
+ >=dev-libs/glib-2.34:2
+ >=dev-libs/libgcrypt-1.2.2:0=
+ >=dev-libs/libtasn1-1:=
+ >=sys-apps/dbus-1
+ gtk? ( >=x11-libs/gtk+-3:3[X,introspection?] )
+ introspection? ( >=dev-libs/gobject-introspection-1.34 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gnome-keyring-3.3
+"
+# gcr was part of gnome-keyring until 3.3
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dev-libs/gobject-introspection-common
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+# eautoreconf needs:
+# dev-libs/gobject-introspection-common
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Disable stupid flag changes
+ sed -e 's/CFLAGS="$CFLAGS -g"//' \
+ -e 's/CFLAGS="$CFLAGS -O0"//' \
+ -i configure.ac configure || die
+
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+ gnome2_src_configure \
+ $(use_with gtk) \
+ $(use_enable introspection) \
+ $(use_enable vala) \
+ $(usex debug --enable-debug=yes --enable-debug=default) \
+ --disable-update-icon-cache \
+ --disable-update-mime
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check
+}
diff --git a/app-crypt/gcr/gcr-3.14.0.ebuild b/app-crypt/gcr/gcr-3.14.0.ebuild
new file mode 100644
index 000000000000..917387172780
--- /dev/null
+++ b/app-crypt/gcr/gcr-3.14.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://developer.gnome.org/gcr/"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-3
+IUSE="debug gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+ >=app-crypt/gnupg-2
+ >=app-crypt/p11-kit-0.19
+ >=dev-libs/glib-2.38:2
+ >=dev-libs/libgcrypt-1.2.2:0=
+ >=dev-libs/libtasn1-1:=
+ >=sys-apps/dbus-1
+ gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
+ introspection? ( >=dev-libs/gobject-introspection-1.34 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gnome-keyring-3.3
+"
+# gcr was part of gnome-keyring until 3.3
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dev-libs/gobject-introspection-common
+ dev-libs/libxslt
+ dev-libs/vala-common
+ dev-util/gdbus-codegen
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+# eautoreconf needs:
+# dev-libs/gobject-introspection-common
+# dev-libs/vala-common
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Fix race building gdbus-codegen header and source (from '3.14')
+ epatch "${FILESDIR}"/${P}-race-building.patch
+
+ # Disable stupid flag changes
+ sed -e 's/CFLAGS="$CFLAGS -g"//' \
+ -e 's/CFLAGS="$CFLAGS -O0"//' \
+ -i configure.ac configure || die
+
+ eautoreconf
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+ gnome2_src_configure \
+ $(use_with gtk) \
+ $(use_enable introspection) \
+ $(use_enable vala) \
+ $(usex debug --enable-debug=yes --enable-debug=default) \
+ --disable-update-icon-cache \
+ --disable-update-mime
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check
+}
diff --git a/app-crypt/gcr/gcr-3.16.0.ebuild b/app-crypt/gcr/gcr-3.16.0.ebuild
new file mode 100644
index 000000000000..7c01df8b349c
--- /dev/null
+++ b/app-crypt/gcr/gcr-3.16.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://developer.gnome.org/gcr/"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-3
+IUSE="debug gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+ >=app-crypt/gnupg-2
+ >=app-crypt/p11-kit-0.19
+ >=dev-libs/glib-2.38:2
+ >=dev-libs/libgcrypt-1.2.2:0=
+ >=dev-libs/libtasn1-1:=
+ >=sys-apps/dbus-1
+ gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
+ introspection? ( >=dev-libs/gobject-introspection-1.34 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gnome-keyring-3.3
+"
+# gcr was part of gnome-keyring until 3.3
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dev-libs/gobject-introspection-common
+ dev-libs/libxslt
+ dev-libs/vala-common
+ dev-util/gdbus-codegen
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+# eautoreconf needs:
+# dev-libs/gobject-introspection-common
+# dev-libs/vala-common
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Disable stupid flag changes
+ sed -e 's/CFLAGS="$CFLAGS -g"//' \
+ -e 's/CFLAGS="$CFLAGS -O0"//' \
+ -i configure.ac configure || die
+
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+ gnome2_src_configure \
+ $(use_with gtk) \
+ $(use_enable introspection) \
+ $(use_enable vala) \
+ $(usex debug --enable-debug=yes --enable-debug=default) \
+ --disable-update-icon-cache \
+ --disable-update-mime
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check
+}
diff --git a/app-crypt/gcr/metadata.xml b/app-crypt/gcr/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/app-crypt/gcr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
new file mode 100644
index 000000000000..2d6f48019889
--- /dev/null
+++ b/app-crypt/gentoo-keys/Manifest
@@ -0,0 +1 @@
+DIST gentoo-keys-201501052117.tar.xz 28936 SHA256 168e430e9cbc2d720a53b2ba04fe1dd54ee667f12b75d8b51d60b8cb11a474f1 SHA512 7e48e4a13f3e431b0f2f48fc4ed4fdca4b8078b725b1a9d9ca30a551178cc229c5e4b6b9018cea5686c310c065091073c7f04ab8eb61a20be1ccd9956c1d8cee WHIRLPOOL bc4d1f71cc9517ba3741bae4727e10480641c81701cb2f91412e30fa055e6ee38ee46e0afed927214370be89308af2516bee311585b5aec8a690ccf3eac3c6e8
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201501052117.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201501052117.ebuild
new file mode 100644
index 000000000000..7a80e90784d4
--- /dev/null
+++ b/app-crypt/gentoo-keys/gentoo-keys-201501052117.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2014-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="A Openpgp/gpg keyring of official Gentoo release media gpg keys"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI="http://dev.gentoo.org/~dolsen/releases/keyrings/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc64 ppc sparc x86 ~arm64 ~x86-fbsd ~amd64-fbsd ~m68k ~mips ~s390 ~sh"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare(){ true; }
+
+src_install(){
+ insinto /var/lib/gentoo/gkeys/keyrings
+ doins -r gentoo
+}
diff --git a/app-crypt/gentoo-keys/metadata.xml b/app-crypt/gentoo-keys/metadata.xml
new file mode 100644
index 000000000000..cdb5f20cd868
--- /dev/null
+++ b/app-crypt/gentoo-keys/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>gkeys@gentoo.org</email>
+ <name>Gentoo-keys Project Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gifshuffle/Manifest b/app-crypt/gifshuffle/Manifest
new file mode 100644
index 000000000000..d097d6f2f1c2
--- /dev/null
+++ b/app-crypt/gifshuffle/Manifest
@@ -0,0 +1 @@
+DIST gifshuffle.tar.gz 21509 SHA256 5341ccbe850cb687213fa664ba3a791f5b304278fad8a9b09df172c53a829342 SHA512 0a0521f924c508c80c11309203e64cbd948945ddd557f01008a39987602320be780c1710dfcaa8ec9886fff4e9745465f2f242919ede4cedb2af9f73e5cc54be WHIRLPOOL 8e6dbfd50013a8bcfb72d2d71567e4d1ea918f3ed500fe1ca2aa6ce79312b686e00c0b95300a22629282a5b21382b173ab817d4bfea88d567180324e459cc82b
diff --git a/app-crypt/gifshuffle/gifshuffle-2.0.ebuild b/app-crypt/gifshuffle/gifshuffle-2.0.ebuild
new file mode 100644
index 000000000000..18530c8658b2
--- /dev/null
+++ b/app-crypt/gifshuffle/gifshuffle-2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="GIF colourmap steganography"
+HOMEPAGE="http://www.darkside.com.au/gifshuffle/"
+SRC_URI="http://www.darkside.com.au/gifshuffle/${PN}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"/${PN}
+
+src_compile() {
+ echo $(tc-getCC) -o ${PN} ${CFLAGS} ${LDFLAGS} *.c
+ $(tc-getCC) -o ${PN} ${CFLAGS} ${LDFLAGS} *.c || die "Cannot compile ${PN}"
+}
+
+src_install() {
+ dobin ${PN} || die "Cannot install ${PN}"
+ dodoc gshuf.txt
+}
diff --git a/app-crypt/gifshuffle/metadata.xml b/app-crypt/gifshuffle/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/app-crypt/gifshuffle/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gkeys-gen/Manifest b/app-crypt/gkeys-gen/Manifest
new file mode 100644
index 000000000000..41a87f4eb367
--- /dev/null
+++ b/app-crypt/gkeys-gen/Manifest
@@ -0,0 +1 @@
+DIST gkeys-gen-0.1.tar.bz2 18480 SHA256 c6ef23e3b1cc9f62cb094ee94067e7d01d43099c4d9941efc9ce3017698430a6 SHA512 3f9c7ba977912ce23f12a1a08421c4fd0d461444b17fa5d2d6e6980c550f19064c489921bac108fa6fe5af4064e1dd21e88426251008c5c019ee2a117dc4725a WHIRLPOOL 586e31d071ac5ba9edf159d472657eebe82f442fefa35ed5af08cfcfa477818b06f80cfbb67be9c472841ee97293bbff6bfff8ec6c30e6385e1db02391bc7f6d
diff --git a/app-crypt/gkeys-gen/gkeys-gen-0.1-r1.ebuild b/app-crypt/gkeys-gen/gkeys-gen-0.1-r1.ebuild
new file mode 100644
index 000000000000..df987ec9c0f4
--- /dev/null
+++ b/app-crypt/gkeys-gen/gkeys-gen-0.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+
+inherit distutils-r1
+
+DESCRIPTION="Tool for generating OpenPGP/GPG keys using a specifications file"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI="http://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ app-crypt/gnupg
+ dev-python/snakeoil[${PYTHON_USEDEP}]
+ dev-python/pygpgme[${PYTHON_USEDEP}]
+ =app-crypt/gkeys-0.1*[${PYTHON_USEDEP}]
+ "
+
+pkg_postinst() {
+ einfo "This is experimental software."
+ einfo "The API's it installs should be considered unstable"
+ einfo "and are subject to change."
+ einfo
+ einfo "Please file any enhancement requests, or bugs"
+ einfo "at https://bugs.gentoo.org"
+ einfo "We are also on IRC @ #gentoo-keys of the Freenode network"
+ einfo
+ ewarn "There may be some Python 3 compatibility issues still."
+ ewarn "Please help us debug, fix and report them in Bugzilla."
+}
diff --git a/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild b/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild
new file mode 100644
index 000000000000..8efca2fe03d0
--- /dev/null
+++ b/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+
+EGIT_BRANCH="master"
+#EGIT_BRANCH="gen-update"
+
+inherit distutils-r1 git-r3
+
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoo-keys.git"
+#EGIT_REPO_URI="https://github.com/gentoo/gentoo-keys.git"
+
+DESCRIPTION="Tool for generating OpenPGP/GPG keys using a specifications file"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ app-crypt/gnupg
+ dev-python/snakeoil[${PYTHON_USEDEP}]
+ dev-python/pygpgme[${PYTHON_USEDEP}]
+ =app-crypt/gkeys-9999[${PYTHON_USEDEP}]
+ "
+
+S="${WORKDIR}/$P/gkeys-gen"
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+ # copy these 2 into our subdir from the master level
+ cp ../LICENSE ./ || die "cp LICENSE failed"
+ cp ../README.md ./ || die "cp README.me failed"
+ cp -R ../py2man ./ || die "cp-R py2man failed"
+}
+
+pkg_postinst() {
+ einfo
+ einfo "This is experimental software."
+ einfo "The API's it installs should be considered unstable"
+ einfo "and are subject to change."
+ einfo
+ einfo "Please file any enhancement requests, or bugs"
+ einfo "at https://bugs.gentoo.org"
+ einfo "We are also on IRC @ #gentoo-keys of the freenode network"
+ einfo
+ ewarn "There may be some python 3 compatibility issues still."
+ ewarn "Please help debug/fix/report them in bugzilla."
+}
diff --git a/app-crypt/gkeys-gen/metadata.xml b/app-crypt/gkeys-gen/metadata.xml
new file mode 100644
index 000000000000..cdb5f20cd868
--- /dev/null
+++ b/app-crypt/gkeys-gen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>gkeys@gentoo.org</email>
+ <name>Gentoo-keys Project Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gkeys/Manifest b/app-crypt/gkeys/Manifest
new file mode 100644
index 000000000000..9d9030f31546
--- /dev/null
+++ b/app-crypt/gkeys/Manifest
@@ -0,0 +1 @@
+DIST gkeys-0.1.tar.bz2 40987 SHA256 b1e99873d1f966837eeb83b82d9289f6a6414de5a8467586b88d466800528524 SHA512 7da21ffc652ae95b308c8e8cd57754ad45b9414626b95d38b69867704df5def0a18cdb25934962e4a6109feeddbd1bbd8ac47f445b2977a869993b00771e79c5 WHIRLPOOL adc258dbc7955bf05f31106d16d1d4bd247517bd16d5562f1757e14a274d69c05b6749d83a94029caadd3704003f18cf8ca0e5985d6fbd498204ef36c91c4950
diff --git a/app-crypt/gkeys/gkeys-0.1-r1.ebuild b/app-crypt/gkeys/gkeys-0.1-r1.ebuild
new file mode 100644
index 000000000000..6dde42badd63
--- /dev/null
+++ b/app-crypt/gkeys/gkeys-0.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+
+inherit distutils-r1
+
+DESCRIPTION="An OpenPGP/GPG key management tool for seed files and keyrings"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI="http://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ app-crypt/gnupg
+ >=dev-python/pyGPG-0.1[${PYTHON_USEDEP}]
+ >=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+ dev-python/snakeoil[${PYTHON_USEDEP}]
+ >=app-crypt/gentoo-keys-201501052117
+ "
+
+python_install_all() {
+ distutils-r1_python_install_all
+ keepdir /var/log/gkeys
+ fperms g+w /var/log/gkeys
+}
+
+pkg_preinst() {
+ chgrp users "${D}"/var/log/gkeys
+}
+
+pkg_postinst() {
+ einfo "Fetching Gentoo Developer seed file..."
+ gkeys fetch-seed -C gentoo-devs || die "Unable to fetch seeds"
+ einfo "This is experimental software."
+ einfo "The API's it installs should be considered unstable"
+ einfo "and are subject to change."
+ einfo
+ einfo "Please file any enhancement requests, or bugs"
+ einfo "at https://bugs.gentoo.org"
+ einfo "We are also on IRC @ #gentoo-keys of the Freenode network"
+ einfo
+ ewarn "There may be some Python 3 compatibility issues still."
+ ewarn "Please help us debug, fix and report them in Bugzilla."
+}
diff --git a/app-crypt/gkeys/gkeys-9999.ebuild b/app-crypt/gkeys/gkeys-9999.ebuild
new file mode 100644
index 000000000000..0f149c9ef0f0
--- /dev/null
+++ b/app-crypt/gkeys/gkeys-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+
+#EGIT_PROJECT="gentoo-keys.git"
+EGIT_BRANCH="master"
+
+inherit distutils-r1 git-r3
+
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoo-keys.git"
+
+DESCRIPTION="An OpenPGP/GPG key management tool and python libs"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ app-crypt/gnupg
+ =dev-python/pyGPG-9999[${PYTHON_USEDEP}]
+ =dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
+ dev-python/snakeoil[${PYTHON_USEDEP}]
+ >=app-crypt/gentoo-keys-201501052117
+ "
+
+S="${WORKDIR}/$P/gkeys"
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+ # copy these 2 into our subdir from the master level
+ cp ../LICENSE ./ || die "cp LICENSE failed"
+ cp ../README.md ./ || die "cp README.me failed"
+ cp -R ../py2man ./ || die "cp-R py2man failed"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ keepdir /var/log/gkeys
+ fperms g+w /var/log/gkeys
+}
+
+pkg_preinst() {
+ chgrp users "${D}"/var/log/gkeys
+}
+
+pkg_postinst() {
+ einfo
+ einfo "This is experimental software."
+ einfo "The API's it installs should be considered unstable"
+ einfo "and are subject to change."
+ einfo
+ einfo "Please file any enhancement requests, or bugs"
+ einfo "at https://bugs.gentoo.org"
+ einfo "We are also on IRC @ #gentoo-keys of the freenode network"
+ einfo
+ ewarn "There may be some python 3 compatibility issues still."
+ ewarn "Please help debug/fix/report them in bugzilla."
+}
diff --git a/app-crypt/gkeys/metadata.xml b/app-crypt/gkeys/metadata.xml
new file mode 100644
index 000000000000..cdb5f20cd868
--- /dev/null
+++ b/app-crypt/gkeys/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>gkeys@gentoo.org</email>
+ <name>Gentoo-keys Project Team</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
new file mode 100644
index 000000000000..f6430552e1a1
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -0,0 +1 @@
+DIST gnupg-pkcs11-scd-0.7.3.tar.bz2 121593 SHA256 2406f05d996a56d0d53bf66a56fe155790037a63e919053b218ba17e2e7c860a SHA512 b87622394565b5adb2d3a8b10a7fd79820b1bd56c54263f18e151ac07ae79cd836ea3d010fdc47813bf7e1a4e4659a37e7b23f8d6815a6c7ab50629e8952c0d4 WHIRLPOOL 114c4ffe45f9a482a0657c65926535dc5a02525210d49c28270de9a733c9bc437ef217a490e4a7760527722eb763a4c85960ab366cc6744a0323ccec982c2fb3
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.7.3.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.7.3.ebuild
new file mode 100644
index 000000000000..4c4093e2b1f8
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.7.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="PKCS#11 support for GnuPG"
+HOMEPAGE="http://gnupg-pkcs11.sourceforge.net"
+SRC_URI="mirror://sourceforge/gnupg-pkcs11/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-libs/libassuan-2*
+ >=dev-libs/libgcrypt-1.2.2:0
+ >=dev-libs/libgpg-error-1.3
+ >=dev-libs/openssl-0.9.7
+ >=dev-libs/pkcs11-helper-1.02"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf --docdir="/usr/share/doc/${PF}"
+}
diff --git a/app-crypt/gnupg-pkcs11-scd/metadata.xml b/app-crypt/gnupg-pkcs11-scd/metadata.xml
new file mode 100644
index 000000000000..7e1350d65107
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <longdescription>
+ GnuPG scd replacement that enables the use of PKCS#11 tokens.
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">gnupg-pkcs11</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
new file mode 100644
index 000000000000..b9858aeb6788
--- /dev/null
+++ b/app-crypt/gnupg/Manifest
@@ -0,0 +1,5 @@
+DIST gnupg-1.4.19.tar.bz2 3713811 SHA256 7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86 SHA512 cce2a83efb05f963ad0f8afd04999cc852889d46b4cad4cf399a37fd6e69f0911a5ccaa0192cb891a941cfa93125349b481efa789a127e3c0aa2c5ba53672741 WHIRLPOOL 14eaddca0981f05757aa0751b9563837efd3f5943a422d5f29e0de94eb6233b85b8848a1f4816ab7e897d6e656c7c08705115d53ed89f554604ffd2009c3c39f
+DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
+DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2 SHA512 b05e75f5ef9881df9472818743c175cfe3254088086f36dc0fcf3d34e61f648f1775d90d404f6c622561df5066d972aadbf99ea8ec1290e5d7f7310f4ef2989e WHIRLPOOL abb353b20655002a0957e38d2b889fb5e6a47ba7b7546e1c70fc1f97cf42deeca8f2b061678983f3a160210f4eaf7529441246df1f9f1d875f5cc090456fdfb7
+DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c SHA512 7e786fe0648d5ea453f9c7524fec4bd7d5eec26d28f723acf3cb2f7ec9c400c339f0926a179411876c3f8e08b06942dcec643dc930caf58239bbd4932f4bd3c1 WHIRLPOOL ccf7427e54a545914e89677618055a114b4c9dc4db48669a2fc726fced98475df4ed27c93bd180f1250d147111ee663c736cdf4e1d8afdc40ed967cdffd0eb66
+DIST gnupg-2.1.6.tar.bz2 4917722 SHA256 5e599ad542199f3bd733eed2b88a539d1b4c3beda2dbab0ff69f1896f52e92fd SHA512 ae8aafe770336c83badf5610fe37f4ddc488786e3604780627893b636161d8407f3fd782538799e2b2a02e31c97468464372017fa52b5d9ed1bd31c85d9b3763 WHIRLPOOL 2136c526242a4e741c0cbc9aec102ba634234efd679d62db9aae3b2ab8fe9f8ad9b8fdb7d1f2d43982e6a072d5f5072d0744d8bb434d61f49ff24e868c902f80
diff --git a/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch b/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch
new file mode 100644
index 000000000000..9506f814378d
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch
@@ -0,0 +1,34 @@
+From c34486a64c223bcbfbb57d9abcf107d684b815b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Sun, 17 Apr 2011 01:34:39 +0200
+Subject: [PATCH] gpgsm-gencert.sh: make sure not to abort after creating temp
+ file.
+
+https://bugs.g10code.com/gnupg/issue1466
+
+---
+ tools/gpgsm-gencert.sh | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tools/gpgsm-gencert.sh b/tools/gpgsm-gencert.sh
+index b209c8e..e7c812f 100755
+--- a/tools/gpgsm-gencert.sh
++++ b/tools/gpgsm-gencert.sh
+@@ -178,10 +178,10 @@ Key-Length: $KEY_LENGTH
+ Key-Usage: $KEY_USAGE
+ Name-DN: $NAME
+ EOF
+-[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP"
+-[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES"
+-[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES"
+-[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES"
++[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP" || true
++[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES" || true
++[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES" || true
++[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES" || true
+ ) > "$file_parameter"
+
+
+--
+1.7.5.rc1
+
diff --git a/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch b/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch
new file mode 100644
index 000000000000..4c9eff26fd58
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch
@@ -0,0 +1,35 @@
+From a2dcc5cc49c3e79d64bd1a2ad7a5bc4df5b073ee Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Wed, 13 Aug 2014 11:13:34 +0200
+Subject: [PATCH] gpg: Need to init the trustdb for import.
+
+* g10/trustdb.c (clear_ownertrusts): Init trustdb.
+
+--
+
+This was fixed in 1.4 branch in commit
+23191d7851eae2217ecdac6484349849a24fd94a but was not applied to the
+2.0 branch that exhibits the same problem. This is actually a hack
+to fix a bug introduced with commit 2528178.
+
+GnuPG-bug-id: 1622
+---
+ g10/trustdb.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/g10/trustdb.c b/g10/trustdb.c
+index f96701a..7bfef25 100644
+--- a/g10/trustdb.c
++++ b/g10/trustdb.c
+@@ -923,6 +923,8 @@ clear_ownertrusts (PKT_public_key *pk)
+ TRUSTREC rec;
+ int rc;
+
++ init_trustdb();
++
+ if (trustdb_args.no_trustdb && opt.trust_model == TM_ALWAYS)
+ return 0;
+
+--
+1.8.5.5
+
diff --git a/app-crypt/gnupg/files/gnupg-2.0.26-misc-cve.patch b/app-crypt/gnupg/files/gnupg-2.0.26-misc-cve.patch
new file mode 100644
index 000000000000..734a04abd553
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.26-misc-cve.patch
@@ -0,0 +1,118 @@
+From ed8383c618e124cfa708c9ee87563fcdf2f4649c Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 19 Dec 2014 18:53:34 -0500
+Subject: [PATCH] sm: Avoid double-free on iconv failure
+
+* sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
+double-free of pwbuf.
+
+--
+
+Observed by Joshua Rogers <honey@internot.info>, who proposed a
+slightly different fix.
+
+Debian-Bug-Id: 773472
+
+Added fix at a second place - wk.
+---
+ sm/minip12.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/agent/minip12.c b/agent/minip12.c
+index 01b91b7..ca4d248 100644
+--- a/agent/minip12.c
++++ b/agent/minip12.c
+@@ -2422,6 +2422,7 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t certlen,
+ " requested charset '%s': %s\n",
+ charset, strerror (errno));
+ gcry_free (pwbuf);
++ pwbuf = NULL;
+ goto failure;
+ }
+
+@@ -2436,6 +2437,7 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t certlen,
+ " requested charset '%s': %s\n",
+ charset, strerror (errno));
+ gcry_free (pwbuf);
++ pwbuf = NULL;
+ jnlib_iconv_close (cd);
+ goto failure;
+ }
+--
+1.7.10.4
+
+From b0b3803e8c2959dd67ca96debc54b5c6464f0d41 Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 19 Dec 2014 18:07:55 -0500
+Subject: [PATCH] scd: Avoid double-free on error condition in scd
+
+* scd/command.c (cmd_readkey): avoid double-free of cert
+
+--
+
+When ksba_cert_new() fails, cert will be double-freed.
+
+Debian-Bug-Id: 773471
+
+Original patch changed by wk to do the free only at leave.
+---
+ scd/command.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/scd/command.c b/scd/command.c
+index dd4191f..1cc580a 100644
+--- a/scd/command.c
++++ b/scd/command.c
+@@ -804,10 +804,8 @@ cmd_readkey (assuan_context_t ctx, char *line)
+
+ rc = ksba_cert_new (&kc);
+ if (rc)
+- {
+- xfree (cert);
+- goto leave;
+- }
++ goto leave;
++
+ rc = ksba_cert_init_from_mem (kc, cert, ncert);
+ if (rc)
+ {
+--
+1.7.10.4
+
+From abd5f6752d693b7f313c19604f0723ecec4d39a6 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Mon, 22 Dec 2014 12:16:46 +0100
+Subject: [PATCH] dirmngr,gpgsm: Return NULL on fail
+
+* dirmngr/ldapserver.c (ldapserver_parse_one): Set SERVER to NULL.
+* sm/gpgsm.c (parse_keyserver_line): Ditto.
+--
+
+Reported-by: Joshua Rogers <git@internot.info>
+
+ "If something inside the ldapserver_parse_one function failed,
+ 'server' would be freed, then returned, leading to a
+ use-after-free. This code is likely copied from sm/gpgsm.c, which
+ was also susceptible to this bug."
+
+Signed-off-by: Werner Koch <wk@gnupg.org>
+---
+ dirmngr/ldapserver.c | 1 +
+ sm/gpgsm.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/sm/gpgsm.c b/sm/gpgsm.c
+index 3398d17..72bceb4 100644
+--- a/sm/gpgsm.c
++++ b/sm/gpgsm.c
+@@ -862,6 +862,7 @@ parse_keyserver_line (char *line,
+ {
+ log_info (_("%s:%u: skipping this line\n"), filename, lineno);
+ keyserver_list_free (server);
++ server = NULL;
+ }
+
+ return server;
+--
+1.7.10.4
+
diff --git a/app-crypt/gnupg/gnupg-1.4.19.ebuild b/app-crypt/gnupg/gnupg-1.4.19.ebuild
new file mode 100644
index 000000000000..b31f8a443d5a
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.19.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+ECCVER="0.2.0"
+ECCVER_GNUPG="1.4.9"
+ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
+MY_P=${P/_/}
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib"
+
+COMMON_DEPEND="
+ ldap? ( net-nds/openldap )
+ bzip2? ( app-arch/bzip2 )
+ zlib? ( sys-libs/zlib )
+ curl? ( net-misc/curl )
+ mta? ( virtual/mta )
+ readline? ( sys-libs/readline )
+ smartcard? ( =virtual/libusb-0* )
+ usb? ( =virtual/libusb-0* )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND} )
+ selinux? ( sec-policy/selinux-gpg )
+ nls? ( virtual/libintl )"
+
+DEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # bug#469388
+ sed -i -e 's/--batch --dearmor/--homedir . --batch --dearmor/' checks/Makefile.in
+
+ # Fix PIC definitions
+ sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \
+ || die "sed PIC failed"
+ sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \
+ die "sed PIC failed"
+}
+
+src_configure() {
+ # Certain sparc32 machines seem to have trouble building correctly with
+ # -mcpu enabled. While this is not a gnupg problem, it is a temporary
+ # fix until the gcc problem can be tracked down.
+ if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
+ filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
+ fi
+
+ # 'USE=static' support was requested in #29299
+ use static && append-ldflags -static
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable ldap) \
+ $(use_enable mta mailto) \
+ --enable-hkp \
+ --enable-finger \
+ $(use_with !zlib included-zlib) \
+ $(use_with curl libcurl /usr) \
+ $(use_enable nls) \
+ $(use_enable bzip2) \
+ $(use_enable smartcard card-support) \
+ $(use_enable selinux selinux-support) \
+ --without-capabilities \
+ $(use_with readline) \
+ $(use_with usb libusb /usr) \
+ --enable-static-rnd=linux \
+ --libexecdir="${EPREFIX}/usr/libexec" \
+ --enable-noexecstack \
+ CC_FOR_BUILD=$(tc-getBUILD_CC) \
+ ${myconf}
+}
+
+src_install() {
+ default
+
+ # keep the documentation in /usr/share/doc/...
+ rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die
+
+ dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
+ TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP}
+
+ exeinto /usr/libexec/gnupg
+ doexe tools/make-dns-cert
+}
+
+pkg_postinst() {
+ ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
+ ewarn "you MUST make the gpg binary setuid."
+ echo
+# if use !bindist && use ecc; then
+# ewarn
+# ewarn "The elliptical curves patch is experimental"
+# ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
+# fi
+ elog
+ elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+ elog
+ elog "If you wish to view images emerge:"
+ elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+ elog "Remember to use photo-viewer option in configuration file to activate the right viewer"
+}
diff --git a/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild b/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild
new file mode 100644
index 000000000000..055584d032f5
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
+
+COMMON_DEPEND_LIBS="
+ >=dev-libs/libassuan-2
+ >=dev-libs/libgcrypt-1.4:0=
+ >=dev-libs/libgpg-error-1.11
+ >=dev-libs/libksba-1.0.7
+ >=dev-libs/pth-1.3.7
+ >=net-misc/curl-7.10
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ readline? ( sys-libs/readline )
+ smartcard? ( usb? ( virtual/libusb:0 ) )
+ ldap? ( net-nds/openldap )"
+COMMON_DEPEND_BINS="app-crypt/pinentry"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+ ${COMMON_DEPEND_BINS}
+ static? (
+ >=dev-libs/libassuan-2[static-libs]
+ >=dev-libs/libgcrypt-1.4:0=[static-libs]
+ >=dev-libs/libgpg-error-1.11[static-libs]
+ >=dev-libs/libksba-1.0.7[static-libs]
+ >=dev-libs/pth-1.3.7[static-libs]
+ >=net-misc/curl-7.10[static-libs]
+ sys-libs/zlib[static-libs]
+ bzip2? ( app-arch/bzip2[static-libs] )
+ )
+ nls? ( sys-devel/gettext )
+ doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+ ${COMMON_DEPEND_BINS}
+ mta? ( virtual/mta )
+ !<=app-crypt/gnupg-2.0.1
+ selinux? ( sec-policy/selinux-gpg )
+ nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
+ epatch "${FILESDIR}/${P}-Need-to-init-the-trustdb-for-import.patch"
+ epatch "${FILESDIR}/${P}-misc-cve.patch"
+ epatch_user
+}
+
+src_configure() {
+ local myconf=()
+
+ # 'USE=static' support was requested:
+ # gnupg1: bug #29299
+ # gnupg2: bug #159623
+ use static && append-ldflags -static
+
+ if use smartcard; then
+ myconf+=(
+ --enable-scdaemon
+ $(use_enable usb ccid-driver)
+ )
+ else
+ myconf+=( --disable-scdaemon )
+ fi
+
+ if use elibc_SunOS || use elibc_AIX; then
+ myconf+=( --disable-symcryptrun )
+ else
+ myconf+=( --enable-symcryptrun )
+ fi
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-gpg \
+ --enable-gpgsm \
+ --enable-agent \
+ --without-adns \
+ "${myconf[@]}" \
+ $(use_enable bzip2) \
+ $(use_enable nls) \
+ $(use_enable mta mailto) \
+ $(use_enable ldap) \
+ $(use_with readline) \
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ cd doc
+ emake html
+ fi
+}
+
+src_install() {
+ default
+
+ use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
+
+ emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+ rm "${ED}"/usr/share/gnupg/help* || die
+
+ dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+ doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+ dosym gpg2 /usr/bin/gpg
+ dosym gpgv2 /usr/bin/gpgv
+ dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
+ dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
+ dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
+ if use ldap; then
+ dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
+ fi
+ echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+ echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+ if use doc; then
+ dohtml doc/gnupg.html/* doc/*.png
+ fi
+}
+
+pkg_postinst() {
+ elog "If you wish to view images emerge:"
+ elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+ elog "Remember to use photo-viewer option in configuration file to activate"
+ elog "the right viewer."
+ elog
+
+ if use smartcard; then
+ elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+ use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+ elog " - sys-apps/pcsc-lite and a compatible reader device;"
+ elog " - dev-libs/openct and a compatible reader device;"
+ elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+ elog ""
+ elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+ elog "app-crypt/ccid first."
+ fi
+
+ ewarn "Please remember to restart gpg-agent if a different version"
+ ewarn "of the agent is currently used. If you are unsure of the gpg"
+ ewarn "agent you are using please run 'killall gpg-agent',"
+ ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+}
diff --git a/app-crypt/gnupg/gnupg-2.0.27-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.27-r1.ebuild
new file mode 100644
index 000000000000..4e5e91e25b3d
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.27-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
+
+COMMON_DEPEND_LIBS="
+ >=dev-libs/libassuan-2
+ >=dev-libs/libgcrypt-1.4:0=
+ >=dev-libs/libgpg-error-1.11
+ >=dev-libs/libksba-1.0.7
+ >=dev-libs/pth-1.3.7
+ >=net-misc/curl-7.10
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ readline? ( sys-libs/readline )
+ smartcard? ( usb? ( virtual/libusb:0 ) )
+ ldap? ( net-nds/openldap )"
+COMMON_DEPEND_BINS="app-crypt/pinentry"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+ ${COMMON_DEPEND_BINS}
+ static? (
+ >=dev-libs/libassuan-2[static-libs]
+ >=dev-libs/libgcrypt-1.4:0=[static-libs]
+ >=dev-libs/libgpg-error-1.11[static-libs]
+ >=dev-libs/libksba-1.0.7[static-libs]
+ >=dev-libs/pth-1.3.7[static-libs]
+ >=net-misc/curl-7.10[static-libs]
+ sys-libs/zlib[static-libs]
+ bzip2? ( app-arch/bzip2[static-libs] )
+ )
+ nls? ( sys-devel/gettext )
+ doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+ ${COMMON_DEPEND_BINS}
+ mta? ( virtual/mta )
+ !<=app-crypt/gnupg-2.0.1
+ selinux? ( sec-policy/selinux-gpg )
+ nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
+ epatch_user
+}
+
+src_configure() {
+ local myconf=()
+
+ # 'USE=static' support was requested:
+ # gnupg1: bug #29299
+ # gnupg2: bug #159623
+ use static && append-ldflags -static
+
+ if use smartcard; then
+ myconf+=(
+ --enable-scdaemon
+ $(use_enable usb ccid-driver)
+ )
+ else
+ myconf+=( --disable-scdaemon )
+ fi
+
+ if use elibc_SunOS || use elibc_AIX; then
+ myconf+=( --disable-symcryptrun )
+ else
+ myconf+=( --enable-symcryptrun )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-gpg \
+ --enable-gpgsm \
+ --enable-agent \
+ --enable-large-secmem \
+ --without-adns \
+ "${myconf[@]}" \
+ $(use_enable bzip2) \
+ $(use_enable nls) \
+ $(use_enable mta mailto) \
+ $(use_enable ldap) \
+ $(use_with readline) \
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ cd doc
+ emake html
+ fi
+}
+
+src_install() {
+ default
+
+ use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
+
+ emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+ rm "${ED}"/usr/share/gnupg/help* || die
+
+ dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+ doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+ dosym gpg2 /usr/bin/gpg
+ dosym gpgv2 /usr/bin/gpgv
+ dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
+ dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
+ dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
+ if use ldap; then
+ dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
+ fi
+ echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+ echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+ if use doc; then
+ dohtml doc/gnupg.html/* doc/*.png
+ fi
+}
+
+pkg_postinst() {
+ elog "If you wish to view images emerge:"
+ elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+ elog "Remember to use photo-viewer option in configuration file to activate"
+ elog "the right viewer."
+ elog
+
+ if use smartcard; then
+ elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+ use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+ elog " - sys-apps/pcsc-lite and a compatible reader device;"
+ elog " - dev-libs/openct and a compatible reader device;"
+ elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+ elog ""
+ elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+ elog "app-crypt/ccid first."
+ fi
+
+ ewarn "Please remember to restart gpg-agent if a different version"
+ ewarn "of the agent is currently used. If you are unsure of the gpg"
+ ewarn "agent you are using please run 'killall gpg-agent',"
+ ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+}
diff --git a/app-crypt/gnupg/gnupg-2.0.27.ebuild b/app-crypt/gnupg/gnupg-2.0.27.ebuild
new file mode 100644
index 000000000000..ffb48b43721d
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.27.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
+
+COMMON_DEPEND_LIBS="
+ >=dev-libs/libassuan-2
+ >=dev-libs/libgcrypt-1.4:0=
+ >=dev-libs/libgpg-error-1.11
+ >=dev-libs/libksba-1.0.7
+ >=dev-libs/pth-1.3.7
+ >=net-misc/curl-7.10
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ readline? ( sys-libs/readline )
+ smartcard? ( usb? ( virtual/libusb:0 ) )
+ ldap? ( net-nds/openldap )"
+COMMON_DEPEND_BINS="app-crypt/pinentry"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+ ${COMMON_DEPEND_BINS}
+ static? (
+ >=dev-libs/libassuan-2[static-libs]
+ >=dev-libs/libgcrypt-1.4:0=[static-libs]
+ >=dev-libs/libgpg-error-1.11[static-libs]
+ >=dev-libs/libksba-1.0.7[static-libs]
+ >=dev-libs/pth-1.3.7[static-libs]
+ >=net-misc/curl-7.10[static-libs]
+ sys-libs/zlib[static-libs]
+ bzip2? ( app-arch/bzip2[static-libs] )
+ )
+ nls? ( sys-devel/gettext )
+ doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+ ${COMMON_DEPEND_BINS}
+ mta? ( virtual/mta )
+ !<=app-crypt/gnupg-2.0.1
+ selinux? ( sec-policy/selinux-gpg )
+ nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
+ epatch_user
+}
+
+src_configure() {
+ local myconf=()
+
+ # 'USE=static' support was requested:
+ # gnupg1: bug #29299
+ # gnupg2: bug #159623
+ use static && append-ldflags -static
+
+ if use smartcard; then
+ myconf+=(
+ --enable-scdaemon
+ $(use_enable usb ccid-driver)
+ )
+ else
+ myconf+=( --disable-scdaemon )
+ fi
+
+ if use elibc_SunOS || use elibc_AIX; then
+ myconf+=( --disable-symcryptrun )
+ else
+ myconf+=( --enable-symcryptrun )
+ fi
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-gpg \
+ --enable-gpgsm \
+ --enable-agent \
+ --without-adns \
+ "${myconf[@]}" \
+ $(use_enable bzip2) \
+ $(use_enable nls) \
+ $(use_enable mta mailto) \
+ $(use_enable ldap) \
+ $(use_with readline) \
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ cd doc
+ emake html
+ fi
+}
+
+src_install() {
+ default
+
+ use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
+
+ emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+ rm "${ED}"/usr/share/gnupg/help* || die
+
+ dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+ doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+ dosym gpg2 /usr/bin/gpg
+ dosym gpgv2 /usr/bin/gpgv
+ dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
+ dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
+ dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
+ if use ldap; then
+ dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
+ fi
+ echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+ echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+ if use doc; then
+ dohtml doc/gnupg.html/* doc/*.png
+ fi
+}
+
+pkg_postinst() {
+ elog "If you wish to view images emerge:"
+ elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+ elog "Remember to use photo-viewer option in configuration file to activate"
+ elog "the right viewer."
+ elog
+
+ if use smartcard; then
+ elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+ use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+ elog " - sys-apps/pcsc-lite and a compatible reader device;"
+ elog " - dev-libs/openct and a compatible reader device;"
+ elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+ elog ""
+ elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+ elog "app-crypt/ccid first."
+ fi
+
+ ewarn "Please remember to restart gpg-agent if a different version"
+ ewarn "of the agent is currently used. If you are unsure of the gpg"
+ ewarn "agent you are using please run 'killall gpg-agent',"
+ ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+}
diff --git a/app-crypt/gnupg/gnupg-2.0.28.ebuild b/app-crypt/gnupg/gnupg-2.0.28.ebuild
new file mode 100644
index 000000000000..4e5e91e25b3d
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.28.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
+
+COMMON_DEPEND_LIBS="
+ >=dev-libs/libassuan-2
+ >=dev-libs/libgcrypt-1.4:0=
+ >=dev-libs/libgpg-error-1.11
+ >=dev-libs/libksba-1.0.7
+ >=dev-libs/pth-1.3.7
+ >=net-misc/curl-7.10
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ readline? ( sys-libs/readline )
+ smartcard? ( usb? ( virtual/libusb:0 ) )
+ ldap? ( net-nds/openldap )"
+COMMON_DEPEND_BINS="app-crypt/pinentry"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+ ${COMMON_DEPEND_BINS}
+ static? (
+ >=dev-libs/libassuan-2[static-libs]
+ >=dev-libs/libgcrypt-1.4:0=[static-libs]
+ >=dev-libs/libgpg-error-1.11[static-libs]
+ >=dev-libs/libksba-1.0.7[static-libs]
+ >=dev-libs/pth-1.3.7[static-libs]
+ >=net-misc/curl-7.10[static-libs]
+ sys-libs/zlib[static-libs]
+ bzip2? ( app-arch/bzip2[static-libs] )
+ )
+ nls? ( sys-devel/gettext )
+ doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+ ${COMMON_DEPEND_BINS}
+ mta? ( virtual/mta )
+ !<=app-crypt/gnupg-2.0.1
+ selinux? ( sec-policy/selinux-gpg )
+ nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
+ epatch_user
+}
+
+src_configure() {
+ local myconf=()
+
+ # 'USE=static' support was requested:
+ # gnupg1: bug #29299
+ # gnupg2: bug #159623
+ use static && append-ldflags -static
+
+ if use smartcard; then
+ myconf+=(
+ --enable-scdaemon
+ $(use_enable usb ccid-driver)
+ )
+ else
+ myconf+=( --disable-scdaemon )
+ fi
+
+ if use elibc_SunOS || use elibc_AIX; then
+ myconf+=( --disable-symcryptrun )
+ else
+ myconf+=( --enable-symcryptrun )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-gpg \
+ --enable-gpgsm \
+ --enable-agent \
+ --enable-large-secmem \
+ --without-adns \
+ "${myconf[@]}" \
+ $(use_enable bzip2) \
+ $(use_enable nls) \
+ $(use_enable mta mailto) \
+ $(use_enable ldap) \
+ $(use_with readline) \
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ cd doc
+ emake html
+ fi
+}
+
+src_install() {
+ default
+
+ use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
+
+ emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+ rm "${ED}"/usr/share/gnupg/help* || die
+
+ dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+ doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+ dosym gpg2 /usr/bin/gpg
+ dosym gpgv2 /usr/bin/gpgv
+ dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
+ dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
+ dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
+ if use ldap; then
+ dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
+ fi
+ echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+ echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+ if use doc; then
+ dohtml doc/gnupg.html/* doc/*.png
+ fi
+}
+
+pkg_postinst() {
+ elog "If you wish to view images emerge:"
+ elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+ elog "Remember to use photo-viewer option in configuration file to activate"
+ elog "the right viewer."
+ elog
+
+ if use smartcard; then
+ elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+ use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+ elog " - sys-apps/pcsc-lite and a compatible reader device;"
+ elog " - dev-libs/openct and a compatible reader device;"
+ elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+ elog ""
+ elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+ elog "app-crypt/ccid first."
+ fi
+
+ ewarn "Please remember to restart gpg-agent if a different version"
+ ewarn "of the agent is currently used. If you are unsure of the gpg"
+ ewarn "agent you are using please run 'killall gpg-agent',"
+ ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+}
diff --git a/app-crypt/gnupg/gnupg-2.1.6.ebuild b/app-crypt/gnupg/gnupg-2.1.6.ebuild
new file mode 100644
index 000000000000..2f40259fd38b
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.1.6.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+MY_P="${P/_/-}"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
+
+COMMON_DEPEND_LIBS="
+ dev-libs/npth
+ >=dev-libs/libassuan-2
+ >=dev-libs/libgcrypt-1.6.2
+ >=dev-libs/libgpg-error-1.17
+ >=dev-libs/libksba-1.0.7
+ >=net-misc/curl-7.10
+ gnutls? ( >=net-libs/gnutls-3.0 )
+ sys-libs/zlib
+ ldap? ( net-nds/openldap )
+ bzip2? ( app-arch/bzip2 )
+ readline? ( sys-libs/readline:= )
+ smartcard? ( usb? ( virtual/libusb:0 ) )
+ "
+COMMON_DEPEND_BINS="app-crypt/pinentry
+ !app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+ ${COMMON_DEPEND_BINS}
+ static? (
+ >=dev-libs/libassuan-2[static-libs]
+ >=dev-libs/libgcrypt-1.6.2[static-libs]
+ >=dev-libs/libgpg-error-1.17[static-libs]
+ >=dev-libs/libksba-1.0.7[static-libs]
+ dev-libs/npth[static-libs]
+ >=net-misc/curl-7.10[static-libs]
+ sys-libs/zlib[static-libs]
+ bzip2? ( app-arch/bzip2[static-libs] )
+ )
+ nls? ( sys-devel/gettext )
+ doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+ ${COMMON_DEPEND_BINS}
+ selinux? ( sec-policy/selinux-gpg )
+ nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
+ epatch_user
+}
+
+src_configure() {
+ local myconf=()
+
+ # 'USE=static' support was requested:
+ # gnupg1: bug #29299
+ # gnupg2: bug #159623
+ use static && append-ldflags -static
+
+ if use smartcard; then
+ myconf+=(
+ --enable-scdaemon
+ $(use_enable usb ccid-driver)
+ )
+ else
+ myconf+=( --disable-scdaemon )
+ fi
+
+ if use elibc_SunOS || use elibc_AIX; then
+ myconf+=( --disable-symcryptrun )
+ else
+ myconf+=( --enable-symcryptrun )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-gpg \
+ --enable-gpgsm \
+ --enable-large-secmem \
+ --without-adns \
+ "${myconf[@]}" \
+ $(use_enable bzip2) \
+ $(use_enable gnutls) \
+ $(use_with ldap) \
+ $(use_enable nls) \
+ $(use_with readline) \
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ cd doc
+ emake html
+ fi
+}
+
+src_install() {
+ default
+
+ use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
+
+ emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+ rm "${ED}"/usr/share/gnupg/help* || die
+
+ dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+ doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+ dosym gpg2 /usr/bin/gpg
+ dosym gpgv2 /usr/bin/gpgv
+ echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+ echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+ if use doc; then
+ dohtml doc/gnupg.html/* doc/*.png
+ fi
+}
+
+pkg_postinst() {
+ elog "If you wish to view images emerge:"
+ elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+ elog "Remember to use photo-viewer option in configuration file to activate"
+ elog "the right viewer."
+ elog
+
+ if use smartcard; then
+ elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+ use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+ elog " - sys-apps/pcsc-lite and a compatible reader device;"
+ elog " - dev-libs/openct and a compatible reader device;"
+ elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+ elog ""
+ elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+ elog "app-crypt/ccid first."
+ fi
+
+ ewarn "Please remember to restart gpg-agent if a different version"
+ ewarn "of the agent is currently used. If you are unsure of the gpg"
+ ewarn "agent you are using please run 'killall gpg-agent',"
+ ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ elog "If upgrading from a version prior than 2.1 you might have to re-import"
+ elog "secret keys after restarting the gpg-agent as the new version is using"
+ elog "a new storage mechanism."
+ elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
+ fi
+}
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
new file mode 100644
index 000000000000..de969bccd57d
--- /dev/null
+++ b/app-crypt/gnupg/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <longdescription>
+ GnuPG is a complete and free implementation of the OpenPGP standard as
+ defined by RFC4880.
+ </longdescription>
+ <use>
+ <flag name='smartcard' restrict='&lt;app-crypt/gnupg-2.0.17-r1'>
+ Bring in <pkg>dev-libs/libusb</pkg> as a dependency; enable
+ scdaemon.
+ </flag>
+ <flag name='smartcard' restrict='&gt;=app-crypt/gnupg-2.0.17-r1'>
+ Build scdaemon software. Enables usage of OpenPGP cards. For
+ other type of smartcards, try
+ <pkg>app-crypt/gnupg-pkcs11-scd</pkg>.
+ </flag>
+ <flag name='usb' restrict='&gt;=app-crypt/gnupg-2.0.17-r1'>
+ Build direct CCID access for scdaemon; requires
+ <pkg>dev-libs/libusb</pkg>.
+ </flag>
+ <flag name='mta'>
+ Build mta support using
+ <pkg>virtual/mta</pkg>.
+ </flag>
+ <flag name='tools'>
+ Install extra tools.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/app-crypt/gorilla/Manifest b/app-crypt/gorilla/Manifest
new file mode 100644
index 000000000000..b4cc079b4a5b
--- /dev/null
+++ b/app-crypt/gorilla/Manifest
@@ -0,0 +1 @@
+DIST gorilla-1.4.tar.gz 190766 SHA256 3184ff802d0f96250302e2ce1a966d5eca328e8e0becc44e037208af32ee0551 SHA512 56328068506309e99f9bc8b095048840eabacb794c742b36c4b855501d2973646e6e5ef7755f0aa29e636c5f5463fa1b24f0f627cb691511e4a48e1f062ce44b WHIRLPOOL 63b94f0daad92bb734c4319f82b0606ab990a552902f38a6c11a64da7917d000bf43b72a2754d2b72d310e57cffdbcbdcf9427d4c030343cb76cf588629fa57c
diff --git a/app-crypt/gorilla/files/gorilla-script-destdir.patch b/app-crypt/gorilla/files/gorilla-script-destdir.patch
new file mode 100644
index 000000000000..e18fcd80e3ec
--- /dev/null
+++ b/app-crypt/gorilla/files/gorilla-script-destdir.patch
@@ -0,0 +1,17 @@
+--- gorilla-1.4/gorilla.in 2006-07-14 13:29:33.000000000 -0400
++++ gorilla-1.4/gorilla.in.new 2006-07-14 13:33:01.000000000 -0400
+@@ -1,10 +1,13 @@
+ #! /bin/sh
+ # the next line restarts using wish \
+ exec @wish@ "$0" ${1+"$@"}
++
+ set myName [info script]
++set myGorilla /opt/gorilla-1.4/gorilla.tcl
++
+ if {![catch {
+ set linkName [file readlink $myName]
+ }]} {
+ set myName $linkName
+ }
+-source [file join [file dirname $myName] gorilla.tcl]
++source [file join [file dirname $myName] $myGorilla]
diff --git a/app-crypt/gorilla/gorilla-1.4-r1.ebuild b/app-crypt/gorilla/gorilla-1.4-r1.ebuild
new file mode 100644
index 000000000000..e90c85863895
--- /dev/null
+++ b/app-crypt/gorilla/gorilla-1.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Password Safe in secure way with GUI interface"
+HOMEPAGE="https://github.com/zdia/gorilla/wiki"
+SRC_URI="https://github.com/zdia/gorilla/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+ >=dev-lang/tcl-8.4.19:0
+ >=dev-lang/tk-8.4.19:0
+ dev-tcltk/iwidgets
+ dev-tcltk/bwidget"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-script-destdir.patch
+}
+
+src_configure() {
+ ./configure || die "econf failed"
+}
+src_compile() { :; }
+
+src_install() {
+ PREFIX="/opt/${P}"
+
+ insinto ${PREFIX}
+ doins -r gorilla.tcl isaac.tcl twofish sha1 blowfish pwsafe pics
+
+ dobin gorilla
+}
diff --git a/app-crypt/gorilla/metadata.xml b/app-crypt/gorilla/metadata.xml
new file mode 100644
index 000000000000..a7e9dbdcf257
--- /dev/null
+++ b/app-crypt/gorilla/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">zdia/gorilla</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/gpa/Manifest b/app-crypt/gpa/Manifest
new file mode 100644
index 000000000000..6a03751b776a
--- /dev/null
+++ b/app-crypt/gpa/Manifest
@@ -0,0 +1,4 @@
+DIST gpa-0.9.4.tar.bz2 730440 SHA256 444de33735cec227f65549ea7bdca4526ead9f464e99903636902ca85f80cfba SHA512 60fd4d49a23d00dd87f3ab025fc2721c4d61fa73710525e7f99921aae52fe192bd909b9041d4664f476862922a4ffaafb691475b2f0d83f8cde7450b6c0aab82 WHIRLPOOL aa366d512bc131b6f0f6e5859805fbad6413a112f4c2dd1752567a075a37f502c4ed0b00dc02235d9f8ffaf93538560d6226db16b253496e873bb08708d3140b
+DIST gpa-0.9.5.tar.bz2 732748 SHA256 55e77c0d34a7e0cef8af9a245af8697779b1cb071fea604dd80f24d78e7f30f3 SHA512 16dbc8ff9c37e435540f5770f8343b2a40ad851b64024459ca356fc33e2bc3a3fe10e626b9bab2a79553ca5eab6097a6619b8551bf04478b6ca63aecf5fa1543 WHIRLPOOL 255f0227507000b62571de6d26e43c86006096da00e8c55390b1b7ae52d0c9af810ff159c108290145f1155b3b2ca5842dd3ae114c63e03a3bf8502fbdcbd096
+DIST gpa-0.9.6.tar.bz2 734881 SHA256 81fa52a6c24f8ec1538145823866b3b9e1f058ae7cb2ae915e3d7037218e3fa7 SHA512 7cf949534483ab8c307fdb0744aa83c8e7e4a36a6e84e3c15e0051c641ba0cfb6d7def1af3511e13d9d3ec137821db4a42c8a6f9bd316b2905d18c0a82b3948c WHIRLPOOL 1f6681481820db48dc2acba572ebd8c00386cd90faf9862a28581bd78f5f2b57e21520552e51a192b39e8ce56439bfbcc808c7002d00f3fc99250b8028f373f7
+DIST gpa-0.9.7.tar.bz2 734750 SHA256 7e8ccb615e8fab15808cedc6fc5f60e284d4fbca8a4a0569aa6219c3ddb617e5 SHA512 59a4e1bc77e1f4f6b8cd160803676dda5d0deb6e49b5c8bf8e4c05fc810e8138a1933b496f214e4e85407dac21d1c034cf43f3fc30633ed74f29221a0f4ea2f3 WHIRLPOOL be47cc166164fb689da2b1f04fb768af607a99917ce11cba7d279d14a899616f3761abe758a61a0218dc956d2c96a10ff002430eb6b571ac822fdc4476e0f337
diff --git a/app-crypt/gpa/gpa-0.9.4.ebuild b/app-crypt/gpa/gpa-0.9.4.ebuild
new file mode 100644
index 000000000000..4b841e9448ff
--- /dev/null
+++ b/app-crypt/gpa/gpa-0.9.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
+HOMEPAGE="http://gpa.wald.intevation.org"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE_LINGUAS=" ar cs de es fr ja nl pl pt_BR ru sv tr zh_TW"
+IUSE="nls ${IUSE_LINGUAS// / linguas_}"
+
+RDEPEND=">=x11-libs/gtk+-2.10.0:2
+ >=dev-libs/libgpg-error-1.4
+ >=dev-libs/libassuan-1.1.0
+ >=app-crypt/gnupg-2
+ >=app-crypt/gpgme-1.2.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ sed -i 's/Application;//' gpa.desktop
+}
+
+src_configure() {
+ econf \
+ --with-gpgme-prefix=/usr \
+ --with-libassuan-prefix=/usr \
+ $(use_enable nls) \
+ GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
+}
diff --git a/app-crypt/gpa/gpa-0.9.5.ebuild b/app-crypt/gpa/gpa-0.9.5.ebuild
new file mode 100644
index 000000000000..83611ba06265
--- /dev/null
+++ b/app-crypt/gpa/gpa-0.9.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
+HOMEPAGE="http://gpa.wald.intevation.org"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE_LINGUAS=" ar cs de es fr ja nl pl pt_BR ru sv tr zh_TW"
+IUSE="nls ${IUSE_LINGUAS// / linguas_}"
+
+RDEPEND=">=x11-libs/gtk+-2.10.0:2
+ >=dev-libs/libgpg-error-1.4
+ >=dev-libs/libassuan-1.1.0
+ >=app-crypt/gnupg-2
+ >=app-crypt/gpgme-1.5.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ sed -i 's/Application;//' gpa.desktop
+}
+
+src_configure() {
+ econf \
+ --with-gpgme-prefix=/usr \
+ --with-libassuan-prefix=/usr \
+ $(use_enable nls) \
+ GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
+}
diff --git a/app-crypt/gpa/gpa-0.9.6.ebuild b/app-crypt/gpa/gpa-0.9.6.ebuild
new file mode 100644
index 000000000000..83611ba06265
--- /dev/null
+++ b/app-crypt/gpa/gpa-0.9.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
+HOMEPAGE="http://gpa.wald.intevation.org"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE_LINGUAS=" ar cs de es fr ja nl pl pt_BR ru sv tr zh_TW"
+IUSE="nls ${IUSE_LINGUAS// / linguas_}"
+
+RDEPEND=">=x11-libs/gtk+-2.10.0:2
+ >=dev-libs/libgpg-error-1.4
+ >=dev-libs/libassuan-1.1.0
+ >=app-crypt/gnupg-2
+ >=app-crypt/gpgme-1.5.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ sed -i 's/Application;//' gpa.desktop
+}
+
+src_configure() {
+ econf \
+ --with-gpgme-prefix=/usr \
+ --with-libassuan-prefix=/usr \
+ $(use_enable nls) \
+ GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
+}
diff --git a/app-crypt/gpa/gpa-0.9.7.ebuild b/app-crypt/gpa/gpa-0.9.7.ebuild
new file mode 100644
index 000000000000..83611ba06265
--- /dev/null
+++ b/app-crypt/gpa/gpa-0.9.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
+HOMEPAGE="http://gpa.wald.intevation.org"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE_LINGUAS=" ar cs de es fr ja nl pl pt_BR ru sv tr zh_TW"
+IUSE="nls ${IUSE_LINGUAS// / linguas_}"
+
+RDEPEND=">=x11-libs/gtk+-2.10.0:2
+ >=dev-libs/libgpg-error-1.4
+ >=dev-libs/libassuan-1.1.0
+ >=app-crypt/gnupg-2
+ >=app-crypt/gpgme-1.5.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ sed -i 's/Application;//' gpa.desktop
+}
+
+src_configure() {
+ econf \
+ --with-gpgme-prefix=/usr \
+ --with-libassuan-prefix=/usr \
+ $(use_enable nls) \
+ GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
+}
diff --git a/app-crypt/gpa/metadata.xml b/app-crypt/gpa/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/app-crypt/gpa/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/gpg-ringmgr/Manifest b/app-crypt/gpg-ringmgr/Manifest
new file mode 100644
index 000000000000..2840f6a8cc45
--- /dev/null
+++ b/app-crypt/gpg-ringmgr/Manifest
@@ -0,0 +1 @@
+DIST gpg-ringmgr 9378 SHA256 acbd407b5859c13095e0a77ca206a2d6119722140137e9b9208a64be54b2b16a SHA512 f6aedf0db58c15163f6f08b37a5fef43a80655f5602d8ee856764177a33e2f5eb4c0b8a09e9f3ee5b36544039051909d48397be5793243eba5002526652dd194 WHIRLPOOL b558d8166657a709d3e8b5cb37e72086c2a19ea795ed4bbd713e1ab280307e2a42eeec7b0f380a91b32cb307fc493845c85283950f3beec8a3156b96b3e1ef6b
diff --git a/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12.ebuild b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12.ebuild
new file mode 100644
index 000000000000..cb24cce7884a
--- /dev/null
+++ b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="GPG Keyring Manager to handle large GPG keyrings more easily"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
+IUSE=""
+
+DEPEND="dev-lang/perl
+ >=app-crypt/gnupg-1.2.1"
+
+src_unpack() {
+ mkdir ${P}
+ cp "${DISTDIR}"/${PN} "${S}" || die
+}
+
+src_compile() {
+ pod2man "${S}"/${PN} >"${S}/"${PN}.1
+ pod2html "${S}"/${PN} >"${S}"/${PN}.html
+}
+
+src_install() {
+ dobin ${PN} || die
+ doman ${PN}.1
+ dohtml ${PN}.html
+}
diff --git a/app-crypt/gpg-ringmgr/metadata.xml b/app-crypt/gpg-ringmgr/metadata.xml
new file mode 100644
index 000000000000..a732fd8b2f03
--- /dev/null
+++ b/app-crypt/gpg-ringmgr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
new file mode 100644
index 000000000000..0dd3131e6b8c
--- /dev/null
+++ b/app-crypt/gpgme/Manifest
@@ -0,0 +1 @@
+DIST gpgme-1.5.5.tar.bz2 976383 SHA256 0b3d3d5107680c594777aae65882a1ff6dd1ba629a83432e719c8b82a743c207 SHA512 a01b84c1ae2a7c647b2de793fc05d39c4bf4a2d1b7378934e437857823f11ca9e9c1f3b32302d69a3a84d0be1fee1e1c86874355031b8fa6b40f4ad56ecc72ad WHIRLPOOL f3ad4282a254cf1ab8d01184df787a773fa7963a42157da93bee11430263fa86166f12f051e2b11d13be99ce1f0939d565cb02a8fba93ab6afed73ca7b2c0041
diff --git a/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch
new file mode 100644
index 000000000000..dc921eec4056
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch
@@ -0,0 +1,11 @@
+--- ./gpgme-1.1.8/src/gpgme-config.in.orig 2009-03-08 10:25:48.000000000 +1100
++++ ./gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:35:53.000000000 +1100
+@@ -64,7 +64,7 @@
+ while test $# -gt 0; do
+ case "$1" in
+ -*=*)
+- optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
++ optarg=`echo "$1" | sed 's/[-_[:alnum:]]*=//'`
+ ;;
+ *)
+ optarg=
diff --git a/app-crypt/gpgme/gpgme-1.5.5.ebuild b/app-crypt/gpgme/gpgme-1.5.5.ebuild
new file mode 100644
index 000000000000..a821649bb462
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.5.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils libtool
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs"
+
+DEPEND="app-crypt/gnupg
+ >=dev-libs/libassuan-2.0.2
+ >=dev-libs/libgpg-error-1.11"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.1.8-et_EE.patch
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --includedir="${EPREFIX}/usr/include/gpgme" \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+
+ if ! use common-lisp; then
+ rm -fr "${ED}usr/share/common-lisp"
+ fi
+}
diff --git a/app-crypt/gpgme/metadata.xml b/app-crypt/gpgme/metadata.xml
new file mode 100644
index 000000000000..780611be23d4
--- /dev/null
+++ b/app-crypt/gpgme/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <use>
+ <flag name="common-lisp">Install common-lisp files</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-crypt/gpgstats/Manifest b/app-crypt/gpgstats/Manifest
new file mode 100644
index 000000000000..efbda2052db1
--- /dev/null
+++ b/app-crypt/gpgstats/Manifest
@@ -0,0 +1 @@
+DIST gpgstats-0.5.tgz 6691 SHA256 beb3c5037b27e1edf10c47ceefaebb39c7f75b42b376a03ba3d43d2e219676d8 SHA512 273f08af37089eb43cee65fa06ff8023e1951fa4649bf208e01d6bc453e4131c11128b511c6cbd8396a7bd93722904e8930168656994e3d4d055024c3d5fb649 WHIRLPOOL be8d7a3d905ecf18a52e528d9c450c95900d1175b62ea2c6c708829f6fe230b1f67e75160049a3419c6c8933e14dfd3b33372d8913b9fa71a3f9150e7db4a63b
diff --git a/app-crypt/gpgstats/files/gpgstats-0.5-flags.patch b/app-crypt/gpgstats/files/gpgstats-0.5-flags.patch
new file mode 100644
index 000000000000..018d97390c65
--- /dev/null
+++ b/app-crypt/gpgstats/files/gpgstats-0.5-flags.patch
@@ -0,0 +1,25 @@
+--- Makefile
++++ Makefile
+@@ -1,16 +1,18 @@
+ VERSION=0.5
+
+ DEBUG=-g # -fprofile-arcs -ftest-coverage # -pg -g
+-CXXFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG) `gpgme-config --cflags`
+-CFLAGS+=${CXXFLAGS}
+-LDFLAGS=-lstdc++ `gpgme-config --libs` $(DEBUG)
++CPPFLAGS+=-DVERSION=\"${VERSION}\" -D_FILE_OFFSET_BITS=64
++FLAGS+=-Wall $(DEBUG) `gpgme-config --cflags`
++CFLAGS+=${FLAGS}
++CXXFLAGS+=${FLAGS}
++LIBS=`gpgme-config --libs`
+
+ OBJS=error.o utils.o array.o iarray.o s.o
+
+ all: gpgstats
+
+ gpgstats: $(OBJS)
+- $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o gpgstats
++ $(CXX) $(LDFLAGS) -Wall -W $(OBJS) -o gpgstats $(LIBS)
+
+ install: gpgstats
+ cp gpgstats /usr/bin
diff --git a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild b/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
new file mode 100644
index 000000000000..f10306f88613
--- /dev/null
+++ b/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="GPGstats calculates statistics on the keys in your key-ring"
+HOMEPAGE="http://www.vanheusden.com/gpgstats/"
+SRC_URI="http://www.vanheusden.com/gpgstats/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="app-crypt/gpgme"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-flags.patch"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" DEBUG= || die "emake failed"
+}
+
+src_install() {
+ dobin gpgstats || die "dobin gpgstas failed"
+}
diff --git a/app-crypt/gpgstats/metadata.xml b/app-crypt/gpgstats/metadata.xml
new file mode 100644
index 000000000000..f08d14f4a08f
--- /dev/null
+++ b/app-crypt/gpgstats/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+<maintainer>
+ <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/hashalot/Manifest b/app-crypt/hashalot/Manifest
new file mode 100644
index 000000000000..83f89ed94aa7
--- /dev/null
+++ b/app-crypt/hashalot/Manifest
@@ -0,0 +1 @@
+DIST hashalot-0.3.tar.gz 80284 SHA256 6015b8e519da6d2ca49bd21a417145ff982af35e6303176fce818189fd816967 SHA512 c9ee39cefce5cc73b9a3a67b240616db9b66cde94fa351e6ebd4d13fd0f9195de9021c07d223809107e50b0a091d0d55e4caf2f71bba93f6d0da86af10632145 WHIRLPOOL 5a2323c6acea1fc6b9014824b5c644f165f510e3bb4ab7ffd870836ff5d6122f11bb52c0ddcc3e38ff3a272f8e47d306d02e549c510408682801b2b9d1597266
diff --git a/app-crypt/hashalot/hashalot-0.3-r2.ebuild b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
new file mode 100644
index 000000000000..70cda643afd2
--- /dev/null
+++ b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="CryptoAPI utils"
+HOMEPAGE="http://www.kerneli.org/"
+SRC_URI="http://www.paranoiacs.org/~sluskyb/hacks/hashalot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND=""
+
+src_test() {
+ make check-TESTS || die
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "install error"
+ dodoc ChangeLog NEWS README
+}
diff --git a/app-crypt/hashalot/metadata.xml b/app-crypt/hashalot/metadata.xml
new file mode 100644
index 000000000000..96a2d586367d
--- /dev/null
+++ b/app-crypt/hashalot/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+</pkgmetadata>
diff --git a/app-crypt/hashcat-bin/Manifest b/app-crypt/hashcat-bin/Manifest
new file mode 100644
index 000000000000..cb3de87f63c7
--- /dev/null
+++ b/app-crypt/hashcat-bin/Manifest
@@ -0,0 +1,3 @@
+DIST hashcat-0.46.7z 1581813 SHA256 bf8ba2ef197199b3be156aa85fb5d085ebf5e29e76f18cf66e81830fe654e84f SHA512 e313af6e0edc27a7fbf93c89eda862579868b80c36b4c0237991321ebe55ca0bc5b62afe35eba7852212e97c28c5a07d73929a2a503a683bf3f2c9e8a6891a82 WHIRLPOOL 766b69a34e6ffbed22c1e23d0c1bb2a4073c431c9e5dfd6a640691d021d298e6a3de8a778eab6fd7a666f626feb1bea85a7fbf37ec88868dd21045732190ef9a
+DIST hashcat-0.47.7z 1651995 SHA256 239acb25b88d529314f2f98af0d6a66772e886c9efbb4ed2b94b7587c9a68455 SHA512 a43b3534fdb6fbe6bcb49d48430f13e77c7ead33da2dad281fd84aa8f0f7be28e30f938339f59a37d690deb7167d6d5ad9d29d987feb9528006483136642c934 WHIRLPOOL 75d0d3c9a26358a872c08e48fd24ea29c8bf85ce36e7cd6d04135e2a4ed6ab82f4df59a3855b84318784a12ff73775b30f82112c0840dd7f4dcd9ca168932b10
+DIST hashcat-0.49.7z 2423049 SHA256 02ca88393ecf33aaa0905592ca71e90671338c9540f212b3ad0f4666a93b406d SHA512 3e51a803c87de4f659ad3f72337234392140cd714a40eb221cb7697aa6f8df4da92ed7a7852deae5fdf36439c46fe4eaa312ed45a72dedbf13eaa6d9767e95bb WHIRLPOOL 5cbf4b4bca8371a47c5349a0e4ab825e7401a2363558eeeea9942d0652b133cc9fc11229e6ea676fbd6a179864abadfdfa5bb16a4fb9387ea74111d3ccda4bff
diff --git a/app-crypt/hashcat-bin/hashcat-bin-0.46.ebuild b/app-crypt/hashcat-bin/hashcat-bin-0.46.ebuild
new file mode 100644
index 000000000000..c865dff93d8d
--- /dev/null
+++ b/app-crypt/hashcat-bin/hashcat-bin-0.46.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P="hashcat-${PV}"
+
+inherit eutils pax-utils
+DESCRIPTION="An multi-threaded multihash cracker"
+HOMEPAGE="http://hashcat.net/hashcat/"
+
+SRC_URI="http://hashcat.net/files/${MY_P}.7z"
+
+#license applies to this version per http://hashcat.net/forum/thread-1348.html
+LICENSE="hashcat"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~amd64-linux ~x64-macos ~x86 ~x86-linux"
+
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ app-arch/p7zip"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/hashcat-cli*.bin
+ opt/${PN}/hashcat-cli64.app"
+
+has_xop() {
+ echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
+}
+
+has_avx() {
+ echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
+}
+
+src_install() {
+ dodoc docs/*
+ rm -r *.exe docs || die
+ use x86 || { rm hashcat-cli32.bin || die; }
+ use amd64 || { rm hashcat-cli64.bin || die; }
+ use x64-macos || { rm hashcat-cli64.app || die; }
+ has_avx || { rm hashcat-cliAVX.bin || die; }
+ has_xop || { rm hashcat-cliXOP.bin || die; }
+
+ #I assume this is needed but I didn't check
+ pax-mark m hashcat-cli*.bin
+
+ insinto /opt/${PN}
+ doins -r "${S}"/*
+
+ dodir /opt/bin
+ if [ -f "${ED}"/opt/${PN}/hashcat-cli32.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cli32.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cli32.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cli32.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cli32.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cli32.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cli64.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cli64.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cli64.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cli64.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cli64.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cli64.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cliAVX.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cliAVX.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cliAVX.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cliAVX.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cliAVX.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cliAVX.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cliXOP.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cliXOP.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cliXOP.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cliXOP.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cliXOP.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cliXOP.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cli64.app ]
+ then
+ fperms +x /opt/${PN}/hashcat-cli64.app
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cli64.app
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cli64.app is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cli64.app \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cli64.app
+ fi
+}
diff --git a/app-crypt/hashcat-bin/hashcat-bin-0.47.ebuild b/app-crypt/hashcat-bin/hashcat-bin-0.47.ebuild
new file mode 100644
index 000000000000..c69a1a039317
--- /dev/null
+++ b/app-crypt/hashcat-bin/hashcat-bin-0.47.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="hashcat-${PV}"
+
+inherit eutils pax-utils
+DESCRIPTION="An multi-threaded multihash cracker"
+HOMEPAGE="http://hashcat.net/hashcat/"
+
+SRC_URI="http://hashcat.net/files/${MY_P}.7z"
+
+#license applies to this version per http://hashcat.net/forum/thread-1348.html
+LICENSE="hashcat"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~amd64-linux ~x64-macos ~x86 ~x86-linux"
+
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ app-arch/p7zip"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/hashcat-cli*.bin
+ opt/${PN}/hashcat-cli64.app"
+
+has_xop() {
+ echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
+}
+
+has_avx() {
+ echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
+}
+
+src_install() {
+ dodoc docs/*
+ rm -r *.exe docs || die
+ use x86 || { rm hashcat-cli32.bin || die; }
+ use amd64 || { rm hashcat-cli64.bin || die; }
+ use x64-macos || { rm hashcat-cli64.app || die; }
+ has_avx || { rm hashcat-cliAVX.bin || die; }
+ has_xop || { rm hashcat-cliXOP.bin || die; }
+
+ #I assume this is needed but I didn't check
+ pax-mark m hashcat-cli*.bin
+
+ insinto /opt/${PN}
+ doins -r "${S}"/*
+
+ dodir /opt/bin
+ if [ -f "${ED}"/opt/${PN}/hashcat-cli32.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cli32.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cli32.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cli32.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cli32.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cli32.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cli64.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cli64.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cli64.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cli64.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cli64.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cli64.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cliAVX.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cliAVX.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cliAVX.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cliAVX.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cliAVX.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cliAVX.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cliXOP.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cliXOP.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cliXOP.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cliXOP.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cliXOP.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cliXOP.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cli64.app ]
+ then
+ fperms +x /opt/${PN}/hashcat-cli64.app
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cli64.app
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cli64.app is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cli64.app \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cli64.app
+ fi
+}
diff --git a/app-crypt/hashcat-bin/hashcat-bin-0.49.ebuild b/app-crypt/hashcat-bin/hashcat-bin-0.49.ebuild
new file mode 100644
index 000000000000..0e505aba9bb8
--- /dev/null
+++ b/app-crypt/hashcat-bin/hashcat-bin-0.49.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="hashcat-${PV}"
+
+inherit eutils pax-utils
+DESCRIPTION="An multi-threaded multihash cracker"
+HOMEPAGE="http://hashcat.net/hashcat/"
+
+SRC_URI="http://hashcat.net/files/${MY_P}.7z"
+
+#license applies to this version per http://hashcat.net/forum/thread-1348.html
+LICENSE="hashcat"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~amd64-linux ~x64-macos ~x86 ~x86-linux"
+
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ app-arch/p7zip"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/hashcat-cli*.bin
+ opt/${PN}/hashcat-cli64.app"
+
+has_xop() {
+ echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
+}
+
+has_avx() {
+ echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
+}
+
+src_install() {
+ dodoc docs/*
+ rm -r *.exe docs || die
+ use x86 || { rm hashcat-cli32.bin || die; }
+ use amd64 || { rm hashcat-cli64.bin || die; }
+ use x64-macos || { rm hashcat-cli64.app || die; }
+ has_avx || { rm hashcat-cliAVX.bin || die; }
+ has_xop || { rm hashcat-cliXOP.bin || die; }
+
+ #I assume this is needed but I didn't check
+ pax-mark m hashcat-cli*.bin
+
+ insinto /opt/${PN}
+ doins -r "${S}"/*
+
+ dodir /opt/bin
+ if [ -f "${ED}"/opt/${PN}/hashcat-cli32.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cli32.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cli32.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cli32.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cli32.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cli32.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cli64.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cli64.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cli64.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cli64.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cli64.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cli64.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cliAVX.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cliAVX.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cliAVX.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cliAVX.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cliAVX.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cliAVX.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cliXOP.bin ]
+ then
+ fperms +x /opt/${PN}/hashcat-cliXOP.bin
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cliXOP.bin
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cliXOP.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cliXOP.bin \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cliXOP.bin
+ fi
+ if [ -f "${ED}"/opt/${PN}/hashcat-cli64.app ]
+ then
+ fperms +x /opt/${PN}/hashcat-cli64.app
+ cat <<-EOF > "${ED}"/opt/bin/hashcat-cli64.app
+ #! /bin/sh
+ cd "${EPREFIX}"/opt/${PN}
+ echo "Warning: hashcat-cli64.app is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
+ exec ./hashcat-cli64.app \$@
+ EOF
+ fperms +x /opt/bin/hashcat-cli64.app
+ fi
+}
diff --git a/app-crypt/hashcat-bin/metadata.xml b/app-crypt/hashcat-bin/metadata.xml
new file mode 100644
index 000000000000..88e9eb110229
--- /dev/null
+++ b/app-crypt/hashcat-bin/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+<maintainer>
+<email>zerochaos@gentoo.org</email>
+<name>Rick Farina</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/app-crypt/hashcat-gui/Manifest b/app-crypt/hashcat-gui/Manifest
new file mode 100644
index 000000000000..b4af8931cac5
--- /dev/null
+++ b/app-crypt/hashcat-gui/Manifest
@@ -0,0 +1 @@
+DIST hashcat-gui-0.5.1.zip 130106 SHA256 d8294724ce6ea5980ba98f43e44be6dd706c0bffc56128d2cd0db3c71aedd0d3 SHA512 c9162aa812c31713e3b7cf844d1d80c894db551b0e92483da0f02bc0f1a0a85e9ca17396f756caf0da1a1bf1bda1c77d97bdcc6758b6348567f1b39c4eb2f688 WHIRLPOOL 021369adcebc7bbcb99a9b3411ff046d14a62878ad83fe97aa1e3b1c49bf37c98645bc65206901a6af0de0efcebe350e988552b97bc4cd4c515d1b625a65496f
diff --git a/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild b/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild
new file mode 100644
index 000000000000..eb3709065450
--- /dev/null
+++ b/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="A gui for the *hashcat* suite of tools"
+HOMEPAGE="https://github.com/scandium/hashcat-gui"
+
+SRC_URI="mirror://github/scandium/hashcat-gui/zipball/b6b01be723742ad89ba31fdb2c30b35306318f8b -> ${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cuda opencl"
+
+RDEPEND="app-crypt/hashcat-bin
+ cuda? ( app-crypt/oclhashcat-plus-bin
+ app-crypt/oclhashcat-lite-bin )
+ opencl? ( app-crypt/oclhashcat-plus-bin
+ app-crypt/oclhashcat-lite-bin )
+ dev-qt/qtgui:4
+ dev-qt/qtcore:4"
+
+DEPEND="dev-qt/qtgui:4
+ dev-qt/qtcore:4
+ app-arch/unzip"
+
+S="${WORKDIR}"/scandium-hashcat-gui-b6b01be/src
+
+src_prepare() {
+ sed -i 's#./hashcat#/opt/hashcat-bin#g' mainwindow.cpp || die
+ sed -i 's#./oclHashcat-plus#/opt/oclhashcat-plus-bin#g' mainwindow.cpp || die
+ sed -i 's#./oclHashcat-lite#/opt/oclhashcat-lite-bin#g' mainwindow.cpp || die
+}
+
+src_install() {
+ dobin hashcat-gui
+ cd "${WORKDIR}"/scandium-hashcat-gui-b6b01be || die
+ dodoc ChangeLog FAQ INSTALL README TODO
+}
diff --git a/app-crypt/hashcat-gui/metadata.xml b/app-crypt/hashcat-gui/metadata.xml
new file mode 100644
index 000000000000..0c85d8488350
--- /dev/null
+++ b/app-crypt/hashcat-gui/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <maintainer>
+ <email>zerochaos@gentoo.org</email>
+ <name>Rick Farina</name>
+ </maintainer>
+ <use>
+ <flag name="cuda">Install oclhashcat-{plus,lite}-bin to take advantage of hardware cuda support.</flag>
+ <flag name="opencl">Install oclhashcat-{plus,lite}-bin to take advantage of hardware opencl support.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">scandium/hashcat-gui</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
new file mode 100644
index 000000000000..e8322ee8ca31
--- /dev/null
+++ b/app-crypt/heimdal/Manifest
@@ -0,0 +1 @@
+DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19
diff --git a/app-crypt/heimdal/files/heimdal-kadmind.confd b/app-crypt/heimdal/files/heimdal-kadmind.confd
new file mode 100644
index 000000000000..5d75504a1402
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kadmind.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kadmind
+
+# Options to pass to the kadmind daemon. Please see man 8 kadmind for details.
+#
+# OPTIONS="--keytab=/etc/krb5.keytab"
diff --git a/app-crypt/heimdal/files/heimdal-kadmind.initd-r2 b/app-crypt/heimdal/files/heimdal-kadmind.initd-r2
new file mode 100644
index 000000000000..18d59709712d
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kadmind.initd-r2
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ use net heimdal-kdc
+ after logger
+}
+
+start() {
+ ebegin "Starting Heimdal kadmind"
+ /usr/sbin/kadmind "${OPTIONS}" &
+ echo $! > /var/run/heimdal-kadmind.pid
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Heimdal kadmind"
+ start-stop-daemon --stop --quiet --exec \
+ /usr/sbin/kadmind
+ eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal-kcm.confd b/app-crypt/heimdal/files/heimdal-kcm.confd
new file mode 100644
index 000000000000..8c156aa9b677
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kcm.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kcm
+
+# Options to pass to the kcm daemon. Please see man 8 kcm for details
+#
+# OPTIONS="-c /etc/krb5.conf"
diff --git a/app-crypt/heimdal/files/heimdal-kcm.initd-r1 b/app-crypt/heimdal/files/heimdal-kcm.initd-r1
new file mode 100644
index 000000000000..d35872a549bf
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kcm.initd-r1
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ after heimdal-kdc
+}
+
+OPTIONS="${OPTIONS} --detach"
+
+start() {
+ ebegin "Starting Heimdal KCM..."
+ start-stop-daemon --start --pidfile /var/run/kcm.pid --exec /usr/sbin/kcm -- ${OPTIONS# }
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Heimdal KCM..."
+ start-stop-daemon --stop --pidfile /var/run/kcm.pid --retry SIGKILL/5
+ eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal-kdc.confd b/app-crypt/heimdal/files/heimdal-kdc.confd
new file mode 100644
index 000000000000..d33f663feccd
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kdc.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kdc
+
+# Options to pass to the kdc daemon. Please see man 8 kdc for details
+#
+# OPTIONS="-c /etc/krb5.conf"
diff --git a/app-crypt/heimdal/files/heimdal-kdc.initd-r2 b/app-crypt/heimdal/files/heimdal-kdc.initd-r2
new file mode 100644
index 000000000000..cd04821c0827
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kdc.initd-r2
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ use net
+ after logger
+}
+
+OPTIONS="${OPTIONS} --detach"
+
+start() {
+ ebegin "Starting Heimdal kdc"
+ start-stop-daemon --start --quiet --exec \
+ /usr/sbin/kdc -- ${OPTIONS# }
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Heimdal kdc"
+ start-stop-daemon --stop --quiet --exec \
+ /usr/sbin/kdc
+ eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal-kpasswdd.confd b/app-crypt/heimdal/files/heimdal-kpasswdd.confd
new file mode 100644
index 000000000000..7a3e808a9715
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kpasswdd.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kpasswdd
+
+# Options to pass to the kpasswdd daemon. Please see man 8 kpasswdd for details.
+#
+# OPTIONS="-k /etc/krb5.keytab"
diff --git a/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r2 b/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r2
new file mode 100644
index 000000000000..2c66ab9fced2
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r2
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ use net heimdal-kdc
+ after logger
+}
+
+start() {
+ ebegin "Starting Heimdal kpasswdd"
+ start-stop-daemon --background --start --quiet --exec \
+ /usr/sbin/kpasswdd -- "${OPTIONS}"
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Heimdal kpasswdd"
+ start-stop-daemon --stop --quiet --exec \
+ /usr/sbin/kpasswdd
+ eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal_db6.patch b/app-crypt/heimdal/files/heimdal_db6.patch
new file mode 100644
index 000000000000..316cf1533791
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_db6.patch
@@ -0,0 +1,41 @@
+--- a/cf/db.m4
++++ b/cf/db.m4
+@@ -51,6 +51,8 @@ dnl db_create is used by db3 and db4 and db5
+ #include <stdio.h>
+ #ifdef HAVE_DBHEADER
+ #include <$dbheader/db.h>
++ #elif HAVE_DB6_DB_H
++ #include <db6/db.h>
+ #elif HAVE_DB5_DB_H
+ #include <db5/db.h>
+ #elif HAVE_DB4_DB_H
+--- a/lib/hdb/db3.c
++++ b/lib/hdb/db3.c
+@@ -276,7 +276,7 @@
+ }
+ db->hdb_db = d;
+
+-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode);
+ #else
+ ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode);
+@@ -284,7 +284,7 @@
+
+ if (ret == ENOENT) {
+ /* try to open without .db extension */
+-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE,
+ myflags, mode);
+ #else
+--- a/cf/db.m4
++++ b/cf/db.m4
+@@ -38,6 +38,7 @@ AS_IF([test "x$with_berkeley_db" != xno],
+ fi
+ ])],
+ [AC_CHECK_HEADERS([ \
++ db6/db.h \
+ db5/db.h \
+ db4/db.h \
+ db3/db.h \
diff --git a/app-crypt/heimdal/files/heimdal_disable-check-iprop.patch b/app-crypt/heimdal/files/heimdal_disable-check-iprop.patch
new file mode 100644
index 000000000000..703fc7c94d46
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_disable-check-iprop.patch
@@ -0,0 +1,16 @@
+diff --git a/tests/kdc/check-iprop.in b/tests/kdc/check-iprop.in
+index ba9aff1..0bea2ed 100644
+--- a/tests/kdc/check-iprop.in
++++ b/tests/kdc/check-iprop.in
+@@ -31,6 +31,11 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+
++# check-iprop is known to fail and there is no easy way out
++# http://article.gmane.org/gmane.comp.encryption.kerberos.heimdal.general/5408
++# http://article.gmane.org/gmane.comp.encryption.kerberos.heimdal.general/5409
++exit 77
++
+ top_builddir="@top_builddir@"
+ env_setup="@env_setup@"
+ objdir="@objdir@"
diff --git a/app-crypt/heimdal/files/heimdal_link_order.patch b/app-crypt/heimdal/files/heimdal_link_order.patch
new file mode 100644
index 000000000000..fdf6a0af9bc9
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_link_order.patch
@@ -0,0 +1,41 @@
+--- kadmin/Makefile.am.orig 2010-11-25 12:39:31.000000000 +0000
++++ kadmin/Makefile.am 2011-02-14 21:37:29.000000000 +0000
+@@ -64,10 +64,10 @@
+ $(top_builddir)/lib/krb5/libkrb5.la \
+ $(LIB_hcrypto) \
+ $(top_builddir)/lib/asn1/libasn1.la \
+- $(LIB_roken) \
+ $(DBLIB)
+
+ kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \
++ $(LIB_roken) \
+ ../lib/gssapi/libgssapi.la \
+ $(LDADD_common) \
+ $(LIB_pidfile) \
+@@ -78,12 +78,14 @@
+ $(top_builddir)/lib/kadm5/libkadm5srv.la \
+ $(top_builddir)/lib/sl/libsl.la \
+ $(LIB_readline) \
++ $(LIB_roken) \
+ $(LDADD_common) \
+ $(LIB_dlopen)
+
+ add_random_users_LDADD = \
+ $(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ $(top_builddir)/lib/kadm5/libkadm5srv.la \
++ $(LIB_roken) \
+ $(LDADD_common) \
+ $(LIB_dlopen)
+
+--- tests/plugin/check-pac.in.orig 2010-11-25 12:39:31.000000000 +0000
++++ tests/plugin/check-pac.in 2011-02-16 13:24:50.000000000 +0000
+@@ -62,7 +62,8 @@
+ test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req"
+
+ KRB5_CONFIG="${objdir}/krb5.conf"
+-export KRB5_CONFIG
++LD_PRELOAD="../../lib/roken/.libs/libroken.so"
++export KRB5_CONFIG LD_PRELOAD
+
+ rm -f ${keytabfile}
+ rm -f current-db*
diff --git a/app-crypt/heimdal/files/heimdal_missing-include.patch b/app-crypt/heimdal/files/heimdal_missing-include.patch
new file mode 100644
index 000000000000..e245cf8fff07
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_missing-include.patch
@@ -0,0 +1,11 @@
+--- base/test_base.c 2011-09-30 15:58:45.000000000 +0300
++++ base/test_base.c 2011-12-27 23:04:50.482955923 +0200
+@@ -39,6 +39,8 @@
+ #include "heimbase.h"
+ #include "heimbasepriv.h"
+
++#include <stdlib.h>
++
+ static void
+ memory_free(heim_object_t obj)
+ {
diff --git a/app-crypt/heimdal/files/heimdal_missing_symbols.patch b/app-crypt/heimdal/files/heimdal_missing_symbols.patch
new file mode 100644
index 000000000000..aa915fb130dd
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_missing_symbols.patch
@@ -0,0 +1,28 @@
+Add missing symbols. Cherry picked from upstream master.
+Bug #420821.
+
+--- a/lib/krb5/version-script.map 2012-01-10 21:53:51.000000000 +0000
++++ b/lib/krb5/version-script.map 2012-06-13 16:23:26.000000000 +0000
+@@ -42,6 +42,7 @@
+ krb5_auth_con_getrcache;
+ krb5_auth_con_getremoteseqnumber;
+ krb5_auth_con_getremotesubkey;
++ krb5_auth_con_getsendsubkey;
+ krb5_auth_con_init;
+ krb5_auth_con_removeflags;
+ krb5_auth_con_setaddrs;
+@@ -383,6 +384,14 @@
+ krb5_h_errno_to_heim_errno;
+ krb5_have_error_string;
+ krb5_hmac;
++ krb5_init_creds_init;
++ krb5_init_creds_set_service;
++ krb5_init_creds_set_keytab;
++ krb5_init_creds_get;
++ krb5_init_creds_set_password;
++ krb5_init_creds_free;
++ krb5_init_creds_get_creds;
++ krb5_init_creds_get_error;
+ krb5_init_context;
+ krb5_init_ets;
+ krb5_initlog;
diff --git a/app-crypt/heimdal/files/heimdal_texinfo-5.patch b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
new file mode 100644
index 000000000000..b16a90cefdb0
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
@@ -0,0 +1,28 @@
+--- a/doc/whatis.texi
++++ b/doc/whatis.texi
+@@ -35,10 +35,11 @@ services can authenticate each other.
+ @end macro
+ @end ifinfo
+
+-@tex
+-@def@xsub#1{$_{#1}$}
+-@global@let@sub=@xsub
+-@end tex
++@iftex
++@macro sub{arg}
++@textsubscript{\arg\}
++@end macro
++@end iftex
+
+ @ifhtml
+ @macro sub{arg}
+--- a/doc/win2k.texi
++++ b/doc/win2k.texi
+@@ -311,4 +311,5 @@ Other useful programs include these:
+
+ @itemize @bullet
+ @item pwdump2
+-@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize
++@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}
++@end itemize
+
diff --git a/app-crypt/heimdal/files/heimdal_tinfo.patch b/app-crypt/heimdal/files/heimdal_tinfo.patch
new file mode 100644
index 000000000000..010a9037c7e6
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_tinfo.patch
@@ -0,0 +1,22 @@
+--- heimdal-1.5/configure.ac.orig 2011-08-01 12:49:33.554689000 +0200
++++ heimdal-1.5/configure.ac 2011-08-01 13:54:12.707009421 +0200
+@@ -444,7 +444,7 @@
+ #endif
+ ],[0,0,0,0,0])
+
+-AC_FIND_FUNC_NO_LIBS(tgetent, termcap ncurses curses,[
++AC_FIND_FUNC_NO_LIBS(tgetent, tinfo ncurses curses termcap,[
+ #ifdef HAVE_TERMCAP_H
+ #include <termcap.h>
+ #endif
+--- heimdal-1.5/lib/libedit/configure.ac~ 2011-07-30 22:43:29.000000000 +0200
++++ heimdal-1.5/lib/libedit/configure.ac 2011-08-01 13:54:30.657009419 +0200
+@@ -33,7 +33,7 @@
+ EL_MANTYPE
+
+
+-AC_CHECK_LIB(curses, tgetent,,
++AC_CHECK_LIB(tinfo, tgetent,,
+ [AC_CHECK_LIB(ncurses, tgetent,,
+ [AC_MSG_ERROR([libcurses or libncurses are required!])] )] )
+
diff --git a/app-crypt/heimdal/files/krb5.conf b/app-crypt/heimdal/files/krb5.conf
new file mode 100644
index 000000000000..906eb4d087d0
--- /dev/null
+++ b/app-crypt/heimdal/files/krb5.conf
@@ -0,0 +1,27 @@
+[libdefaults]
+ default_realm = MY.REALM
+# clockskew = 300
+# v4_instance_resolve = false
+# v4_name_convert = {
+# host = {
+# rcmd = host
+# ftp = ftp
+# }
+# plain = {
+# something = something-else
+# }
+# }
+
+[realms]
+ MY.REALM = {
+ kdc = MY.COMPUTER
+ }
+# OTHER.REALM = {
+# v4_instance_convert = {
+# kerberos = kerberos
+# computer = computer.some.other.domain
+# }
+# }
+
+[domain_realm]
+ .my.domain = MY.REALM
diff --git a/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild b/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild
new file mode 100644
index 000000000000..21853f9d4959
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+VIRTUALX_REQUIRED="manual"
+
+inherit autotools db-use eutils multilib multilib-minimal python-any-r1 toolchain-funcs virtualx flag-o-matic
+
+MY_P="${P}"
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs threads test X"
+
+CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] )
+ !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+ caps? ( sys-libs/libcap-ng )
+ >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+ >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+ sys-libs/ncurses
+ >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
+ afs? ( net-fs/openafs )
+ hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+ X? ( x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXt )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+ !!app-crypt/mit-krb5
+ !!app-crypt/mit-krb5-appl"
+
+DEPEND="${CDEPEND}
+ ${PYTHON_DEPS}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ >=sys-devel/autoconf-2.62
+ test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-kerberos )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/krb5-types.h
+ /usr/include/cms_asn1.h
+ /usr/include/digest_asn1.h
+ /usr/include/hdb_asn1.h
+ /usr/include/krb5_asn1.h
+ /usr/include/pkcs12_asn1.h
+ /usr/include/pkinit_asn1.h
+ /usr/include/rfc2459_asn1.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/krb5-config
+)
+
+src_prepare() {
+ epatch "${FILESDIR}/heimdal_missing-include.patch"
+ epatch "${FILESDIR}/heimdal_db6.patch"
+ epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
+ epatch "${FILESDIR}/heimdal_link_order.patch"
+ epatch "${FILESDIR}/heimdal_missing_symbols.patch"
+ epatch "${FILESDIR}/heimdal_texinfo-5.patch"
+ epatch "${FILESDIR}/heimdal_tinfo.patch"
+ eautoreconf
+}
+
+src_configure() {
+ # QA
+ append-flags -fno-strict-aliasing
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=()
+ if use berkdb; then
+ myconf+=(
+ --with-berkeley-db
+ --with-berkeley-db-include="$(db_includedir)"
+ )
+ else
+ myconf+=(
+ --without-berkeley-db
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --enable-kcm \
+ --disable-osfc2 \
+ --enable-shared \
+ --with-libintl=/usr \
+ --with-readline=/usr \
+ --with-sqlite3=/usr \
+ --libexecdir=/usr/sbin \
+ $(use_enable afs afs-support) \
+ $(use_enable otp) \
+ $(use_enable pkinit kx509) \
+ $(use_enable pkinit pk-init) \
+ $(use_enable static-libs static) \
+ $(use_enable threads pthread-support) \
+ $(multilib_native_use_with caps capng) \
+ $(multilib_native_use_with hdb-ldap openldap /usr) \
+ $(use_with ipv6) \
+ $(use_with ssl openssl /usr) \
+ $(multilib_native_use_with X x) \
+ "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ emake -j1
+ else
+ emake -C include -j1
+ emake -C base -j1
+ emake -C lib -j1
+ emake -C kdc -j1
+ emake -C tools -j1
+ emake -C tests/plugin -j1
+ fi
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
+ else
+ emake -C include DESTDIR="${D}" install
+ emake -C base DESTDIR="${D}" install
+ emake -C lib DESTDIR="${D}" install
+ emake -C kdc DESTDIR="${D}" install
+ emake -C tools DESTDIR="${D}" install
+ emake -C tests/plugin DESTDIR="${D}" install
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc ChangeLog README NEWS TODO
+
+ # Begin client rename and install
+ for i in {telnetd,ftpd,rshd,popper}
+ do
+ mv "${D}"/usr/share/man/man8/{,k}${i}.8
+ mv "${D}"/usr/sbin/{,k}${i}
+ done
+
+ for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
+ do
+ mv "${D}"/usr/share/man/man1/{,k}${i}.1
+ mv "${D}"/usr/bin/{,k}${i}
+ done
+
+ mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
+ mv "${D}"/usr/share/man/man5/{,k}login.access.5
+
+ newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
+ newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
+ newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
+ newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
+
+ newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
+ newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
+ newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
+ newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
+
+ insinto /etc
+ newins "${FILESDIR}"/krb5.conf krb5.conf.example
+
+ if use hdb-ldap; then
+ insinto /etc/openldap/schema
+ doins "${S}/lib/hdb/hdb.schema"
+ fi
+
+ prune_libtool_files
+
+ # default database dir
+ keepdir /var/heimdal
+
+ # Ugly hack for broken symlink - bug #417081
+ rm "${D}"/usr/share/man/man5/qop.5 || die
+ dosym mech.5 /usr/share/man/man5/qop.5
+}
diff --git a/app-crypt/heimdal/metadata.xml b/app-crypt/heimdal/metadata.xml
new file mode 100644
index 000000000000..4fcd8e4919c8
--- /dev/null
+++ b/app-crypt/heimdal/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kerberos</herd>
+<longdescription>Kerberos 5 implementation from KTH</longdescription>
+<use>
+ <flag name='otp'>
+ Adds support for one-time passwords
+ </flag>
+ <flag name='pkinit'>
+ Adds support for PKINIT for the initial ticket
+ </flag>
+ <flag name='hdb-ldap'>
+ Adds support for LDAP as a database backend
+ </flag>
+</use>
+</pkgmetadata>
diff --git a/app-crypt/hmaccalc/Manifest b/app-crypt/hmaccalc/Manifest
new file mode 100644
index 000000000000..a3d6cd1cdc8f
--- /dev/null
+++ b/app-crypt/hmaccalc/Manifest
@@ -0,0 +1 @@
+DIST hmaccalc-0.9.13.tar.gz 106979 SHA256 9a00b507555e45f58c1659d28f4d27e63373735a30cfe70e2c939f679cd266cc SHA512 899e95dcebf85dbb64ea543d530e3819c2dd72dfbdc1f06e7f37418f9045a8018c49ace96c6090e08b18406edc3efa196ea9fcd9b7b8d8e151f80b2eaba512c0 WHIRLPOOL 7af722b3875656113f7a7fa67a9e9bf2014b1b2873cf601f512dd361a40894fae94c667c06ec5f16291df459ea8c8d4634f828645d62eb6560350b22cd684506
diff --git a/app-crypt/hmaccalc/hmaccalc-0.9.13.ebuild b/app-crypt/hmaccalc/hmaccalc-0.9.13.ebuild
new file mode 100644
index 000000000000..1f4793401784
--- /dev/null
+++ b/app-crypt/hmaccalc/hmaccalc-0.9.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib
+
+DESCRIPTION="Tools for computing and checking HMAC values for files"
+HOMEPAGE="https://fedorahosted.org/hmaccalc/"
+SRC_URI="https://fedorahosted.org/released/hmaccalc/hmaccalc-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fips"
+
+DEPEND="dev-libs/nss
+ sys-devel/prelink"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf \
+ --enable-sum-directory=/usr/$(get_libdir)/${PN}/ \
+ $(use_enable !fips non-fips) \
+ || die "econf failed"
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die "emake install failed"
+ dodoc README
+}
diff --git a/app-crypt/hmaccalc/metadata.xml b/app-crypt/hmaccalc/metadata.xml
new file mode 100644
index 000000000000..c31b239a1d76
--- /dev/null
+++ b/app-crypt/hmaccalc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+<use>
+<flag name="fips">Enable NSS FIPS mode and support only the FIPS-compliant functions</flag>
+</use>
+<longdescription>
+hmaccalc can be used to compute HMAC (hash-based message authentication code)
+values for files. An HMAC is similar in concept to a message digest, except in
+that its calculation also incorporates a key which must be known to both the
+party generating the HMAC and the party verifying the HMAC.
+</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/ima-evm-utils/Manifest b/app-crypt/ima-evm-utils/Manifest
new file mode 100644
index 000000000000..58e6011e48a5
--- /dev/null
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -0,0 +1,2 @@
+DIST ima-evm-utils-0.2.tar.gz 16329 SHA256 ca8c238562c205f265ff76db7af15df90eea7335db82f6c2fe82def34315aba6 SHA512 44d5ead01d0d1241d743a8545a619308a1988f2188384571d7d37dca567598f46d1d7d8b8a6ba3fdaf5b5e980f4c8a80f1c098ec4dadf082393a727f7a266229 WHIRLPOOL db21f3cddd0f21f23605c3abed0b2ea9f864b63c7715605bdd24c0345527923d51684f57c7d0b18a6eb5590882530e2f13d52aa3d908353d3c69657b4e499a32
+DIST ima-evm-utils-0.8.tar.gz 32025 SHA256 4d9b467ba31305dd815c56ddda5969db45133c7bd14f4a5356df58ed35221cf1 SHA512 cfa90963426c9adfaa3b61e31c1b63d87407a1dfadd39d4c00f5c16b2b312d7535159c84c7f1854bb143147b5b097ef41dde22f8bba30555eecd8ed0255f3630 WHIRLPOOL 32d47f8f23d4a28ae96178ac443ce9ddff102ccfded22f06796ad23bdff375272cc3f2d4c92eb6bc2d5b9df92fde45e5af4161f20ea9eb1ebc8e0ef2c5c83005
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-0.2.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-0.2.ebuild
new file mode 100644
index 000000000000..d99d1591aa05
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Supporting tools for IMA and EVM"
+HOMEPAGE="http://linux-ima.sourceforge.net"
+SRC_URI="mirror://sourceforge/linux-ima/${P}.tar.gz"
+
+DEPEND="sys-apps/keyutils"
+RDEPEND="${DEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ sed -i 's:pkglib_PROGRAMS:pkglibexec_PROGRAMS:g' tests/Makefile.am
+ sed -i 's:pkglib_SCRIPTS:pkglibexec_SCRIPTS:g' tests/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ econf || die
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+}
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-0.8.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-0.8.ebuild
new file mode 100644
index 000000000000..70bd50516567
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-0.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Supporting tools for IMA and EVM"
+HOMEPAGE="http://linux-ima.sourceforge.net"
+SRC_URI="mirror://sourceforge/linux-ima/${P}.tar.gz"
+
+DEPEND="sys-apps/keyutils"
+RDEPEND="${DEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ sed -i 's:pkglib_PROGRAMS:pkglibexec_PROGRAMS:g' tests/Makefile.am
+ sed -i 's:pkglib_SCRIPTS:pkglibexec_SCRIPTS:g' tests/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ econf || die
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+}
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
new file mode 100644
index 000000000000..f46ca06ee74c
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://linux-ima.git.sourceforge.net/gitroot/linux-ima/ima-evm-utils.git"
+EGIT_BOOTSTRAP="autogen.sh"
+
+inherit git-2 eutils
+
+DESCRIPTION="Supporting tools for IMA and EVM"
+HOMEPAGE="http://linux-ima.sourceforge.net"
+SRC_URI=""
+
+DEPEND="sys-apps/keyutils"
+RDEPEND="${DEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
diff --git a/app-crypt/ima-evm-utils/metadata.xml b/app-crypt/ima-evm-utils/metadata.xml
new file mode 100644
index 000000000000..5f04ab17905c
--- /dev/null
+++ b/app-crypt/ima-evm-utils/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>hardened</herd>
+<maintainer>
+<email>swift@gentoo.org</email>
+<name>Sven Vermeulen</name>
+<description>Maintainer</description>
+</maintainer>
+<longdescription lang="en">
+Supporting tools for IMA and EVM
+</longdescription>
+</pkgmetadata>
+
diff --git a/app-crypt/jacksum/Manifest b/app-crypt/jacksum/Manifest
new file mode 100644
index 000000000000..4261abae7294
--- /dev/null
+++ b/app-crypt/jacksum/Manifest
@@ -0,0 +1 @@
+DIST jacksum-1.7.0.zip 446595 SHA256 c6e2136b7adfc0ee78c273fdd0ddf7e2fc5741a5bdf46ff3c01aeff2bee519cf SHA512 dc3f96e39fed4f2ca3a7b41bd8a6685cf96673293ff12f3858707a2d61144d74fb89db0218ed1a04164173e2d7fa6d1b973b68ca4c138213ca7f03e03628f21b WHIRLPOOL ef9ac6f701e31f1ac5d9d485f47b03a576c53c0101d0bc2fce414e24cb186a14387eb96a6104013f913d55e7b49fa97fcd35d3e8439a64fa4cd68a9a266f2990
diff --git a/app-crypt/jacksum/jacksum-1.7.0.ebuild b/app-crypt/jacksum/jacksum-1.7.0.ebuild
new file mode 100644
index 000000000000..cba79beedac4
--- /dev/null
+++ b/app-crypt/jacksum/jacksum-1.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java utility for computing and verifying checksums: CRC*, MD*, RIPEMD*, SHA*, TIGER*, WHIRLPOOL"
+HOMEPAGE="http://www.jonelo.de/java/jacksum/"
+SRC_URI="mirror://sourceforge/jacksum/${P}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+DEPEND=">=virtual/jdk-1.3.1
+ dev-java/ant-core
+ app-arch/unzip"
+RDEPEND=">=virtual/jre-1.3.1"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ unzip -qq source/${PN}-src.zip || die "failed to unpack source"
+ rm *.jar
+}
+
+src_install() {
+ java-pkg_dojar ${PN}.jar
+ dodoc history.txt readme.txt help/${PN}/*
+
+ java-pkg_dolauncher ${PN} --jar ${PN}.jar
+}
diff --git a/app-crypt/jacksum/metadata.xml b/app-crypt/jacksum/metadata.xml
new file mode 100644
index 000000000000..aa3ea50a24b3
--- /dev/null
+++ b/app-crypt/jacksum/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>java</herd>
+ <upstream>
+ <remote-id type="sourceforge">jacksum</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
new file mode 100644
index 000000000000..e443b9562c0a
--- /dev/null
+++ b/app-crypt/johntheripper/Manifest
@@ -0,0 +1,2 @@
+DIST john-1.7.9-jumbo-7.diff.gz 1074044 SHA256 9e87e5660965e6e55214176299f67dd1b8a40820805441c62a57af6a6a4a19f5 SHA512 07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a WHIRLPOOL da09df93277d90580cd08de2981a9d45df89f9a82f901f8bdc43acc66b97b6eb5515e603dc691cc000852a0847b943a104dee1826a59a000e09488604224f15a
+DIST john-1.7.9.tar.bz2 717505 SHA256 1d40083e37a7bc1ba1177651cbb27898dcf2a812b8ccf1430db0c372ac6dc199 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b WHIRLPOOL e217d3ae3bafaa0d2465402a1c98f05018da9a95ce61effc7f2f20af4aa9ef9a54a636fc7025dfc283e815f5ebd07fafd64e4b01564739fe97053dbeafbd2b13
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch
new file mode 100644
index 000000000000..5600f3cc17ec
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch
@@ -0,0 +1,12 @@
+diff -urNp john-1.7.3.1.org/src/path.c john-1.7.3.1/src/path.c
+--- john-1.7.3.1.org/src/path.c 2003-10-01 04:26:25.000000000 +0300
++++ john-1.7.3.1/src/path.c 2007-11-10 15:53:23.000000000 +0200
+@@ -55,7 +55,7 @@ void path_init(char **argv)
+ #ifdef JOHN_PRIVATE_HOME
+ private = path_expand(JOHN_PRIVATE_HOME);
+ if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) {
+- if (errno != EEXIST) pexit("mkdir: %s", private);
++ if (errno != EEXIST && errno != EACCES) pexit("mkdir: %s", private);
+ } else
+ fprintf(stderr, "Created directory: %s\n", private);
+ #endif
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch
new file mode 100644
index 000000000000..4b6637a29d8f
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch
@@ -0,0 +1,83 @@
+--- Makefile 2010-07-18 15:27:51.000000000 -0400
++++ Makefile.mine 2010-07-18 15:30:09.000000000 -0400
+@@ -629,7 +629,7 @@
+ macosx-ppc32-altivec:
+ $(LN) ppc32alt.h arch.h
+ $(MAKE) $(PROJ) \
+- CFLAGS="-c -Wall -fomit-frame-pointer" \
++ CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer" \
+ OPT_NORMAL="-fast -mcpu=7450" \
+ OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
+
+@@ -638,7 +638,7 @@
+ $(LN) ppc32alt.h arch.h
+ $(MAKE) $(PROJ) \
+ ASFLAGS="$(ASFLAGS) -arch ppc" \
+- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
++ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
+ LDFLAGS="$(LDFLAGS) -arch ppc" \
+ OPT_NORMAL="-fast -mcpu=7450" \
+ OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
+@@ -650,7 +650,7 @@
+ $(LN) ppc32.h arch.h
+ $(MAKE) $(PROJ) \
+ CC=cc \
+- CFLAGS="-c -traditional-cpp" \
++ CFLAGS="$(CFLAGS) -c -traditional-cpp" \
+ OPT_NORMAL="-O2" \
+ OPT_INLINE="-O3"
+
+@@ -658,7 +658,7 @@
+ $(LN) ppc32.h arch.h
+ $(MAKE) $(PROJ) \
+ ASFLAGS="$(ASFLAGS) -arch ppc" \
+- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
++ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
+ LDFLAGS="$(LDFLAGS) -arch ppc" \
+ OPT_NORMAL="-O2" \
+ OPT_INLINE="-O3 -finline-limit=4000"
+@@ -667,7 +667,7 @@
+ macosx-ppc64-altivec:
+ $(LN) ppc64alt.h arch.h
+ $(MAKE) $(PROJ) \
+- CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
++ CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \
+ LDFLAGS="$(LDFLAGS) -m64" \
+ OPT_NORMAL="-fast" \
+ OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
+@@ -676,7 +676,7 @@
+ $(LN) ppc64alt.h arch.h
+ $(MAKE) $(PROJ) \
+ ASFLAGS="$(ASFLAGS) -arch ppc" \
+- CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \
++ CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \
+ LDFLAGS="$(LDFLAGS) -arch ppc -m64" \
+ OPT_NORMAL="-fast" \
+ OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
+@@ -684,7 +684,7 @@
+ macosx-ppc64:
+ $(LN) ppc64.h arch.h
+ $(MAKE) $(PROJ) \
+- CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
++ CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \
+ LDFLAGS="$(LDFLAGS) -m64" \
+ OPT_NORMAL="-fast" \
+ OPT_INLINE="-fast -finline-limit=4000"
+@@ -693,7 +693,7 @@
+ $(LN) ppc64.h arch.h
+ $(MAKE) $(PROJ) \
+ ASFLAGS="$(ASFLAGS) -arch ppc" \
+- CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \
++ CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \
+ LDFLAGS="$(LDFLAGS) -arch ppc -m64" \
+ OPT_NORMAL="-fast" \
+ OPT_INLINE="-fast -finline-limit=4000"
+@@ -723,7 +723,7 @@
+ $(LN) ppc32alt.h arch.h
+ $(MAKE) $(PROJ) \
+ ASFLAGS="$(ASFLAGS) -arch ppc" \
+- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
++ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
+ LDFLAGS="$(LDFLAGS) -arch ppc" \
+ OPT_NORMAL="-fast -mcpu=7450" \
+ OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch
new file mode 100644
index 000000000000..6066cb8f314e
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch
@@ -0,0 +1,31 @@
+diff --git a/src/NT_fmt_plug.c b/src/NT_fmt_plug.c
+index eb52e3d..411a45b 100644
+--- a/src/NT_fmt_plug.c
++++ b/src/NT_fmt_plug.c
+@@ -652,7 +652,7 @@ static inline void set_key_helper(unsigned int * keybuffer,
+ for(; key[md4_size]; i += xBuf, md4_size++)
+ {
+ unsigned int temp;
+- if ((temp = key[++md4_size]))
++ if ((temp = key[++md4_size]) && md4_size < PLAINTEXT_LENGTH)
+ {
+ keybuffer[i] = key[md4_size-1] | (temp << 16);
+ }
+@@ -704,7 +704,7 @@ static inline void set_key_helper_utf8(unsigned int * keybuffer, unsigned int xB
+ const UTF8 * source, unsigned int lenStoreOffset, unsigned int *lastlen)
+ {
+ unsigned int *target = keybuffer;
+- unsigned int *targetEnd = &keybuffer[xBuf * ((PLAINTEXT_LENGTH + 1) >> 1)];
++ unsigned int *targetEnd = &keybuffer[xBuf * (PLAINTEXT_LENGTH >> 1)];
+ UTF32 chl, chh = 0x80;
+ unsigned int outlen = 0;
+
+@@ -844,7 +844,7 @@ static inline void set_key_helper_encoding(unsigned int * keybuffer,
+ i = 0;
+ for(md4_size = 0; key[md4_size]; i += xBuf, md4_size++)
+ {
+- if ((temp = CP_to_Unicode[key[++md4_size]]))
++ if ((temp = CP_to_Unicode[key[++md4_size]]) && md4_size < PLAINTEXT_LENGTH)
+ keybuffer[i] = CP_to_Unicode[key[md4_size-1]] | (temp << 16);
+ else {
+ keybuffer[i] = CP_to_Unicode[key[md4_size-1]] | 0x800000;
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch
new file mode 100644
index 000000000000..c28ec21a0ae8
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch
@@ -0,0 +1,17 @@
+diff -ru john-1.7.9.orig/src/gost_plug.c john-1.7.9/src/gost_plug.c
+--- john-1.7.9.orig/src/gost_plug.c 2013-01-20 16:15:45.464000001 +0000
++++ john-1.7.9/src/gost_plug.c 2013-01-20 16:16:06.104000001 +0000
+@@ -531,7 +531,6 @@
+ }
+ #endif
+
+-#ifndef __GLIBC__
+ void rhash_u32_swap_copy(void* to, int index, const void* from, size_t length) {
+ size_t i;
+ unsigned int *pO, *pI;
+@@ -542,4 +541,3 @@
+ *pO++ = bswap_32(*pI++);
+ }
+ }
+-#endif
+
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
new file mode 100644
index 000000000000..b4550232fb28
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-7"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
+ !minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mozilla mpi opencl openmp cpu_flags_x86_sse2"
+REQUIRED_USE="openmp? ( !minimal )
+ mpi? ( !minimal )
+ cuda? ( !minimal )
+ opencl? ( !minimal )
+ mozilla? ( !minimal )"
+
+DEPEND="sys-libs/zlib
+ !minimal? ( >=dev-libs/openssl-0.9.7:0 )
+ mpi? ( virtual/mpi )
+ cuda? ( x11-drivers/nvidia-drivers
+ dev-util/nvidia-cuda-toolkit:= )
+ opencl? ( virtual/opencl )
+ mozilla? ( dev-libs/nss dev-libs/nspr )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+has_xop() {
+ echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
+}
+
+has_avx() {
+ echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
+}
+
+get_target() {
+ if use alpha; then
+ echo "linux-alpha"
+ elif use amd64; then
+ if has_xop; then
+ echo "linux-x86-64-xop"
+ elif has_avx; then
+ echo "linux-x86-64-avx"
+ else
+ echo "linux-x86-64"
+ fi
+ elif use ppc; then
+ #if use altivec; then
+ # echo "linux-ppc32-altivec"
+ #else
+ echo "linux-ppc32"
+ #fi
+ elif use ppc64; then
+ #if use altivec; then
+ # echo "linux-ppc32-altivec"
+ #else
+ echo "linux-ppc64"
+ #fi
+ # linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
+ # as per the Makefile comments
+ elif use sparc; then
+ echo "linux-sparc"
+ elif use x86; then
+ if has_xop; then
+ echo "linux-x86-xop"
+ elif has_avx; then
+ echo "linux-x86-avx"
+ elif use cpu_flags_x86_sse2; then
+ echo "linux-x86-sse2"
+ elif use cpu_flags_x86_mmx; then
+ echo "linux-x86-mmx"
+ else
+ echo "linux-x86-any"
+ fi
+ elif use ppc-macos; then
+ # force AltiVec, the non-altivec profile contains ancient compiler cruft
+ # if use altivec; then
+ echo "macosx-ppc32-altivec"
+ # else
+ # echo "macosx-ppc32"
+ # fi
+ # for Tiger this can be macosx-ppc64
+ elif use x86-macos; then
+ if use cpu_flags_x86_sse2; then
+ echo "macosx-x86-sse2"
+ else
+ echo "macosx-x86"
+ fi
+ elif use x86-solaris; then
+ echo "solaris-x86-any"
+ elif use x86-fbsd; then
+ if use cpu_flags_x86_sse2; then
+ echo "freebsd-x86-sse2"
+ elif use cpu_flags_x86_mmx; then
+ echo "freebsd-x86-mmx"
+ else
+ echo "freebsd-x86-any"
+ fi
+ elif use amd64-fbsd; then
+ echo "freebsd-x86-64"
+ else
+ echo "generic"
+ fi
+}
+
+get_john_objs() {
+ echo -n '${JOHN_COMMON_OBJS} '
+ if use opencl; then
+ echo -n '${OCL_OBJS} '
+ fi
+ if use cuda; then
+ echo -n '${CUDA_OBJS}'
+ fi
+}
+
+pkg_setup() {
+ if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+}
+
+src_prepare() {
+ if ! use minimal; then
+ epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
+
+ if use mpi ; then
+ sed -e "s/^#CC = mpicc/CC = mpicc/" \
+ -e "s/^#MPIOBJ =/MPIOBJ =/" \
+ -i src/Makefile || die
+ fi
+
+ # fix typo in jumbo patch
+ sed -i 's:All15:All5:' run/john.conf || die
+ # fix compile on ppc (only needed for jumbo-7)
+ epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
+ fi
+
+ cd src
+ epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
+ epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
+
+ if ! use minimal; then
+ sed -e "s/LDFLAGS *= */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
+ -e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
+ -i Makefile || die "sed Makefile failed"
+ sed -i 's#/usr/local#/opt#g' Makefile || die
+ fi
+ sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
+
+ if use cuda; then
+ cuda_src_prepare
+ sed \
+ -e "/^NVCC_FLAGS/s:-arch sm_10:${NVCCFLAGS}:g" \
+ -i Makefile || die
+ fi
+
+ if use mozilla; then
+ sed -i -e '/HAVE_NSS =/s/^#*//' -e 's/NSS_override//' Makefile || die
+ fi
+}
+
+src_compile() {
+ local OMP
+
+ use custom-cflags || strip-flags
+ echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
+ echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
+ echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
+ append-flags -fPIC -fPIE
+ gcc-specs-pie && append-ldflags -nopie
+ use openmp && OMP="-fopenmp"
+
+ CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
+ if use mpi; then
+ CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
+ fi
+
+ #this stuff was all stolen from the Makefile, if build breaks, check this first
+ if use opencl; then
+ GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
+ GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
+ fi
+ if use cuda; then
+ GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
+ GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
+ fi
+
+ emake -C src/ \
+ CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+ CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
+ LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
+ OPT_NORMAL="" \
+ OMPFLAGS="${OMP}" \
+ JOHN_OBJS="$(get_john_objs)" \
+ $(get_target)
+}
+
+src_test() {
+ if use opencl; then
+ cp src/opencl/*.cl run/
+ cp src/opencl_*.h run/
+ fi
+ pax-mark -mr run/john
+ if use opencl || use cuda; then
+ ewarn "GPU tests fail, skipping all tests..."
+ else
+ make -C src/ check
+ fi
+}
+
+src_install() {
+ # executables
+ dosbin run/john
+ newsbin run/mailer john-mailer
+
+ pax-mark -mr "${ED}usr/sbin/john" || die
+
+ dosym john /usr/sbin/unafs
+ dosym john /usr/sbin/unique
+ dosym john /usr/sbin/unshadow
+
+ # jumbo-patch additions
+ if ! use minimal; then
+ for s in \
+ keychain2john keepass2john pwsafe2john hccap2john \
+ racf2john zip2john rar2john pdf2john ssh2john undrop \
+ ; do
+ dosym john /usr/sbin/$s
+ done
+ use mozilla && dosym john /usr/sbin/mozilla2john
+ dosbin run/calc_stat
+ dosbin run/genmkvpwd
+ dosbin run/mkvcalcproba
+ dosbin run/raw2dyna
+ dosbin run/tgtsnarf
+ insinto /etc/john
+ doins run/genincstats.rb run/stats
+ doins run/netscreen.py run/sap2john.pl
+ if use opencl; then
+ doins src/opencl/*.cl
+ doins src/opencl_*.h
+ fi
+ fi
+
+ # config files
+ insinto /etc/john
+ doins run/*.chr run/password.lst
+ doins run/*.conf
+
+ # documentation
+ dodoc doc/*
+}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
new file mode 100644
index 000000000000..22670135b8f7
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-7"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
+ !minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
+REQUIRED_USE="openmp? ( !minimal )
+ mpi? ( !minimal )
+ cuda? ( !minimal )
+ opencl? ( !minimal )"
+
+RDEPEND="sys-libs/zlib
+ !minimal? ( >=dev-libs/openssl-0.9.7:0 )
+ mpi? ( virtual/mpi )
+ cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
+ opencl? ( virtual/opencl )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+has_xop() {
+ echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
+}
+
+has_avx() {
+ echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
+}
+
+get_target() {
+ if use alpha; then
+ echo "linux-alpha"
+ elif use amd64; then
+ if has_xop; then
+ echo "linux-x86-64-xop"
+ elif has_avx; then
+ echo "linux-x86-64-avx"
+ else
+ echo "linux-x86-64"
+ fi
+ elif use ppc; then
+ #if use altivec; then
+ # echo "linux-ppc32-altivec"
+ #else
+ echo "linux-ppc32"
+ #fi
+ elif use ppc64; then
+ #if use altivec; then
+ # echo "linux-ppc32-altivec"
+ #else
+ echo "linux-ppc64"
+ #fi
+ # linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
+ # as per the Makefile comments
+ elif use sparc; then
+ echo "linux-sparc"
+ elif use x86; then
+ if has_xop; then
+ echo "linux-x86-xop"
+ elif has_avx; then
+ echo "linux-x86-avx"
+ elif use cpu_flags_x86_sse2; then
+ echo "linux-x86-sse2"
+ elif use cpu_flags_x86_mmx; then
+ echo "linux-x86-mmx"
+ else
+ echo "linux-x86-any"
+ fi
+ elif use ppc-macos; then
+ # force AltiVec, the non-altivec profile contains ancient compiler cruft
+ # if use altivec; then
+ echo "macosx-ppc32-altivec"
+ # else
+ # echo "macosx-ppc32"
+ # fi
+ # for Tiger this can be macosx-ppc64
+ elif use x86-macos; then
+ if use cpu_flags_x86_sse2; then
+ echo "macosx-x86-sse2"
+ else
+ echo "macosx-x86"
+ fi
+ elif use x86-solaris; then
+ echo "solaris-x86-any"
+ elif use x86-fbsd; then
+ if use cpu_flags_x86_sse2; then
+ echo "freebsd-x86-sse2"
+ elif use cpu_flags_x86_mmx; then
+ echo "freebsd-x86-mmx"
+ else
+ echo "freebsd-x86-any"
+ fi
+ elif use amd64-fbsd; then
+ echo "freebsd-x86-64"
+ else
+ echo "generic"
+ fi
+}
+
+get_john_objs() {
+ echo -n '${JOHN_COMMON_OBJS} '
+ if use opencl; then
+ echo -n '${OCL_OBJS} '
+ fi
+ if use cuda; then
+ echo -n '${CUDA_OBJS}'
+ fi
+}
+
+pkg_setup() {
+ if use openmp ; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+}
+
+src_prepare() {
+ if ! use minimal; then
+ epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
+
+ if use mpi ; then
+ sed -e "s/^#CC = mpicc/CC = mpicc/" \
+ -e "s/^#MPIOBJ =/MPIOBJ =/" \
+ -i src/Makefile || die
+ fi
+
+ # fix typo in jumbo patch
+ sed -i 's:All15:All5:' run/john.conf || die
+ # fix compile on ppc (only needed for jumbo-7)
+ epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
+ fi
+
+ cd src
+ epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
+ epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
+
+ if ! use minimal; then
+ sed -e "s/LDFLAGS *= */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
+ -e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
+ -i Makefile || die "sed Makefile failed"
+ sed -i 's#/usr/local#/opt#g' Makefile || die
+ fi
+ sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
+}
+
+src_compile() {
+ local OMP
+
+ use custom-cflags || strip-flags
+ echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
+ echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
+ echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
+ append-flags -fPIC -fPIE
+ gcc-specs-pie && append-ldflags -nopie
+ use openmp && OMP="-fopenmp"
+
+ CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
+ if use mpi; then
+ CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
+ fi
+
+ #this stuff was all stolen from the Makefile, if build breaks, check this first
+ if use opencl; then
+ GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
+ GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
+ fi
+ if use cuda; then
+ GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
+ GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
+ fi
+
+ emake -C src/ \
+ CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+ CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
+ LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
+ OPT_NORMAL="" \
+ OMPFLAGS="${OMP}" \
+ JOHN_OBJS="$(get_john_objs)" \
+ $(get_target)
+}
+
+src_test() {
+ if use opencl; then
+ cp src/opencl/*.cl run/
+ cp src/opencl_*.h run/
+ fi
+ pax-mark -mr run/john
+ if use opencl || use cuda; then
+ ewarn "GPU tests fail, skipping all tests..."
+ else
+ make -C src/ check
+ fi
+}
+
+src_install() {
+ # executables
+ dosbin run/john
+ newsbin run/mailer john-mailer
+
+ pax-mark -mr "${ED}usr/sbin/john" || die
+
+ dosym john /usr/sbin/unafs
+ dosym john /usr/sbin/unique
+ dosym john /usr/sbin/unshadow
+
+ # jumbo-patch additions
+ if ! use minimal; then
+ for s in \
+ keychain2john keepass2john pwsafe2john hccap2john \
+ racf2john zip2john rar2john pdf2john ssh2john undrop \
+ ; do
+ dosym john /usr/sbin/$s
+ done
+ dosbin run/calc_stat
+ dosbin run/genmkvpwd
+ dosbin run/mkvcalcproba
+ dosbin run/raw2dyna
+ dosbin run/tgtsnarf
+ insinto /etc/john
+ doins run/genincstats.rb run/stats
+ doins run/netscreen.py run/sap2john.pl
+ if use opencl; then
+ doins src/opencl/*.cl
+ doins src/opencl_*.h
+ fi
+ fi
+
+ # config files
+ insinto /etc/john
+ doins run/*.chr run/password.lst
+ doins run/*.conf
+
+ # documentation
+ dodoc doc/*
+}
diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
new file mode 100644
index 000000000000..dabd8490bbad
--- /dev/null
+++ b/app-crypt/johntheripper/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <maintainer>
+ <email>zerochaos@gentoo.org</email>
+ <name>Rick Farina</name>
+ <description>Any and all help appreciated</description>
+ </maintainer>
+ <use>
+ <flag name="cuda">Use nvidia cuda toolkit for speeding up cracking on capable devices</flag>
+ <flag name="mozilla"> Support mozilla password cracking</flag>
+ <flag name="opencl">Enable opencl support for speeding up cracking on capable devices</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-crypt/kencfs/Manifest b/app-crypt/kencfs/Manifest
new file mode 100644
index 000000000000..ed8be97bdc64
--- /dev/null
+++ b/app-crypt/kencfs/Manifest
@@ -0,0 +1 @@
+DIST 134003-kencfs-1.5.0.tar.gz 156217 SHA256 b53314fe022b6fb20d427a6c9a1d08be5df87823754a7d22724a9f3960fe24f0 SHA512 0168a0241c9e2e614b5d796c02cc9103596040e4cdd1349c250f0d25d20bfe7f8c3ad6f192f57e5b519d83ffdaec8eabf389d3d0286da282cfe42e78e5c966f3 WHIRLPOOL 42964b27d48ef3a816f657d417a044f2d60bd7d895bdaa2701d96e9c666f60d0e967ddf9536033f1d3207181973f9524cd1b29897b3ab2527a58edef329704e4
diff --git a/app-crypt/kencfs/files/kencfs-1.2-desktop.patch b/app-crypt/kencfs/files/kencfs-1.2-desktop.patch
new file mode 100644
index 000000000000..900f027f4abc
--- /dev/null
+++ b/app-crypt/kencfs/files/kencfs-1.2-desktop.patch
@@ -0,0 +1,11 @@
+--- /tmp/kencfs.desktop 2012-12-12 00:06:01.000000000 +1100
++++ kencfs.desktop 2012-12-12 00:07:54.000000000 +1100
+@@ -2,7 +2,7 @@
+ Name=KEncFS
+ Exec=kencfs
+ Icon=document-encrypt
+-Categories=System;Security
++Categories=Qt;KDE;System;Security;
+ Terminal=false
+ Type=Application
+ StartupNotify=false
diff --git a/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch b/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch
new file mode 100644
index 000000000000..6687ac0f1f9b
--- /dev/null
+++ b/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch
@@ -0,0 +1,13 @@
+Support older encfs5 volumes wrt Gentoo bug #446652.
+
+--- a/fsDialog.cpp
++++ b/fsDialog.cpp
+@@ -161,7 +161,7 @@
+
+ arg << cr << pm << "-S";
+ p->start(prg,arg);
+- if (! QFile::exists(cr+"/.encfs6.xml")) p->write("\n");
++ if (! (QFile::exists(cr+"/.encfs6.xml") || QFile::exists(cr+"/.encfs5")) ) p->write("\n");
+ p->write(pw.toLocal8Bit().data());
+ p->write("\n");
+ p->waitForFinished();
diff --git a/app-crypt/kencfs/kencfs-1.5.0.ebuild b/app-crypt/kencfs/kencfs-1.5.0.ebuild
new file mode 100644
index 000000000000..5fbfc06224c7
--- /dev/null
+++ b/app-crypt/kencfs/kencfs-1.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2
+
+DESCRIPTION="GUI frontend for encfs"
+HOMEPAGE="http://kde-apps.org/content/show.php?content=134003"
+SRC_URI="http://kde-apps.org/CONTENT/content-files/134003-${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ kde-base/kdelibs:4
+"
+RDEPEND="${DEPEND}
+ kde-apps/kwalletd:4
+ sys-fs/encfs
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.2-desktop.patch"
+ "${FILESDIR}/${PN}-1.4.0-encfs5.patch"
+)
+
+src_prepare() {
+ qt4-r2_src_prepare
+
+ sed -i ${PN}.pro -e "/^doc.path =/s/${PN}-1.5/${PF}/" \
+ || die "sed docdir failed"
+}
diff --git a/app-crypt/kencfs/metadata.xml b/app-crypt/kencfs/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/app-crypt/kencfs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
new file mode 100644
index 000000000000..77681fbb3e8f
--- /dev/null
+++ b/app-crypt/keybase/Manifest
@@ -0,0 +1,4 @@
+DIST keybase-0.8.10.tar.gz 7055453 SHA256 ce9a22427d40341059071737ace2dacbe0a81e29e783ec2c8324e2704c1f558f SHA512 4701a0c8d88ffc90fa68f24ef4695f7c7b63ec91a41ccc1bf9d25efb182befc0750e1f9f5ec185161d65bdcbaeb3a73ab8f54f7047ab9d1efdca55b5f56957f0 WHIRLPOOL dd6d53154164ac235b89947530f7af4ed9fdc1421c26b2cef92e1721e2dcdf63e43fff054718c58c6a519f24f1766969a0e740f97d9eb17472d1ef8174e1851f
+DIST keybase-0.8.12.tar.gz 7057638 SHA256 fa6a8eb6f857d98d4d0f5c97862ba99480b0dd2c85fccd631180c0ab8f3ca97f SHA512 e8c568e0154308d3f0172a5e9b22de31c8a9b07d3a4f324a4afec57972602a3bd957220a96427eefa5df563ce0152495f5c33668536e03f3d6af9344c2061397 WHIRLPOOL e4a2431c05add26645f4ec3f2062a81d38c39ad9f9d6357f62009292f60fe072d67547d6c0a39470c130165bb9491fc7cb17cfe91a3fc1be75ad7a6377da9dad
+DIST keybase-0.8.13.tar.gz 7057750 SHA256 a485257b7302d848be41e9c0a79f7b1c0da4c8ceaee70c0cc011838cbd723fd8 SHA512 8a082ff9d61f960a0c4862fba04adf323005b3c70e6d208a38a001716bcc374e10cde315eced6730d90316466244e58a9de0f78a66ab2f9bd91326979f0ef28b WHIRLPOOL b651a48be0ced301991edd03d40182c0b900ea28e2b97630a3ad741b34266dbd95c3d370db636ca8088ce5e781a2cf609255a6b52a5b6bdbfa540b879cdcd778
+DIST keybase-0.8.9.tar.gz 7055307 SHA256 2feb54d26afc639f4d4998fbc35aafa2100a9926a6ec4f84343ca56d0284a3dd SHA512 431b3314cf939605a56f163b67226c9027a83159aae7f6b9226a4b5ccf63ecd3f79a873cbb9ab2756d83df2191823b70f884327f160187c00f6a6954b8ca144a WHIRLPOOL 4de64969a1e8898b19903cce391ca599af09b4f3dee6bf2b6bf10fcb39d8b6f939d5aa0320a5efe4b3aaf78217c6b6d7c16f09321af3ed115b6985194a0f0c0e
diff --git a/app-crypt/keybase/keybase-0.8.10.ebuild b/app-crypt/keybase/keybase-0.8.10.ebuild
new file mode 100644
index 000000000000..644ff738ea67
--- /dev/null
+++ b/app-crypt/keybase/keybase-0.8.10.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ net-libs/nodejs
+ app-crypt/gnupg"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ mv "node-client-${PV}" "${P}"
+}
+
+src_install() {
+ dodoc CHANGELOG.md README.md SIGNED.md
+ insinto "/opt/${PN}"
+ doins -r package.json bin certs json lib node_modules sql
+ dosym "${D}/opt/${PN}/bin/main.js" "${ROOT}/usr/bin/keybase"
+ chmod 0755 "${D}/opt/${PN}/bin/main.js" || die
+}
diff --git a/app-crypt/keybase/keybase-0.8.12.ebuild b/app-crypt/keybase/keybase-0.8.12.ebuild
new file mode 100644
index 000000000000..644ff738ea67
--- /dev/null
+++ b/app-crypt/keybase/keybase-0.8.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ net-libs/nodejs
+ app-crypt/gnupg"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ mv "node-client-${PV}" "${P}"
+}
+
+src_install() {
+ dodoc CHANGELOG.md README.md SIGNED.md
+ insinto "/opt/${PN}"
+ doins -r package.json bin certs json lib node_modules sql
+ dosym "${D}/opt/${PN}/bin/main.js" "${ROOT}/usr/bin/keybase"
+ chmod 0755 "${D}/opt/${PN}/bin/main.js" || die
+}
diff --git a/app-crypt/keybase/keybase-0.8.13.ebuild b/app-crypt/keybase/keybase-0.8.13.ebuild
new file mode 100644
index 000000000000..644ff738ea67
--- /dev/null
+++ b/app-crypt/keybase/keybase-0.8.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ net-libs/nodejs
+ app-crypt/gnupg"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ mv "node-client-${PV}" "${P}"
+}
+
+src_install() {
+ dodoc CHANGELOG.md README.md SIGNED.md
+ insinto "/opt/${PN}"
+ doins -r package.json bin certs json lib node_modules sql
+ dosym "${D}/opt/${PN}/bin/main.js" "${ROOT}/usr/bin/keybase"
+ chmod 0755 "${D}/opt/${PN}/bin/main.js" || die
+}
diff --git a/app-crypt/keybase/keybase-0.8.9.ebuild b/app-crypt/keybase/keybase-0.8.9.ebuild
new file mode 100644
index 000000000000..644ff738ea67
--- /dev/null
+++ b/app-crypt/keybase/keybase-0.8.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ net-libs/nodejs
+ app-crypt/gnupg"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ mv "node-client-${PV}" "${P}"
+}
+
+src_install() {
+ dodoc CHANGELOG.md README.md SIGNED.md
+ insinto "/opt/${PN}"
+ doins -r package.json bin certs json lib node_modules sql
+ dosym "${D}/opt/${PN}/bin/main.js" "${ROOT}/usr/bin/keybase"
+ chmod 0755 "${D}/opt/${PN}/bin/main.js" || die
+}
diff --git a/app-crypt/keybase/metadata.xml b/app-crypt/keybase/metadata.xml
new file mode 100644
index 000000000000..27b73883188c
--- /dev/null
+++ b/app-crypt/keybase/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>nicolasbock@gentoo.org</email>
+ <name>Nicolas Bock</name>
+ </maintainer>
+ <longdescription lang="en">
+ Get a public key, safely, starting just with someone's social media username(s)
+ </longdescription>
+ <upstream>
+ <remote-id type="github">keybase/node-client</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/keylookup/Manifest b/app-crypt/keylookup/Manifest
new file mode 100644
index 000000000000..5d04528cc7b1
--- /dev/null
+++ b/app-crypt/keylookup/Manifest
@@ -0,0 +1 @@
+DIST keylookup-2.2.tar.gz 13188 SHA256 8c8f4f488e144761bbe80cb5de0927ca2acb8c0fae3b50c667a061b4a4dba917 SHA512 e9aa931bdf33a720b1262449d63e7e9592b375526eb33832ff966968a20dac1a0362e0db0e4444dba868ee4ad8c3e553e9cc3f3c60376d95b8a303e05d722abb WHIRLPOOL b4ae16896350df9bc35b30ce8a7cb92926e85d64cf254a0deb46be53bd35063351999cddf33c930d7e39c0f195fc2e6ca6cb3a363a7ed523a567e260a1e9ae88
diff --git a/app-crypt/keylookup/keylookup-2.2-r9999.ebuild b/app-crypt/keylookup/keylookup-2.2-r9999.ebuild
new file mode 100644
index 000000000000..8d3ccb0e95f3
--- /dev/null
+++ b/app-crypt/keylookup/keylookup-2.2-r9999.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A tool to fetch PGP keys from keyservers"
+HOMEPAGE="http://www.palfrader.org/keylookup/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=app-crypt/signing-party-1.1.3-r2"
diff --git a/app-crypt/keylookup/keylookup-2.2.ebuild b/app-crypt/keylookup/keylookup-2.2.ebuild
new file mode 100644
index 000000000000..a1c373a42743
--- /dev/null
+++ b/app-crypt/keylookup/keylookup-2.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A tool to fetch PGP keys from keyservers"
+HOMEPAGE="http://www.palfrader.org/keylookup/"
+SRC_URI="http://www.palfrader.org/keylookup/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+ app-crypt/gnupg"
+
+src_install() {
+ dobin keylookup || die
+ doman keylookup.1
+ dodoc NEWS TODO
+}
diff --git a/app-crypt/keylookup/metadata.xml b/app-crypt/keylookup/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/app-crypt/keylookup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ <name>Default assignee for orphaned packages</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/keynote/Manifest b/app-crypt/keynote/Manifest
new file mode 100644
index 000000000000..e199692de124
--- /dev/null
+++ b/app-crypt/keynote/Manifest
@@ -0,0 +1 @@
+DIST keynote-2.3.tar.gz 141930 SHA256 62f7a9d57ceb6bcdd47b604b637a7ac8ed337cef0ab02f1fa28b7e61c9b15821 SHA512 c4f2f70718cf6092a9af82d6f6e1d8e24d03be9a938e2bde830b24794cd20610b8f647c552d46e37e840f1a1a432dc797b65548c4d39cdbaa65ec2d11f6cfefe WHIRLPOOL 42cc4830d06f59fe0bb26a52ddd5c40c2192d1d44e7ece99a5013c4fb31cc7f4e284d46c21c9ec4f448e20642b0b00735435801854f217c800cedca9f43ecbf4
diff --git a/app-crypt/keynote/files/keynote-2.3-parallel-build.patch b/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
new file mode 100644
index 000000000000..cf4b4926f79d
--- /dev/null
+++ b/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
@@ -0,0 +1,14 @@
+--- keynote-2.3.orig/Makefile.in 2010-02-04 09:51:35.757096194 +0100
++++ keynote-2.3/Makefile.in 2010-02-04 09:52:17.441137132 +0100
+@@ -86,9 +86,11 @@
+
+ k.tab.c: keynote.y header.h keynote.h assertion.h config.h
+ $(YACC) $(YACCFLAGS) keynote.y
++k.tab.h: k.tab.c
+
+ z.tab.c: keynote-ver.y keynote.h header.h config.h
+ $(YACC) $(YACCFLAGS2) keynote-ver.y
++z.tab.h: z.tab.c
+
+ lex.kn.c: keynote.l k.tab.h header.h keynote.h assertion.h config.h
+ $(LEX) $(LEXFLAGS) keynote.l
diff --git a/app-crypt/keynote/files/keynote-2.3-qa.patch b/app-crypt/keynote/files/keynote-2.3-qa.patch
new file mode 100644
index 000000000000..f6b1ff28cdb8
--- /dev/null
+++ b/app-crypt/keynote/files/keynote-2.3-qa.patch
@@ -0,0 +1,44 @@
+Respect CFLAGS, LDFLAGS, and AR.
+
+The better way to fix AR would be to patch configure.in,
+but it is sufficiently old to fail with current autotools.
+--- Makefile.in
++++ Makefile.in
+@@ -27,7 +27,6 @@
+ YACC = @YACC@
+ SSLEAY = @SSLEAY@
+ RM = @RM@
+-AR = @AR@
+ NROFF = @NROFF@
+ TAR = @TAR@
+ TRUE = @TRUE@
+@@ -41,10 +40,10 @@
+ YACCFLAGS = -d -p kn -b k
+ LEXFLAGS2 = -Pkv -s -i
+ LEXFLAGS = -Cr -Pkn -s -i
+-CFLAGS = -O2 -Wall # -g
+ RMFLAGS2 = -rf
+ RMFLAGS = -f
+ NROFFFLAGS = -mandoc
++LDFLAGS = @LDFLAGS@
+
+ SSLCONF = testsuite/openssl.cnf
+ SSLCERT = testsuite/test.cert.pem
+@@ -83,7 +82,7 @@
+ $(RANLIB) $(TARGET)
+
+ $(TARGET2): $(TARGET) $(OBJS2)
+- $(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
+
+ k.tab.c: keynote.y header.h keynote.h assertion.h config.h
+ $(YACC) $(YACCFLAGS) keynote.y
+@@ -131,7 +130,7 @@
+ -keyout $(SSLKEY)
+
+ test-sample: all $(OBJS3)
+- $(CC) $(CFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
+
+ test-sig: all $(SSLCERT) $(SSLKEY)
+ $(SED) -e 's/--.*//' < $(SSLCERT) > $(SSLCERT).1
diff --git a/app-crypt/keynote/keynote-2.3-r3.ebuild b/app-crypt/keynote/keynote-2.3-r3.ebuild
new file mode 100644
index 000000000000..db2452861e02
--- /dev/null
+++ b/app-crypt/keynote/keynote-2.3-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The KeyNote Trust-Management System"
+HOMEPAGE="http://www1.cs.columbia.edu/~angelos/keynote.html"
+SRC_URI="http://www1.cs.columbia.edu/~angelos/Code/${P}.tar.gz"
+
+LICENSE="keynote"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+ virtual/yacc"
+
+pkg_setup() {
+ tc-export AR CC RANLIB
+ # bug #448904
+ export ac_cv_path_AR="$(type -p $(tc-getAR))"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-qa.patch
+ epatch "${FILESDIR}"/${P}-parallel-build.patch
+}
+
+src_compile() {
+ if use ssl; then
+ emake
+ else
+ emake nocrypto
+ fi
+}
+
+src_install() {
+ dobin keynote
+
+ dolib.a libkeynote.a
+
+ insinto /usr/include
+ doins keynote.h
+
+ doman man/keynote.[1345]
+ dodoc README HOWTO.add.crypto TODO
+}
diff --git a/app-crypt/keynote/metadata.xml b/app-crypt/keynote/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/app-crypt/keynote/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/kstart/Manifest b/app-crypt/kstart/Manifest
new file mode 100644
index 000000000000..31fcefe33eeb
--- /dev/null
+++ b/app-crypt/kstart/Manifest
@@ -0,0 +1 @@
+DIST kstart-4.1.tar.gz 269215 SHA256 ad1a71be149d56473319bf3b9bca83a60caa3af463d52c134e8f187103700224 SHA512 74a8a3f2c8d2c95f166f5861fb05a2d659a31db3165e27e81e5cf216bde44809d937ebc00995f89fa3b9df68609e3081303eb30742f5c4d90151b1410f0bd3cc WHIRLPOOL d72c71729eb1eb972eec4329ffb442b02856ddfb73fffca5ffe97f8a8d299155fe5535b0ca59e98197c2b2214bd56e3f5739a42d269fe3dac011556eb588bd13
diff --git a/app-crypt/kstart/kstart-4.1.ebuild b/app-crypt/kstart/kstart-4.1.ebuild
new file mode 100644
index 000000000000..85834d19b06d
--- /dev/null
+++ b/app-crypt/kstart/kstart-4.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Modified versions of kinit for refreshing kerberos tickets
+automatically"
+HOMEPAGE="http://www.eyrie.org/~eagle/software/kstart"
+SRC_URI="http://archives.eyrie.org/software/kerberos/${P}.tar.gz"
+
+LICENSE="|| ( MIT Stanford ISC )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="afs"
+
+DEPEND="virtual/krb5
+ afs? ( net-fs/openafs )"
+RDEPEND="$DEPEND"
+
+src_configure() {
+ econf \
+ --enable-reduced-depends \
+ "$(use_with afs)" \
+ "$(use_enable afs setpag)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ doman k5start.1 krenew.1
+ dodoc README NEWS TODO examples/*
+}
diff --git a/app-crypt/kstart/metadata.xml b/app-crypt/kstart/metadata.xml
new file mode 100644
index 000000000000..9d8a37e6bcbf
--- /dev/null
+++ b/app-crypt/kstart/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kerberos</herd>
+ <longdescription>Modified versions of kinit that can use srvtabs or
+ keytabs to authenticate, can run as daemons and wake up periodically
+ to refresh a ticket, and can run single commands with their own
+ authentication credentials and refresh those credentials until the
+ command exits.</longdescription>
+ <use>
+ <flag name="afs">
+ Enables afs support which means you can acquire an afs token and
+ set PAGs. It's recommended to set this USE if you need
+ authenticated access to an AFS cell for your daemon/app.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
new file mode 100644
index 000000000000..c767d0c8b839
--- /dev/null
+++ b/app-crypt/libscrypt/Manifest
@@ -0,0 +1,2 @@
+DIST libscrypt-1.19.tar.gz 18208 SHA256 8f398677b2b43e21423b800156b3379f3cb0d314e70eec2eb2e83a012bce854f SHA512 decf4fe6eb83d6a9ddd71cd9b9f4f9232bbadc8a7dc4c62aa737b162fdb97a18e6a8b3ac314c0900830b151c1b77a8dc00ffd0e47e47c425490ee4c43a21a735 WHIRLPOOL 877bcc095fedabf023bdd1eb921625889afdaf20512ee93135b602d75b12686317efe2e63b5f115efb7d846f2a021cab84a0ce5791bcaa1abb931710895bbcfc
+DIST libscrypt-1.20.tar.gz 18451 SHA256 6074add2170b7d00e080fe3a58d3dec76850a4f272d488f5e8cc3c4acb6d8e21 SHA512 c7db096c740681c328d4c156372147331c0441906c1f17656a8ddd8345348091295749c4e3105bf26106f826327acac9bda97efec4ce50ac56d64f903c59e9af WHIRLPOOL 5d854936f955fbc08ec7d31e89396d3198ea58cac326ea8ceaedcc360e412cefc9e75b49a959870924cabe79ccf14453209cf450ff0256873c1de744f65706ac
diff --git a/app-crypt/libscrypt/libscrypt-1.19.ebuild b/app-crypt/libscrypt/libscrypt-1.19.ebuild
new file mode 100644
index 000000000000..830211537fb9
--- /dev/null
+++ b/app-crypt/libscrypt/libscrypt-1.19.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Shared library to impliment the scrypt algorithm. See http://www.tarsnap.com/scrypt.html."
+HOMEPAGE="https://github.com/technion/libscrypt"
+SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ export PREFIX=/usr
+ export LIBDIR=${PREFIX}/$(get_libdir)
+ export CC=$(tc-getCC)
+ export CFLAGS="$CFLAGS -fPIC"
+ export LDFLAGS="$LDFLAGS -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version"
+ export CFLAGS_EXTRA=
+ emake
+}
diff --git a/app-crypt/libscrypt/libscrypt-1.20.ebuild b/app-crypt/libscrypt/libscrypt-1.20.ebuild
new file mode 100644
index 000000000000..6e5a3038f64d
--- /dev/null
+++ b/app-crypt/libscrypt/libscrypt-1.20.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Shared library to impliment the scrypt algorithm. See http://www.tarsnap.com/scrypt.html."
+HOMEPAGE="https://github.com/technion/libscrypt"
+SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ export PREFIX=/usr
+ export LIBDIR=${PREFIX}/$(get_libdir)
+ export CC=$(tc-getCC)
+ export CFLAGS="$CFLAGS -fPIC"
+ export LDFLAGS="$LDFLAGS -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version"
+ export CFLAGS_EXTRA=
+ emake
+}
diff --git a/app-crypt/libscrypt/metadata.xml b/app-crypt/libscrypt/metadata.xml
new file mode 100644
index 000000000000..5afd4895b479
--- /dev/null
+++ b/app-crypt/libscrypt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">technion/libscrypt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
new file mode 100644
index 000000000000..857d6784b06b
--- /dev/null
+++ b/app-crypt/libsecret/Manifest
@@ -0,0 +1,2 @@
+DIST libsecret-0.18.2.tar.xz 483980 SHA256 12fd288b012e1b2b1b54d586cd4c6507885715534644b4534b7ef7d7079ba443 SHA512 414580e2f717ba0a3adacd79da093dc5e982f49455c1d6dd0cc60d87d7d3ff9ce3147685a3f5091488b9c98840002739b9e1aa2252f0fd71639b471b34ff5c54 WHIRLPOOL 2c113d81893562a54eef28c095968dca43ef5c6e940b20eb9266034d29231e3bbcb173855a6db3695a294f0028012fd45ccd8d5330e34a9c1a3abd9c041e01b6
+DIST libsecret-0.18.tar.xz 480520 SHA256 0c73aa762dbd1e38ba7b03de350e23ce818cb810b0784375e95ef61e004b02e3 SHA512 5b3b460fe45b780fd4018dbb3b5fcc2c2e775725a8c74f4cfa86c00c643ccc1b29961b7e464c7b01846c5cc16a4bb9819c74016dd6758301ae2f67ab947c35bd WHIRLPOOL 2c3cb1a6a902665b3898a211317316d988791648d1d1f7144160f12376b2110ac99e8c3d3423ceb58a8ea0a3fb50efb42fc458aaa44f3aea52d2a1fab2d959a8
diff --git a/app-crypt/libsecret/libsecret-0.18.2.ebuild b/app-crypt/libsecret/libsecret-0.18.2.ebuild
new file mode 100644
index 000000000000..e2d87f704e63
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.18.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION=0.18
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://live.gnome.org/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+IUSE="+crypt debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+
+RDEPEND="
+ >=dev-libs/glib-2.38:2
+ crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
+ introspection? ( >=dev-libs/gobject-introspection-1.29 )
+"
+PDEPEND=">=gnome-base/gnome-keyring-3
+"
+# PDEPEND to avoid circular dep (bug #547456)
+# Add ksecrets to PDEPEND when it's added to portage
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ dev-python/mock
+ introspection? (
+ ${PYTHON_DEPS}
+ >=dev-libs/gjs-1.32
+ dev-python/pygobject:3 )
+ )
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog NEWS README"
+ gnome2_src_configure \
+ --enable-manpages \
+ --disable-strict \
+ --disable-coverage \
+ --disable-static \
+ $(use_enable crypt gcrypt) \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
+
+src_test() {
+ Xemake check
+}
diff --git a/app-crypt/libsecret/libsecret-0.18.ebuild b/app-crypt/libsecret/libsecret-0.18.ebuild
new file mode 100644
index 000000000000..f5f79bdb53cc
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.18.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION=0.18
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://live.gnome.org/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+IUSE="+crypt debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+
+RDEPEND="
+ >=dev-libs/glib-2.38:2
+ crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
+ introspection? ( >=dev-libs/gobject-introspection-1.29 )
+"
+PDEPEND=">=gnome-base/gnome-keyring-3
+"
+# PDEPEND to avoid circular dep (bug #547456)
+# Add ksecrets to PDEPEND when it's added to portage
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ dev-python/mock
+ introspection? (
+ ${PYTHON_DEPS}
+ >=dev-libs/gjs-1.32
+ dev-python/pygobject:3 )
+ )
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ # FIXME: disable failing test
+ sed -e '/test_get_sync);/d' \
+ -e '/test_get_async);/d' \
+ -i libsecret/test-service.c || die
+
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog NEWS README"
+ gnome2_src_configure \
+ --enable-manpages \
+ --disable-strict \
+ --disable-coverage \
+ --disable-static \
+ $(use_enable crypt gcrypt) \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
+
+src_test() {
+ Xemake check
+}
diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
new file mode 100644
index 000000000000..455620cf3c8e
--- /dev/null
+++ b/app-crypt/libsecret/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
new file mode 100644
index 000000000000..7ac29be56773
--- /dev/null
+++ b/app-crypt/libu2f-host/Manifest
@@ -0,0 +1,2 @@
+DIST libu2f-host-0.0.2.tar.xz 444176 SHA256 c9e5478f5d139c30603afe65ea7ef52b0b18c93df60103b1dafeb7f3d17acbd8 SHA512 1b10a5c8d3d071b0d5576a2247b2cc40327fe6fe7370a7680cede7ebda72bd7f0edfa1661b78074a85654a5d979f757c64c090360c69feddb9c3212dc0438deb WHIRLPOOL f8cc5d7524c8ed7943945af44e5b93b43463118b06b186460090df3c69871319e0a347c94a28467b782eb09e2653ef72ab98478d8acf720b86b807223b1ee0b1
+DIST libu2f-host-0.0.4.tar.xz 446604 SHA256 852231611bd5c526406b984ae3c92ce3423ffc7a0ef01f6a060a43b64725ead6 SHA512 09406f45bea4cbca2fd26a4ad546b2233f56e1df098976cbd24dcab08e27bf9131fdc52557b4c701b8ce27b0ece7b405e8cda889591a5e3dc9420611336d1060 WHIRLPOOL 84ac2c5e4170ff45ecb9595c73dabd6a34f79bdcf4ef9bf3ceb32c481febe0537e3ab129fcd7a63c73389b3dbc0742834574b739ed36c419b6bc84b5c01a4d5b
diff --git a/app-crypt/libu2f-host/libu2f-host-0.0.2.ebuild b/app-crypt/libu2f-host/libu2f-host-0.0.2.ebuild
new file mode 100644
index 000000000000..e2be80325860
--- /dev/null
+++ b/app-crypt/libu2f-host/libu2f-host-0.0.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils linux-info udev
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-host/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kernel_linux static-libs systemd"
+
+RDEPEND="
+ dev-libs/hidapi
+ dev-libs/json-c"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ systemd? ( sys-apps/systemd[acl] )"
+
+CONFIG_CHECK="~HIDRAW"
+
+src_prepare() {
+ autotools-utils_src_prepare
+
+ sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
+ 70-u2f.rules > 70-u2f-udev.rules || die
+}
+
+src_configure() {
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ if use kernel_linux; then
+ if use systemd; then
+ udev_dorules 70-u2f.rules
+ else
+ udev_newrules 70-u2f-udev.rules 70-u2f.rules
+ fi
+ fi
+}
diff --git a/app-crypt/libu2f-host/libu2f-host-0.0.4.ebuild b/app-crypt/libu2f-host/libu2f-host-0.0.4.ebuild
new file mode 100644
index 000000000000..f1d821109f40
--- /dev/null
+++ b/app-crypt/libu2f-host/libu2f-host-0.0.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils linux-info udev
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-host/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kernel_linux static-libs systemd"
+
+RDEPEND="
+ dev-libs/hidapi
+ dev-libs/json-c"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ systemd? ( sys-apps/systemd[acl] )"
+
+CONFIG_CHECK="~HIDRAW"
+
+src_prepare() {
+ autotools-utils_src_prepare
+
+ sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
+ 70-u2f.rules > 70-u2f-udev.rules || die
+}
+
+src_configure() {
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ if use kernel_linux; then
+ if use systemd; then
+ udev_dorules 70-u2f.rules
+ else
+ udev_newrules 70-u2f-udev.rules 70-u2f.rules
+ fi
+ fi
+}
diff --git a/app-crypt/libu2f-host/metadata.xml b/app-crypt/libu2f-host/metadata.xml
new file mode 100644
index 000000000000..1b1e3adf7579
--- /dev/null
+++ b/app-crypt/libu2f-host/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <maintainer>
+ <email>flameeyes@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="systemd">
+ Use user ACLs rather than plugdev group to give user access to the HIDRAW
+ device.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">Yubico/libu2f-host</remote-id>
+ <bugs-to>https://github.com/Yubico/libu2f-host/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/libykneomgr/Manifest b/app-crypt/libykneomgr/Manifest
new file mode 100644
index 000000000000..847dd4fd8b90
--- /dev/null
+++ b/app-crypt/libykneomgr/Manifest
@@ -0,0 +1,2 @@
+DIST libykneomgr-0.1.6.tar.gz 633881 SHA256 7c0ddf2b5397e2d335da5d727c55d0be6a9ab43263c60edcac1ffe45b526ca95 SHA512 deb8deafa3c748bb888309d9d2d62f3657cd6d9d103ceee738abbc47a8e4466535e9641f104f5628657ec8924306b8d9d0a90cd2485dd5ad46dd2d8ee932fab4 WHIRLPOOL 3c9f1c53e411633b74b56eb991155a3ffbe2453a336b10b00a3e69a55f4c30b4df4ddfb50a7252ea058a76211d0683d029428bb24c839586b0277bde7297c582
+DIST libykneomgr-0.1.7.tar.gz 625509 SHA256 dcce20274976e29b63380633928e1e75e05544430fca37082465c9075ea29f5a SHA512 b97d0de0050a4dea55963403a8710fe94dbef05041ec4fc42c4f2e7fc7ebd64b94aeb8d8c0231ad7828840efff28e6bd5b392b25d6bcafbeaab469a6e52e5163 WHIRLPOOL 6af69069963859580fa03fd41e794d01895aaaefae3b87ae8a60575dfb82648eea5efb5970ac95608112969a174dbd75a7a2c8dade4c8ebffbed866ca6506fb6
diff --git a/app-crypt/libykneomgr/libykneomgr-0.1.6.ebuild b/app-crypt/libykneomgr/libykneomgr-0.1.6.ebuild
new file mode 100644
index 000000000000..644b5933cc40
--- /dev/null
+++ b/app-crypt/libykneomgr/libykneomgr-0.1.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils udev
+
+DESCRIPTION="YubiKey NEO CCID Manager C Library"
+HOMEPAGE="https://developers.yubico.com/libykneomgr/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kernel_linux"
+
+RDEPEND="sys-apps/pcsc-lite
+ dev-libs/libzip"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ >=app-crypt/ccid-1.4.18[usb]"
+
+src_configure() {
+ local myeconfargs=(
+ --with-backend=pcsc
+ --disable-static
+ )
+
+ autotools-utils_src_configure
+}
diff --git a/app-crypt/libykneomgr/libykneomgr-0.1.7.ebuild b/app-crypt/libykneomgr/libykneomgr-0.1.7.ebuild
new file mode 100644
index 000000000000..e6ffd1d0de4a
--- /dev/null
+++ b/app-crypt/libykneomgr/libykneomgr-0.1.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils udev
+
+DESCRIPTION="YubiKey NEO CCID Manager C Library"
+HOMEPAGE="https://developers.yubico.com/libykneomgr/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kernel_linux"
+
+RDEPEND="sys-apps/pcsc-lite
+ dev-libs/libzip"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ >=app-crypt/ccid-1.4.18[usb]"
+
+src_configure() {
+ local myeconfargs=(
+ --with-backend=pcsc
+ --disable-static
+ )
+
+ autotools-utils_src_configure
+}
diff --git a/app-crypt/libykneomgr/metadata.xml b/app-crypt/libykneomgr/metadata.xml
new file mode 100644
index 000000000000..415933a13d78
--- /dev/null
+++ b/app-crypt/libykneomgr/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <maintainer>
+ <email>flameeyes@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Yubico/libykneomgr</remote-id>
+ <bugs-to>https://github.com/Yubico/libykneomgr/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/loop-aes-losetup/Manifest b/app-crypt/loop-aes-losetup/Manifest
new file mode 100644
index 000000000000..95c520a19ce6
--- /dev/null
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -0,0 +1,2 @@
+DIST util-linux-2.21-20120228.diff.bz2 43809 SHA256 fc28d4f0e2737b53a4db59072ab0fcf4180a8ece28c79219a21780124798572a SHA512 94135ed18699efd949f5937576da2721957177bbef9be8234ae48ee34f30f4cb65361a541f79c636ed6d6bb5c2786e1096d096407834e1421d82ee78ae0790e9 WHIRLPOOL ba23dccc56fc49d7ad9075537317ad4580ace2a4cd8f6b0250f42035c03ba910f3cafa8e8b1da4c7e5a0960d74c42f2706fda579a3b4a6cadc61dccd2fff3ff0
+DIST util-linux-2.21.tar.xz 2954504 SHA256 5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb49dfae54ac45d6c8c7d86eeab0f SHA512 aab384db2d1a3e08fd560a3e4d7ed7d6b2ceac61386db94eecae65bd540200a8549e141b99d8dad5c6f96587940b574d0544984acef6a35d1f24870e0072c552 WHIRLPOOL 1968ddd63fd21ef9542bb8afc77292ed2bad6f83e1cd67aa4159db8b320abd80ee0d20a062df35ae2ad91e0bc9068168b9f9e44aa39eaf4861d436dd855bea5d
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.21.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.21.ebuild
new file mode 100644
index 000000000000..03f1261472c7
--- /dev/null
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.21.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+inherit eutils toolchain-funcs flag-o-matic autotools
+
+MY_PV="${PV/_/-}"
+MY_P="util-linux-${MY_PV}"
+LOOPAES_PV="${PV}-20120228"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
+ http://loop-aes.sourceforge.net/updates/util-linux-${LOOPAES_PV}.diff.bz2"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="nls selinux uclibc static"
+
+RDEPEND="selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/os-headers"
+
+src_prepare() {
+ epatch "${WORKDIR}"/util-linux-*.diff
+ use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
+ eautoreconf
+ elibtoolize
+}
+
+lfs_fallocate_test() {
+ # Make sure we can use fallocate with LFS #300307
+ cat <<-EOF > "${T}"/fallocate.c
+ #define _GNU_SOURCE
+ #include <fcntl.h>
+ main() { return fallocate(0, 0, 0, 0); }
+ EOF
+ append-lfs-flags
+ $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
+ || export ac_cv_func_fallocate=no
+ rm -f "${T}"/fallocate.c
+}
+
+src_configure() {
+ lfs_fallocate_test
+ econf \
+ --disable-agetty \
+ --disable-chsh-only-listed \
+ --disable-cramfs \
+ --disable-fallocate \
+ --disable-fsck \
+ --disable-kill \
+ --disable-last \
+ --disable-libmount \
+ --disable-libmount-mount \
+ --disable-libuuid \
+ --disable-login-utils \
+ --disable-makeinstall-chown \
+ --disable-makeinstall-setuid \
+ --disable-mesg \
+ --disable-mountpoint \
+ --disable-partx \
+ --disable-pg-bell \
+ --disable-pivot_root \
+ --disable-raw \
+ --disable-rename \
+ --disable-require-password \
+ --disable-reset \
+ --disable-schedutils \
+ --disable-switch_root \
+ --disable-unshare \
+ --disable-use-tty-group \
+ --disable-uuidd \
+ --disable-wall \
+ --disable-write \
+ --enable-libblkid \
+ --enable-mount \
+ --without-ncurses \
+ --without-udev \
+ $(use_enable nls) \
+ $(use_with selinux) \
+ $(tc-has-tls || echo --disable-tls) \
+ $(use static && echo --enable-static-programs=losetup)
+}
+
+src_install() {
+ emake install DESTDIR="${T}/root"
+ newsbin "${T}/root/sbin/losetup" loop-aes-losetup
+ use static && newsbin "${T}/root/bin/losetup.static" loop-aes-losetup.static
+}
diff --git a/app-crypt/loop-aes-losetup/metadata.xml b/app-crypt/loop-aes-losetup/metadata.xml
new file mode 100644
index 000000000000..b02ffbb5d348
--- /dev/null
+++ b/app-crypt/loop-aes-losetup/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/mcrypt/Manifest b/app-crypt/mcrypt/Manifest
new file mode 100644
index 000000000000..5e4c4e416764
--- /dev/null
+++ b/app-crypt/mcrypt/Manifest
@@ -0,0 +1 @@
+DIST mcrypt-2.6.8.tar.gz 471915 SHA256 5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098 SHA512 eae5f831e950df69eb93efc8314100b4b5dc8a535b1d00f500e6b25382efcec321346776a92dadf101b878ef46a47de2e9e81f5ddf5c73563ece4741f169c8d1 WHIRLPOOL f0853fd1d244de6310a4236fc0922a7d19e8c418b8d4b9cd0a66c4571843ffaf421dca7064c82ae0fde5f3aae4806fe27aa9dc05a705768f52a80586f941b538
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.7-qa.patch b/app-crypt/mcrypt/files/mcrypt-2.6.7-qa.patch
new file mode 100644
index 000000000000..368884f7fecb
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.7-qa.patch
@@ -0,0 +1,22 @@
+diff -urNp mcrypt-2.6.7.org/src/gaaout.c mcrypt-2.6.7/src/gaaout.c
+--- mcrypt-2.6.7.org/src/gaaout.c 2007-06-09 11:39:14.000000000 +0300
++++ mcrypt-2.6.7/src/gaaout.c 2007-11-10 14:30:22.000000000 +0200
+@@ -5,6 +5,7 @@
+
+
+ #include <defines.h>
++#include "mcrypt_int.h"
+
+ #include <stdio.h>
+ #include <string.h>
+diff -urNp mcrypt-2.6.7.org/src/mcrypt_int.h mcrypt-2.6.7/src/mcrypt_int.h
+--- mcrypt-2.6.7.org/src/mcrypt_int.h 2003-09-08 20:25:50.000000000 +0300
++++ mcrypt-2.6.7/src/mcrypt_int.h 2007-11-10 14:27:42.000000000 +0200
+@@ -15,3 +15,7 @@ void rol_buf(void * buffer, int buffersi
+ void mcrypt_version();
+ void mcrypt_license();
+ void usage(void);
++
++int print_list(void);
++int print_hashlist(void);
++int print_keylist(void);
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch
new file mode 100644
index 000000000000..d602bed46bfe
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch
@@ -0,0 +1,31 @@
+--- src/errors.c
++++ src/errors.c
+@@ -25,24 +25,24 @@
+
+ void err_quit(char *errmsg)
+ {
+- fprintf(stderr, errmsg);
++ fprintf(stderr, "%s", errmsg);
+ exit(-1);
+ }
+
+ void err_warn(char *errmsg)
+ {
+ if (quiet <= 1)
+- fprintf(stderr, errmsg);
++ fprintf(stderr, "%s", errmsg);
+ }
+
+ void err_info(char *errmsg)
+ {
+ if (quiet == 0)
+- fprintf(stderr, errmsg);
++ fprintf(stderr, "%s", errmsg);
+ }
+
+ void err_crit(char *errmsg)
+ {
+ if (quiet <= 2)
+- fprintf(stderr, errmsg);
++ fprintf(stderr, "%s", errmsg);
+ }
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-overflow.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-overflow.patch
new file mode 100644
index 000000000000..97c658bb2d3b
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-overflow.patch
@@ -0,0 +1,25 @@
+From 3efb40e17ce4f76717ae17a1ce1e1f747ddf59fd Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 22 Dec 2012 22:37:06 +0200
+Subject: [PATCH] cleanup: buffer overflow
+
+---
+ src/extra.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/extra.c b/src/extra.c
+index 3082f82..c7a1ac0 100644
+--- a/src/extra.c
++++ b/src/extra.c
+@@ -241,6 +241,8 @@ int check_file_head(FILE * fstream, char *algorithm, char *mode,
+ if (m_getbit(6, flags) == 1) { /* if the salt bit is set */
+ if (m_getbit(0, sflag) != 0) { /* if the first bit is set */
+ *salt_size = m_setbit(0, sflag, 0);
++ if (*salt_size > sizeof(tmp_buf))
++ err_quit(_("Salt is too long\n"));
+ if (*salt_size > 0) {
+ fread(tmp_buf, 1, *salt_size,
+ fstream);
+--
+1.7.8.6
+
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-segv.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-segv.patch
new file mode 100644
index 000000000000..478b3cbc0f6e
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-segv.patch
@@ -0,0 +1,40 @@
+From 5bee29fae8f0e936ad4c957aef6035d09532a57a Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 22 Dec 2012 22:04:27 +0200
+Subject: [PATCH] cleanup: fixup segv on buffer access
+
+use exact buffer size instead of guess.
+
+do not copy out of source buffer.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/rfc2440.c | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/rfc2440.c b/src/rfc2440.c
+index 5a1f296..929b9ab 100644
+--- a/src/rfc2440.c
++++ b/src/rfc2440.c
+@@ -497,7 +497,7 @@ plaintext_encode(const USTRING dat)
+ time_t t;
+
+ assert(dat->len > 0);
+- result = make_ustring( NULL, 2 * dat->len); /* xxx */
++ result = make_ustring( NULL, dat->len + 12); /* xxx */
+ newdat = (USTRING)dat;
+ result->d[pos++] = (0x80 | 0x40 | PKT_PLAINTEXT);
+
+@@ -810,7 +810,8 @@ encrypted_encode(const USTRING pt, const DEK *dek)
+ _mcrypt_encrypt(dek->hd, rndpref, dek->blocklen + 2, NULL, 0);
+ _mcrypt_sync(dek->hd, rndpref, dek->blocklen);
+
+- ct = make_ustring( rndpref, 2 * pt->len); /* xxx */
++ ct = make_ustring( NULL, dek->blocklen + 2 + pt->len + 12); /* xxx */
++ memcpy(ct->d, rndpref, dek->blocklen + 2);
+ pos = dek->blocklen + 2;
+
+ _mcrypt_encrypt(dek->hd, ct->d + pos, pt->len, pt->d, pt->len);
+--
+1.7.8.6
+
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch
new file mode 100644
index 000000000000..a287680958bb
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch
@@ -0,0 +1,108 @@
+Description: [CVE-2012-4527] Stack-based buffer overflow with long file names
+ .
+ A buffer overflow in mcrypt version 2.6.8 and earlier due to long filenames.
+ If a user were tricked into attempting to encrypt/decrypt specially crafted
+ long filename(s), this flaw would cause a stack-based buffer overflow that
+ could potentially lead to arbitrary code execution.
+ .
+ Note that this is caught by FORTIFY_SOURCE, which makes this a crash-only
+ bug on wheezy.
+Author: Attila Bogar, Jean-Michel Vourgère <jmv_deb@nirgal.com>
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-4527
+Bug: CVE-2012-4527
+Bug-Debian: http://bugs.debian.org/690924
+Forwarded: no
+Last-Update: 2012-11-01
+Index: mcrypt-2.6.8/src/mcrypt.c
+===================================================================
+--- mcrypt-2.6.8.orig/src/mcrypt.c
++++ mcrypt-2.6.8/src/mcrypt.c
+@@ -41,4 +41,6 @@
+
++/* Temporary error message can contain one file name and 1k of text */
++#define ERRWIDTH ((PATH_MAX)+1024)
+-char tmperr[128];
++char tmperr[ERRWIDTH];
+ unsigned int stream_flag = FALSE;
+ char *keymode = NULL;
+ char *mode = NULL;
+@@ -482,7 +485,7 @@
+ #ifdef HAVE_STAT
+ if (stream_flag == FALSE) {
+ if (is_normal_file(file[i]) == FALSE) {
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("%s: %s is not a regular file. Skipping...\n"),
+ program_name, file[i]);
+@@ -501,7 +504,7 @@
+ dinfile = file[i];
+ if ((isatty(fileno((FILE *) (stdin))) == 1)
+ && (stream_flag == TRUE) && (force == 0)) { /* not a tty */
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("%s: Encrypted data will not be read from a terminal.\n"),
+ program_name);
+@@ -520,7 +523,7 @@
+ einfile = file[i];
+ if ((isatty(fileno((FILE *) (stdout))) == 1)
+ && (stream_flag == TRUE) && (force == 0)) { /* not a tty */
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("%s: Encrypted data will not be written to a terminal.\n"),
+ program_name);
+@@ -544,7 +547,7 @@
+ strcpy(outfile, einfile);
+ /* if file has already the .nc ignore it */
+ if (strstr(outfile, ".nc") != NULL) {
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("%s: file %s has the .nc suffix... skipping...\n"),
+ program_name, outfile);
+@@ -590,10 +593,10 @@
+
+ if (x == 0) {
+ if (stream_flag == FALSE) {
+- sprintf(tmperr, _("File %s was decrypted.\n"), dinfile);
++ snprintf(tmperr, ERRWIDTH, _("File %s was decrypted.\n"), dinfile);
+ err_warn(tmperr);
+ } else {
+- sprintf(tmperr, _("Stdin was decrypted.\n"));
++ snprintf(tmperr, ERRWIDTH, _("Stdin was decrypted.\n"));
+ err_warn(tmperr);
+ }
+ #ifdef HAVE_STAT
+@@ -610,7 +613,7 @@
+
+ } else {
+ if (stream_flag == FALSE) {
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("File %s was NOT decrypted successfully.\n"),
+ dinfile);
+@@ -636,10 +639,10 @@
+
+ if (x == 0) {
+ if (stream_flag == FALSE) {
+- sprintf(tmperr, _("File %s was encrypted.\n"), einfile);
++ snprintf(tmperr, ERRWIDTH, _("File %s was encrypted.\n"), einfile);
+ err_warn(tmperr);
+ } else {
+- sprintf(tmperr, _("Stdin was encrypted.\n"));
++ snprintf(tmperr, ERRWIDTH, _("Stdin was encrypted.\n"));
+ err_warn(tmperr);
+ }
+ #ifdef HAVE_STAT
+@@ -655,7 +658,7 @@
+
+ } else {
+ if (stream_flag == FALSE) {
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("File %s was NOT encrypted successfully.\n"),
+ einfile);
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
new file mode 100644
index 000000000000..7cfae9815207
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
@@ -0,0 +1,11 @@
+--- src/rfc2440.c 2008-11-17 06:50:01.000000000 +1100
++++ src/rfc2440.c 2010-08-10 13:48:28.000000000 +1000
+@@ -23,7 +23,7 @@
+ #include <zlib.h>
+ #endif
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+ #include "xmalloc.h"
+ #include "keys.h"
diff --git a/app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild b/app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild
new file mode 100644
index 000000000000..b90de3e9c3d8
--- /dev/null
+++ b/app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="replacement of the old unix crypt(1)"
+HOMEPAGE="http://mcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-macos"
+IUSE="nls"
+
+DEPEND=">=dev-libs/libmcrypt-2.5.8
+ >=app-crypt/mhash-0.9.9
+ sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.6.7-qa.patch"
+ epatch "${FILESDIR}/${P}-stdlib.h.patch"
+ epatch "${FILESDIR}/${P}-segv.patch"
+ epatch "${FILESDIR}/${P}-sprintf.patch"
+ epatch "${FILESDIR}/${P}-format-string.patch"
+ epatch "${FILESDIR}/${P}-overflow.patch"
+}
+
+src_configure() {
+ econf $(use_enable nls)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS NEWS README THANKS TODO
+}
diff --git a/app-crypt/mcrypt/metadata.xml b/app-crypt/mcrypt/metadata.xml
new file mode 100644
index 000000000000..73113c99c420
--- /dev/null
+++ b/app-crypt/mcrypt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <maintainer>
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">mcrypt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/md4sum/Manifest b/app-crypt/md4sum/Manifest
new file mode 100644
index 000000000000..f2cc427609bd
--- /dev/null
+++ b/app-crypt/md4sum/Manifest
@@ -0,0 +1 @@
+DIST md4sum-0.02.03.tar.gz 26819 SHA256 241eb780282923fbaba5c2b2f1d72516bd47a14924c57790fc18ba05480e57c7 SHA512 5a05760aa6a770d9f55a41e42bdf6801dcd67bc804ead5bd84aecc48e5ee5a7c8b01d4a1e1767a4cc1f8695d66ed16c6a1f09b58d236c27db317f227e02e3762 WHIRLPOOL 90db3f2aa906d647d095d876ea471d01674b65e654b7fb5d56c19c0f5964814509a24351fe92279c63aae5bf74dc2e71e232f638289164403d6d9496236f92bd
diff --git a/app-crypt/md4sum/files/md4sum-fix-out-of-bounds-write.diff b/app-crypt/md4sum/files/md4sum-fix-out-of-bounds-write.diff
new file mode 100644
index 000000000000..1275996080ee
--- /dev/null
+++ b/app-crypt/md4sum/files/md4sum-fix-out-of-bounds-write.diff
@@ -0,0 +1,11 @@
+--- a/md4sum.c 2007-04-11 23:22:38.000000000 +0200
++++ b/md4sum.c 2015-02-15 21:57:59.699682995 +0100
+@@ -126,7 +126,7 @@
+ int i;
+ static char s[33];
+ for( i=0; i<16; i++ ) sprintf( &s[2*i], "%02x", digest[i] );
+- s[33]= '\0';
++ s[32]= '\0';
+ return( s );
+ }
+
diff --git a/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild b/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild
new file mode 100644
index 000000000000..36f95b68e07d
--- /dev/null
+++ b/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="md4 and edonkey hash algorithm tool"
+HOMEPAGE="http://linux.xulin.de/c/"
+SRC_URI="http://linux.xulin.de/c/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE=""
+
+src_prepare() {
+ epatch "${FILESDIR}/md4sum-fix-out-of-bounds-write.diff"
+}
+
+src_compile() {
+ sed -i -e "s:CFLAGS=:CFLAGS=${CFLAGS} :g" \
+ -e "s:install -s:install:g" Makefile
+ emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+ mkdir -p "${D}/usr/bin"
+ mkdir -p "${D}/usr/share/man/man1"
+ einstall || die "einstall failed"
+}
diff --git a/app-crypt/md4sum/metadata.xml b/app-crypt/md4sum/metadata.xml
new file mode 100644
index 000000000000..8cb548491f4e
--- /dev/null
+++ b/app-crypt/md4sum/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>hanno@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-crypt/md5deep/Manifest b/app-crypt/md5deep/Manifest
new file mode 100644
index 000000000000..07a74610f01b
--- /dev/null
+++ b/app-crypt/md5deep/Manifest
@@ -0,0 +1,2 @@
+DIST md5deep-4.3.tar.gz 1416180 SHA256 905bcf8bddf0e7e2650b280d5e7af8cb8cd41dad4f299751dfec397dcb4f8d54 SHA512 fe1240e6ae039b18d35a9de0cf15fb77eaac9d5505b6b550eb32858bf6d603f8186de06114d40325d5071640f46cec70795e9c192fa7b6ca9022a12c212a9b14 WHIRLPOOL 89fe1f5a5a9502660f823608b7fc5c752d3b71acbb210a4ce7c9349e02bbbc131b26df29f69cbae2ba234685cf0db38014d71f2b019f8189bd0e05e6c2b81e52
+DIST md5deep-4.4.tar.gz 4534687 SHA256 dbda8ab42a9c788d4566adcae980d022d8c3d52ee732f1cbfa126c551c8fcc46 SHA512 c37ec85ed04d4452f9038f43434c02e064cf9e17c4eaa233867dba0236443922a14ccb8ec76c68820087751c2ca3db014d3f17dd8fcd2c2bde84d620aae50de1 WHIRLPOOL 2b85d77c6108b012dcca632b54a55b1fc7c942e7efbf6be26ffdf6ed17ce66909fbeae397f139f494385856f7acfaebf4041677c24e0b4ef9e5803f776fee1f3
diff --git a/app-crypt/md5deep/md5deep-4.3.ebuild b/app-crypt/md5deep/md5deep-4.3.ebuild
new file mode 100644
index 000000000000..14b09be7421b
--- /dev/null
+++ b/app-crypt/md5deep/md5deep-4.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Expanded md5sum program with recursive and comparison options"
+HOMEPAGE="http://md5deep.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog FILEFORMAT NEWS README TODO"
diff --git a/app-crypt/md5deep/md5deep-4.4.ebuild b/app-crypt/md5deep/md5deep-4.4.ebuild
new file mode 100644
index 000000000000..924ff7ebb071
--- /dev/null
+++ b/app-crypt/md5deep/md5deep-4.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="Expanded md5sum program with recursive and comparison options"
+HOMEPAGE="http://md5deep.sourceforge.net/"
+SRC_URI="https://github.com/jessek/hashdeep/archive/release-${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="public-domain GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+S=${WORKDIR}/hashdeep-release-${PV}
+
+DOCS=( AUTHORS ChangeLog FILEFORMAT NEWS README.md TODO )
diff --git a/app-crypt/md5deep/metadata.xml b/app-crypt/md5deep/metadata.xml
new file mode 100644
index 000000000000..ee3d7c9500bc
--- /dev/null
+++ b/app-crypt/md5deep/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>tristan@gentoo.org</email>
+ <name>Tristan Heaven</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jessek/hashdeep</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/md6sum/Manifest b/app-crypt/md6sum/Manifest
new file mode 100644
index 000000000000..d414de9a22a2
--- /dev/null
+++ b/app-crypt/md6sum/Manifest
@@ -0,0 +1 @@
+DIST md6sum-1.0.tar.gz 125626 SHA256 5812286dabf26d576cf9b30d3088da1e7924362442144ecdfa38738530e297e0 SHA512 8253a68dd036dd98b22c39a35a75f9bbdc4018ea63dc8f7823c831090d19f2f92a727458b4dc35388e494dbf496b9f5de693a1cfb3e5a8ca8441f31f0e817d46 WHIRLPOOL 05d3e1c8c5065b8003e620b3824310393ad64c22e94d4e3acc18f508e5a6461ba222c1b53e782616a0bd5372c3cadc7e774b24e9782e8137b1336af5740b0a04
diff --git a/app-crypt/md6sum/files/md6sum-1.0-cflags.patch b/app-crypt/md6sum/files/md6sum-1.0-cflags.patch
new file mode 100644
index 000000000000..18e1937c4424
--- /dev/null
+++ b/app-crypt/md6sum/files/md6sum-1.0-cflags.patch
@@ -0,0 +1,27 @@
+--- Makefile.in 2012-11-07 22:04:51.207982344 -0500
++++ Makefile.in.new 2012-11-07 22:06:00.905977580 -0500
+@@ -18,19 +18,19 @@
+ all: md6sum
+
+ md6sum: $(OBJS)
+- $(CC) $(OBJS) $(CXXFLAGS) $(LDFLAGS) -o $@
++ $(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) -o $@
+
+ md6_compress.o: md6_compress.c inttypes.h md6.h md6_nist.h stdint.h
+- $(CC) $(CXXFLAGS) -c $< -o $@
++ $(CC) $(CFLAGS) -c $< -o $@
+
+ md6_mode.o: md6_mode.c inttypes.h md6.h md6_nist.h stdint.h
+- $(CC) $(CXXFLAGS) -c $< -o $@
++ $(CC) $(CFLAGS) -c $< -o $@
+
+ md6_nist.o: md6_nist.c inttypes.h md6.h md6_nist.h stdint.h
+- $(CC) $(CXXFLAGS) -c $< -o $@
++ $(CC) $(CFLAGS) -c $< -o $@
+
+ md6sum.o: md6sum.c inttypes.h md6.h md6_nist.h stdint.h
+- $(CC) $(CXXFLAGS) -c $< -o $@
++ $(CC) $(CFLAGS) -c $< -o $@
+
+ clean:
+ rm *.o
diff --git a/app-crypt/md6sum/files/md6sum-1.0-format-security.patch b/app-crypt/md6sum/files/md6sum-1.0-format-security.patch
new file mode 100644
index 000000000000..061ec7b5f1b4
--- /dev/null
+++ b/app-crypt/md6sum/files/md6sum-1.0-format-security.patch
@@ -0,0 +1,26 @@
+From 95833e409336bd0a4a656b7e2d0a9598dfe3f546 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 30 Aug 2014 21:25:23 +0300
+Subject: [PATCH] build: fix warning of format-security
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ md6sum.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/md6sum.c b/md6sum.c
+index 2401a5a..0338d30 100644
+--- a/md6sum.c
++++ b/md6sum.c
+@@ -428,7 +428,7 @@ void optd(char *optstr)
+
+ void opth()
+ { /* print md6sum help string */
+- printf(help_string);
++ printf("%s", help_string);
+ }
+
+ void optK(char *optstr)
+--
+1.8.5.5
+
diff --git a/app-crypt/md6sum/files/md6sum-1.0-ldflags.patch b/app-crypt/md6sum/files/md6sum-1.0-ldflags.patch
new file mode 100644
index 000000000000..23d37e192ea3
--- /dev/null
+++ b/app-crypt/md6sum/files/md6sum-1.0-ldflags.patch
@@ -0,0 +1,12 @@
+diff -Nru md6sum-1.0.orig/Makefile.in md6sum-1.0/Makefile.in
+--- md6sum-1.0.orig/Makefile.in 2011-01-09 02:12:09.000000000 +0000
++++ md6sum-1.0/Makefile.in 2011-02-01 04:41:35.000000000 +0000
+@@ -18,7 +18,7 @@
+ all: md6sum
+
+ md6sum: $(OBJS)
+- $(CC) $(OBJS) $(CXXFLAGS) -o $@
++ $(CC) $(OBJS) $(CXXFLAGS) $(LDFLAGS) -o $@
+
+ md6_compress.o: md6_compress.c inttypes.h md6.h md6_nist.h stdint.h
+ $(CC) $(CXXFLAGS) -c $< -o $@
diff --git a/app-crypt/md6sum/md6sum-1.0-r2.ebuild b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
new file mode 100644
index 000000000000..446e21a7c2ab
--- /dev/null
+++ b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A C implementation of MD6"
+HOMEPAGE="http://groups.csail.mit.edu/cis/md6"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-ldflags.patch"
+ epatch "${FILESDIR}/${P}-cflags.patch"
+ epatch "${FILESDIR}/${P}-format-security.patch"
+}
+
+src_install() {
+ default
+ newdoc README_Reference.txt README
+}
diff --git a/app-crypt/md6sum/metadata.xml b/app-crypt/md6sum/metadata.xml
new file mode 100644
index 000000000000..2d87b7020851
--- /dev/null
+++ b/app-crypt/md6sum/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <longdescription lang="en">
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">md6sum</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/mdcrack/Manifest b/app-crypt/mdcrack/Manifest
new file mode 100644
index 000000000000..44b7d7493d46
--- /dev/null
+++ b/app-crypt/mdcrack/Manifest
@@ -0,0 +1 @@
+DIST mdcrack-1.2.tar.gz 60261 SHA256 b68dec25170f177c70264c5a2863a70c28011f669db56a8825ae4ca28b1f5825 SHA512 1a0ec91e19c65ea5c94b988a3a40226e2996adde26970e847ee3756263e65201751c449e6a29595b67314480be10460fdb2ebb31b5e734039d777e58b42c2965 WHIRLPOOL 12ae6e72a2145a09dfaed7e5d95f383c15d8f2187ed8bf1004e17adb783bfc535ff28c15fd94935e3ce2c58b8e8a874e35368ad482b9ecfcfbcf68df5717b662
diff --git a/app-crypt/mdcrack/files/mdcrack-1.2-asneeded.patch b/app-crypt/mdcrack/files/mdcrack-1.2-asneeded.patch
new file mode 100644
index 000000000000..3b5abe5967b1
--- /dev/null
+++ b/app-crypt/mdcrack/files/mdcrack-1.2-asneeded.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig 2009-02-10 17:06:52.786706429 +0100
++++ Makefile 2009-02-10 17:07:15.947791244 +0100
+@@ -56,7 +56,7 @@
+ NCURSES=-DNCURSES
+
+ #LDFLAGS=
+-LDFLAGS=-lncurses
++LIBS=-lncurses
+
+ # Debugging
+ DEBUG=
+@@ -94,7 +94,7 @@
+
+
+ bin/mdcrack: src/coding.o src/NTLM1/core3.o src/NTLM1/core3b.o src/NTLM1/unicode.o src/MD4/core1b.o src/MD4/core2b.o src/MD4/core3b.o src/MD4/core1.o src/MD4/core2.o src/MD4/core3.o src/MD5/core1b.o src/MD5/core2b.o src/MD5/core3b.o src/MD5/core1.o src/MD5/core2.o src/MD5/core3.o src/title.o src/mdcrack.o src/stats.o src/mesgs.o src/hash.o src/charset.o
+- $(CC) $(LDFLAGS) -o bin/mdcrack src/coding.o src/NTLM1/core3.o src/NTLM1/core3b.o src/NTLM1/unicode.o src/MD4/core1b.o src/MD4/core2b.o src/MD4/core3b.o src/MD4/core1.o src/MD4/core2.o src/MD4/core3.o src/MD5/core1b.o src/MD5/core2b.o src/MD5/core3b.o src/MD5/core1.o src/MD5/core2.o src/MD5/core3.o src/title.o src/mesgs.o src/mdcrack.o src/stats.o src/hash.o src/charset.o
++ $(CC) $(LDFLAGS) -o bin/mdcrack src/coding.o src/NTLM1/core3.o src/NTLM1/core3b.o src/NTLM1/unicode.o src/MD4/core1b.o src/MD4/core2b.o src/MD4/core3b.o src/MD4/core1.o src/MD4/core2.o src/MD4/core3.o src/MD5/core1b.o src/MD5/core2b.o src/MD5/core3b.o src/MD5/core1.o src/MD5/core2.o src/MD5/core3.o src/title.o src/mesgs.o src/mdcrack.o src/stats.o src/hash.o src/charset.o $(LIBS)
+
+ big:
+ @echo
diff --git a/app-crypt/mdcrack/files/mdcrack-1.2-gcc4.diff b/app-crypt/mdcrack/files/mdcrack-1.2-gcc4.diff
new file mode 100644
index 000000000000..1b01d97e4175
--- /dev/null
+++ b/app-crypt/mdcrack/files/mdcrack-1.2-gcc4.diff
@@ -0,0 +1,24 @@
+diff --exclude='*~' -Naur mdcrack-1.2.orig/src/MD4/core3.c mdcrack-1.2/src/MD4/core3.c
+--- mdcrack-1.2.orig/src/MD4/core3.c 2005-09-10 19:19:56.000000000 -0300
++++ mdcrack-1.2/src/MD4/core3.c 2005-09-10 19:28:47.000000000 -0300
+@@ -1575,7 +1575,7 @@
+
+ ascii2bin(test, conv, hash);
+ Decode(result2, hash, 16);
+- (unsigned int)bufferr2+=len+35;
++ bufferr2+=(len+35);
+ }
+ else
+
+diff --exclude='*~' -Naur mdcrack-1.2.orig/src/MD5/core3.c mdcrack-1.2/src/MD5/core3.c
+--- mdcrack-1.2.orig/src/MD5/core3.c 2005-09-10 19:19:56.000000000 -0300
++++ mdcrack-1.2/src/MD5/core3.c 2005-09-10 19:29:02.000000000 -0300
+@@ -1537,7 +1537,7 @@
+
+ ascii2bin(test, conv, hash);
+ Decode(result2, hash, 16);
+- (unsigned int)bufferr2+=len+35;
++ bufferr2+=len+35;
+ }
+ else
+
diff --git a/app-crypt/mdcrack/files/mdcrack-1.2-remove-interactive-test.diff b/app-crypt/mdcrack/files/mdcrack-1.2-remove-interactive-test.diff
new file mode 100644
index 000000000000..5208bc4b3cae
--- /dev/null
+++ b/app-crypt/mdcrack/files/mdcrack-1.2-remove-interactive-test.diff
@@ -0,0 +1,120 @@
+--- Makefile 2010-06-28 22:19:55.000000000 -0400
++++ myMakefile 2010-06-28 22:20:03.000000000 -0400
+@@ -47,7 +47,6 @@
+ BLOCK=-DBLOCKSIZE=50
+
+ #full optimization
+-CFLAGS = -O3 -fforce-addr -funroll-loops -fomit-frame-pointer -ffast-math
+
+
+
+@@ -203,8 +202,8 @@
+ @echo
+ @echo "Core 1 (password <= 12) : Cracking \"hack\" string with [a-z0-9] charset."
+ @echo
+- bin/mdcrack -s abcdefghijklmnopqrstuvwxyz0123456789 d78b6f30225cdc811adfe8d4e7c9fd34
+- bin/mdcrack -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 c1f9e5db622135eaca09665555b308da
++ `echo 1 | bin/mdcrack -s abcdefghijklmnopqrstuvwxyz0123456789 d78b6f30225cdc811adfe8d4e7c9fd34 > out1`
++ `echo 1 | bin/mdcrack -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 c1f9e5db622135eaca09665555b308da > out2`
+ @echo
+ @echo "ok."
+ @echo
+@@ -213,8 +212,8 @@
+ @echo
+ @echo "Core 1 with ending string (password <= 12) : Cracking \"bbbhack\" string with [a-z0-9] charset."
+ @echo
+- bin/mdcrack -e ack -s abcdefghijklmnopqrstuvwxyz0123456789 afd3256209cb976c40495ea15548faca
+- bin/mdcrack -e ack -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 0b3128de2dd2d37ea87cc4eaedde68e1
++ `echo 1 | bin/mdcrack -e ack -s abcdefghijklmnopqrstuvwxyz0123456789 afd3256209cb976c40495ea15548faca > out3`
++ `echo 1 | bin/mdcrack -e ack -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 0b3128de2dd2d37ea87cc4eaedde68e1 > out4`
+ @echo
+ @echo "ok."
+ @echo
+@@ -224,8 +223,8 @@
+ @echo
+ @echo "Core 2 with ending string (password <= 28) : Cracking \"bbbbbbbbbbbbbbbhack\" string with [a-z0-9] charset."
+ @echo
+- bin/mdcrack -e bbbbbbbbbbhack -s abcdefghijklmnopqrstuvwxyz0123456789 a22fcc8c0fbd42bc44c956ee64a93ef6
+- bin/mdcrack -e bbbbbbbbbbhack -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 18acb3389f68c92df3d0cd713ef3ab84
++ `echo 1 | bin/mdcrack -e bbbbbbbbbbhack -s abcdefghijklmnopqrstuvwxyz0123456789 a22fcc8c0fbd42bc44c956ee64a93ef6 > out5`
++ `echo 1 | bin/mdcrack -e bbbbbbbbbbhack -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 18acb3389f68c92df3d0cd713ef3ab84 > out6`
+ @echo
+ @echo "ok."
+ @echo
+@@ -236,8 +235,8 @@
+ @echo
+ @echo "Core 3 with ending string (password <= 56) : Cracking \"bbbbbbbbbbbbbbbbbbbbbbbbbbbbhack\" string with [a-z0-9] charset."
+ @echo
+- bin/mdcrack -e bbbbbbbbbbbbbbbbbbbbbbbhack -s abcdefghijklmnopqrstuvwxyz0123456789 e9a2926c5540d4a853f463e3fbc4aba7
+- bin/mdcrack -e bbbbbbbbbbbbbbbbbbbbbbbhack -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 f85cb507b9f0fb1f181854394892610a
++ `echo 1 | bin/mdcrack -e bbbbbbbbbbbbbbbbbbbbbbbhack -s abcdefghijklmnopqrstuvwxyz0123456789 e9a2926c5540d4a853f463e3fbc4aba7 > out7`
++ `echo 1 | bin/mdcrack -e bbbbbbbbbbbbbbbbbbbbbbbhack -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 f85cb507b9f0fb1f181854394892610a > out8`
+ @echo
+ @echo "ok."
+ @echo
+@@ -247,8 +246,8 @@
+ @echo
+ @echo "Core 1 with beginning string (password <= 12) : Cracking \"aaahack\" string with [a-z0-9] charset."
+ @echo
+- bin/mdcrack -b aaa -s abcdefghijklmnopqrstuvwxyz0123456789 16522beac358f4f75eafdda40180ff79
+- bin/mdcrack -b aaa -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 3a0d395696a13d7633de725746f7c164
++ `echo 1 | bin/mdcrack -b aaa -s abcdefghijklmnopqrstuvwxyz0123456789 16522beac358f4f75eafdda40180ff79 > out9`
++ `echo 1 | bin/mdcrack -b aaa -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 3a0d395696a13d7633de725746f7c164 > out10`
+ @echo
+ @echo "ok."
+ @echo
+@@ -258,8 +257,8 @@
+ @echo
+ @echo "Core 1 with beginning/ending string (password <= 12) : Cracking \"aaahack\" string with [a-z0-9] charset."
+ @echo
+- bin/mdcrack -b aa -e k -s abcdefghijklmnopqrstuvwxyz0123456789 16522beac358f4f75eafdda40180ff79
+- bin/mdcrack -b aa -M MD4 -e k -s abcdefghijklmnopqrstuvwxyz0123456789 3a0d395696a13d7633de725746f7c164
++ `echo 1 | bin/mdcrack -b aa -e k -s abcdefghijklmnopqrstuvwxyz0123456789 16522beac358f4f75eafdda40180ff79 > out11`
++ `echo 1 | bin/mdcrack -b aa -M MD4 -e k -s abcdefghijklmnopqrstuvwxyz0123456789 3a0d395696a13d7633de725746f7c164 > out12`
+ @echo
+ @echo "ok."
+ @echo
+@@ -269,8 +268,8 @@
+ @echo
+ @echo "Core 2 with beginning string (password <= 28) : Cracking \"aaaaaaaaaaaaaaahack\" string with [a-z0-9] charset."
+ @echo
+- bin/mdcrack -b aaaaaaaaaaaaaaa -s abcdefghijklmnopqrstuvwxyz0123456789 707d4f8220ed0b6980cf74c190e95186
+- bin/mdcrack -b aaaaaaaaaaaaaaa -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 ea5544cae8ac6fdfdc69a1fab32da03d
++ `echo 1 | bin/mdcrack -b aaaaaaaaaaaaaaa -s abcdefghijklmnopqrstuvwxyz0123456789 707d4f8220ed0b6980cf74c190e95186 > out13`
++ `echo 1 | bin/mdcrack -b aaaaaaaaaaaaaaa -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 ea5544cae8ac6fdfdc69a1fab32da03d > out14`
+ @echo
+ @echo "ok."
+ @echo
+@@ -280,8 +279,8 @@
+ @echo
+ @echo "Core 2 with beginning/ending string (password <= 28) : Cracking \"aaaaaaaaaaaaaaahack\" string with [a-z0-9] charset."
+ @echo
+- bin/mdcrack -b aaaaaaaaaaaaaa -e k -s abcdefghijklmnopqrstuvwxyz0123456789 707d4f8220ed0b6980cf74c190e95186
+- bin/mdcrack -b aaaaaaaaaaaaaa -M MD4 -e k -s abcdefghijklmnopqrstuvwxyz0123456789 ea5544cae8ac6fdfdc69a1fab32da03d
++ `echo 1 | bin/mdcrack -b aaaaaaaaaaaaaa -e k -s abcdefghijklmnopqrstuvwxyz0123456789 707d4f8220ed0b6980cf74c190e95186 > out15`
++ `echo 1 | bin/mdcrack -b aaaaaaaaaaaaaa -M MD4 -e k -s abcdefghijklmnopqrstuvwxyz0123456789 ea5544cae8ac6fdfdc69a1fab32da03d > out16`
+ @echo
+ @echo "ok."
+ @echo
+@@ -292,8 +291,8 @@
+ @echo
+ @echo "Core 3 with beginning string (password <= 56) : Cracking \"aaaaaaaaaaaaaaaaaaaaaaaaaaaahack\" string with [a-z0-9] charset."
+ @echo
+- bin/mdcrack -b aaaaaaaaaaaaaaaaaaaaaaaaaaaa -s abcdefghijklmnopqrstuvwxyz0123456789 6067f9a5081e0abadf5e01315f3dad17
+- bin/mdcrack -b aaaaaaaaaaaaaaaaaaaaaaaaaaaa -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 c486a682f42e083e298677a4af6f62be
++ `echo 1 | bin/mdcrack -b aaaaaaaaaaaaaaaaaaaaaaaaaaaa -s abcdefghijklmnopqrstuvwxyz0123456789 6067f9a5081e0abadf5e01315f3dad17 > out17`
++ `echo 1 | bin/mdcrack -b aaaaaaaaaaaaaaaaaaaaaaaaaaaa -M MD4 -s abcdefghijklmnopqrstuvwxyz0123456789 c486a682f42e083e298677a4af6f62be > out18`
+ @echo
+ @echo "ok."
+ @echo
+@@ -303,8 +302,8 @@
+ @echo
+ @echo "Core 3 with beginning/ending string (password <= 56) : Cracking \"aaaaaaaaaaaaaaaaaaaaaaaaaaaahack\" string with [a-z0-9] charset."
+ @echo
+- bin/mdcrack -b aaaaaaaaaaaaaaaaaaaaaaaaaaa -e k -s abcdefghijklmnopqrstuvwxyz0123456789 6067f9a5081e0abadf5e01315f3dad17
+- bin/mdcrack -b aaaaaaaaaaaaaaaaaaaaaaaaaaa -M MD4 -e k -s abcdefghijklmnopqrstuvwxyz0123456789 c486a682f42e083e298677a4af6f62be
++ `echo 1 | bin/mdcrack -b aaaaaaaaaaaaaaaaaaaaaaaaaaa -e k -s abcdefghijklmnopqrstuvwxyz0123456789 6067f9a5081e0abadf5e01315f3dad17 > out19`
++ `echo 1 | bin/mdcrack -b aaaaaaaaaaaaaaaaaaaaaaaaaaa -M MD4 -e k -s abcdefghijklmnopqrstuvwxyz0123456789 c486a682f42e083e298677a4af6f62be > out20`
+ @echo
+ @echo "ok."
+ @echo
diff --git a/app-crypt/mdcrack/mdcrack-1.2.ebuild b/app-crypt/mdcrack/mdcrack-1.2.ebuild
new file mode 100644
index 000000000000..5dcc0c486b44
--- /dev/null
+++ b/app-crypt/mdcrack/mdcrack-1.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A MD4/MD5/NTML hashes bruteforcer"
+HOMEPAGE="http://mdcrack.df.ru/"
+SRC_URI="http://mdcrack.df.ru/download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="ncurses"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc4.diff \
+ "${FILESDIR}"/${P}-asneeded.patch \
+ "${FILESDIR}"/${P}-remove-interactive-test.diff
+
+ use ncurses || \
+ sed -i -e 's/^NCURSES/#NCURSES/g' \
+ -e 's/^LIBS/#LIBS/g' Makefile
+ sed -i -e '/^CFLAGS/d' \
+ -e 's|make bin/mdcrack|$(MAKE) bin/mdcrack|g' \
+ -e 's|make core|$(MAKE) core|g' Makefile
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" little || die "emake failed"
+}
+
+src_test() {
+ local failure=false
+
+ make CC="$(tc-getCC)" fulltest || die "self test failed"
+
+ for i in {1..20}; do
+ if grep "Collision found" out$i ; then
+ elog "Test $i: Passed"
+ else
+ elog "Test $i: Failed"
+ failure=true
+ fi
+ done
+
+ if $failure; then
+ die "Some tests failed"
+ fi
+}
+
+src_install() {
+ dobin bin/mdcrack || die "dobin failed"
+ dodoc BENCHMARKS CREDITS FAQ README TODO VERSIONS WWW || die
+}
diff --git a/app-crypt/mdcrack/metadata.xml b/app-crypt/mdcrack/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/app-crypt/mdcrack/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/app-crypt/metadata.xml b/app-crypt/metadata.xml
new file mode 100644
index 000000000000..d508e6060e4c
--- /dev/null
+++ b/app-crypt/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The app-crypt category contains cryptographic (encryption, decryption,
+ steganography and signing) software.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie app-crypt enhält kryptographische (Ver- und Entschlüsselung,
+ Steganographie, Signierung) Software.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría app-crypt contiene programas para criptografía
+ (cifrado, des-cifrado, estenografía y firmas).
+ </longdescription>
+ <longdescription lang="ja">
+ app-cryptカテゴリには暗号手法ソフトウェア
+ (暗証化と復号化と電子透かしと電子署名)が含まれます。
+ </longdescription>
+ <longdescription lang="nl">
+ De app-crypt categorie bevat cryptografische applicaties (encryptie,
+ decryptie, steganografie,...).
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm app-crypto chứa các ứng dụng về mật mã (mã hóa,
+ giải mã, kỷ tên và steganography).
+ </longdescription>
+ <longdescription lang="it">
+ La categoria app-crypt contiene programmi di crittografia (cifratura, decifratura, steganografia e firma).
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria app-crypt contém programas criptográficos (cifradores,
+ descifradores, esteganografia e assinaturas).
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria app-crypt zawiera programy kryptograficzne związane z
+ szyfrowaniem, deszyfrowaniem, stenografią oraz podpisywaniem danych.
+ </longdescription>
+</catmetadata>
+
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
new file mode 100644
index 000000000000..cd4ce6bccdba
--- /dev/null
+++ b/app-crypt/mhash/Manifest
@@ -0,0 +1 @@
+DIST mhash-0.9.9.9.tar.gz 931437 SHA256 3dcad09a63b6f1f634e64168dd398e9feb9925560f9b671ce52283a79604d13e SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee WHIRLPOOL d1a77b1ccb172af9ee4c7769b6f1d1f53f3b7cb1d87f7aad0c5fb64ae40302f21134a1cd05447dd766bc4408ae2dbb014db77d68a052a57131c955d3ca6453c2
diff --git a/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch b/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch
new file mode 100644
index 000000000000..19981b6b9072
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch
@@ -0,0 +1,96 @@
+Per debian 473204: http://bugs.debian.org/473204, mhash exports #defines that
+are customarily autotools-private. This results in warnings when other packages
+attempt to use mhash's headers.
+
+Gentoo-Bug: 221093
+Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=221093
+Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=152625&action=view
+Signed-off-by: Peter Alfredson <loki_val@gentoo.org>
+
+diff -NrU5 mhash-0.9.9.orig/configure.in mhash-0.9.9/configure.in
+--- mhash-0.9.9.orig/configure.in 2008-05-09 16:17:52.000000000 +0200
++++ mhash-0.9.9/configure.in 2008-05-09 16:18:20.000000000 +0200
+@@ -4,10 +4,11 @@
+ AC_CANONICAL_TARGET
+ AC_CONFIG_SRCDIR([lib/mhash.c])
+ AM_INIT_AUTOMAKE
+
+ AC_DEFINE([MHASH_VERSION], PROGRAM_VERSION, "MHash Version")
++AC_CONFIG_HEADER([include/mutils/config.h])
+ AC_CONFIG_HEADER([include/mutils/mhash_config.h])
+
+
+ dnl Check system.
+
+diff -NrU5 mhash-0.9.9.orig/include/mutils/config.h.in mhash-0.9.9/include/mutils/config.h.in
+--- mhash-0.9.9.orig/include/mutils/config.h.in 1970-01-01 01:00:00.000000000 +0100
++++ mhash-0.9.9/include/mutils/config.h.in 2008-05-09 16:18:20.000000000 +0200
+@@ -0,0 +1,22 @@
++/* Name of package */
++#undef PACKAGE
++
++/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT
++
++/* Define to the full name of this package. */
++#undef PACKAGE_NAME
++
++/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING
++
++/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME
++
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
++/* Version number of package */
++#undef VERSION
++
++
+diff -NrU5 mhash-0.9.9.orig/include/mutils/mhash_config.h.in mhash-0.9.9/include/mutils/mhash_config.h.in
+--- mhash-0.9.9.orig/include/mutils/mhash_config.h.in 2008-05-09 16:17:52.000000000 +0200
++++ mhash-0.9.9/include/mutils/mhash_config.h.in 2008-05-09 16:19:17.000000000 +0200
+@@ -179,28 +179,10 @@
+ #undef MHASH_VERSION
+
+ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
+ #undef NO_MINUS_C_MINUS_O
+
+-/* Name of package */
+-#undef PACKAGE
+-
+-/* Define to the address where bug reports for this package should be sent. */
+-#undef PACKAGE_BUGREPORT
+-
+-/* Define to the full name of this package. */
+-#undef PACKAGE_NAME
+-
+-/* Define to the full name and version of this package. */
+-#undef PACKAGE_STRING
+-
+-/* Define to the one symbol short name of this package. */
+-#undef PACKAGE_TARNAME
+-
+-/* Define to the version of this package. */
+-#undef PACKAGE_VERSION
+-
+ /* Define to 1 if the C compiler supports function prototypes. */
+ #undef PROTOTYPES
+
+ /* The size of `unsigned char', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_CHAR
+@@ -221,13 +203,10 @@
+ #undef STDC_HEADERS
+
+ /* dmalloc */
+ #undef USE_DMALLOC
+
+-/* Version number of package */
+-#undef VERSION
+-
+ /* Define if using the dmalloc debugging malloc package */
+ #undef WITH_DMALLOC
+
+ /* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch b/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch
new file mode 100644
index 000000000000..74552499501f
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch
@@ -0,0 +1,27 @@
+The package app-crypt/mhash-0.9.9 as well as app-crypt/mhash-0.9.9-r1 are
+affected by a bug which causes memory to be leaked during
+mhash_restore_state_mem.
+
+In this function/patch, ret->state is allocated towards the beginning and later
+on replaced with a new allocated area without freeing the old. The patch fixes
+it.
+
+Patch already submitted upstream, but depending on speed, this may be faster to
+patch in a new patchset.
+
+Gentoo-Bug: 255006
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255006
+Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=178560
+Signed-off-by: Thomas Harning <harningt@gmail.com>
+
+--- mhash-0.9.9/lib/mhash.c 2007-02-21 01:18:46.000000000 -0500
++++ mhash-0.9.9-new/lib/mhash.c 2009-01-15 01:57:53.000000000 -0500
+@@ -719,6 +719,8 @@
+ mutils_memcpy( &ret->state_size, &mem[pos], sizeof(ret->state_size));
+ pos += sizeof( ret->state_size);
+
++ if (ret->state)
++ mutils_free(ret->state);
+ ret->state = mutils_malloc(ret->state_size);
+ if (ret->state==NULL)
+ goto freeall;
diff --git a/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch b/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch
new file mode 100644
index 000000000000..c308269c1b24
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch
@@ -0,0 +1,27 @@
+The package app-crypt/mhash-0.9.9 as well as app-crypt/mhash-0.9.9-r1 are
+affected by a bug which causes a NULL ptr dereference in whirlpool/snefru
+digest-completion functionality.
+
+In this patch, whirlpool and snefru's code is updated to bail if 'digest' is
+NULL. The code portion aborted is only responsible for writing data to the
+digest, so this appears to be correct behavior.
+
+Patch already submitted upstream, but depending on speed, this may be faster to
+patch in a new patchset.
+
+Gentoo-Bug: 255131
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255131
+Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=178666&action=view
+Signed-off-by: Thomas Harning <harningt@gmail.com>
+
+--- mhash-0.9.9/lib/snefru.c 2009-01-16 00:16:04.000000000 -0500
++++ mhash-0.9.9-new/lib/snefru.c 2009-01-16 00:16:21.000000000 -0500
+@@ -859,6 +859,8 @@
+ {
+ mutils_word32 i;
+
++ if(!digest) return;
++
+ for (i = 0; i < len; i++, digest += 4)
+ {
+ *(mutils_word32 *)digest = mutils_bend2sys32(ctx->hash[i]);
diff --git a/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch b/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch
new file mode 100644
index 000000000000..6c79139d5793
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch
@@ -0,0 +1,27 @@
+The package app-crypt/mhash-0.9.9 as well as app-crypt/mhash-0.9.9-r1 are
+affected by a bug which causes a NULL ptr dereference in whirlpool/snefru
+digest-completion functionality.
+
+In this patch, whirlpool and snefru's code is updated to bail if 'digest' is
+NULL. The code portion aborted is only responsible for writing data to the
+digest, so this appears to be correct behavior.
+