Updated patches and packaging to current upstream and added check for

pki/nssdb with helpful information.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 103 insertions, 54 deletions

diff --git a/app-crypt/coolkey/ChangeLog b/app-crypt/coolkey/ChangeLog
index e4e5048249bf..7a764ad854dc 100644
--- a/app-crypt/coolkey/ChangeLog
+++ b/app-crypt/coolkey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/coolkey
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/ChangeLog,v 1.9 2010/10/26 03:24:55 nerdboy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/ChangeLog,v 1.10 2011/04/20 02:22:36 nerdboy Exp $
+
+*coolkey-1.1.0-r4 (20 Apr 2011)
+
+  20 Apr 2011; Steve Arnold <nerdboy@gentoo.org> -coolkey-1.1.0-r3.ebuild,
+  +coolkey-1.1.0-r4.ebuild:
+  Updated patches and packaging to current upstream and added check for 
+  pki/nssdb with helpful information.
 
 *coolkey-1.1.0-r3 (26 Oct 2010)
 
diff --git a/app-crypt/coolkey/Manifest b/app-crypt/coolkey/Manifest
index 45a7ccf77975..5f9b9bce34c5 100644
--- a/app-crypt/coolkey/Manifest
+++ b/app-crypt/coolkey/Manifest
@@ -1,7 +1,7 @@
 DIST coolkey-1.1.0.tar.gz 432808 RMD160 1873e85aecb30c5311444c76fd85ba79633dce23 SHA1 54136decf9dfd091c8b231cb77dac97db95e1866 SHA256 8448e3abb81bffc593c96b577dcfbc05b40e8684188456c31be15fae73d730f7
-DIST coolkey-patches-20101024.tar.gz 18676 RMD160 f7e19adc51938a186fe5e983ac22a91f10880ca5 SHA1 0d1a9a36d21b657c197fc953d0b779449d6248d5 SHA256 56ce61f95cd6f09f33c62cbee474bbb641fbeb5fcabc02b188a4adc9a9ea7d1d
+DIST coolkey-patches-20110419.tar.gz 18966 RMD160 764d3e079229bae13c174a97df36a3431f983e99 SHA1 90eb52de3886ec439826eda60c1a991b5e4fdbfe SHA256 717827b73f704ae46b07e4835d0f1428b4d83efc5c35f501b495c00b0afe2627
 DIST coolkey-patches.tar.gz 19457 RMD160 4a4de541b80fd0c849299b205c3643305bc7384f SHA1 d2526eb556ff104767090360aa4f48f75c2504bb SHA256 441abc27412c41a3fd36a60569734b3aba4f35b3e9c85e34a93ec9acc62e98f4
 EBUILD coolkey-1.1.0-r2.ebuild 1506 RMD160 2af198b83cda30637ed9f8968a1f10274d234f0b SHA1 573df4ea09cce0f3670060fef9df6d32a2301671 SHA256 14dd58b08fedb5c7cb29f585750c01b61aece78f38ad077c3b196ff57546a924
-EBUILD coolkey-1.1.0-r3.ebuild 1404 RMD160 d6356571181020de4c1979ec075908ad9e70cfef SHA1 a1871213a82e63b3a8a33b2577a12fe71ef3feb1 SHA256 51a6f411458fa9a81a4c97d68121d24866e897defd0d18c8bb42060761471ccc
-MISC ChangeLog 1766 RMD160 b7c38eb35d0accc155c9cbd56f88057d955665d6 SHA1 dc2c53c9b63d679d14936d0452e50af4f9a49e39 SHA256 20b48efb0dd445c98b27bc5343ee197322d8e52ed3fa911057517b071f9db236
+EBUILD coolkey-1.1.0-r4.ebuild 2613 RMD160 40b6a6ade9bd2e137d7b18d396aecfdcef3eec7f SHA1 e4416520c4bad9a6cb95580888d0b7a52a720487 SHA256 15627aea50c15b84c606919d97f42c851ac5217fa60ad305b1a8d1621d9f564f
+MISC ChangeLog 2015 RMD160 f477b651b83da3c61a648e85cd9e680341de4635 SHA1 d5560b9d594dd34ed8310117a25a4d19ba0ded31 SHA256 4e0ffb116399b4c68abec9aa4614667126e5fa8644c85c5aae868122593b1b8b
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r3.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r3.ebuild
deleted file mode 100644
index 363d066cc3c9..000000000000
--- a/app-crypt/coolkey/coolkey-1.1.0-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/coolkey-1.1.0-r3.ebuild,v 1.1 2010/10/26 03:24:55 nerdboy Exp $
-
-EAPI=3
-
-inherit eutils
-
-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/${PN}-patches-20101024.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	>=app-crypt/ccid-1.4.0
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${WORKDIR}/${PN}-patches/01_${P}-cache-dir-move.patch"
-	epatch "${WORKDIR}/${PN}-patches/02_${P}-gcc43.patch"
-	epatch "${WORKDIR}/${PN}-patches/03_${P}-latest.patch"
-	epatch "${WORKDIR}/${PN}-patches/04_${P}-simple-bugs.patch"
-	epatch "${WORKDIR}/${PN}-patches/05_${P}-thread-fix.patch"
-	epatch "${WORKDIR}/${PN}-patches/06_${P}-cac.patch"
-	epatch "${WORKDIR}/${PN}-patches/07_${P}-cac-1.patch"
-	epatch "${WORKDIR}/${PN}-patches/08_${P}-pcsc-lite-fix.patch"
-}
-
-src_configure() {
-	econf $(use_enable debug) || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	diropts -m 1777
-	keepdir /var/cache/coolkey
-}
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r4.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r4.ebuild
new file mode 100644
index 000000000000..835a3bfaf968
--- /dev/null
+++ b/app-crypt/coolkey/coolkey-1.1.0-r4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/coolkey-1.1.0-r4.ebuild,v 1.1 2011/04/20 02:22:36 nerdboy Exp $
+
+EAPI=3
+
+inherit eutils
+
+PDATE="20110419"
+
+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/${PN}-patches-${PDATE}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~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
+	dev-util/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/01_${PN}-cache-dir-move.patch"
+	epatch "${WORKDIR}/${PN}-patches/02_${P}-gcc43.patch"
+	epatch "${WORKDIR}/${PN}-patches/03_${P}-latest.patch"
+	epatch "${WORKDIR}/${PN}-patches/04_${P}-simple-bugs.patch"
+	epatch "${WORKDIR}/${PN}-patches/05_${P}-thread-fix.patch"
+	epatch "${WORKDIR}/${PN}-patches/06_${P}-cac.patch"
+	epatch "${WORKDIR}/${PN}-patches/07_${PN}-cac-1.patch"
+	epatch "${WORKDIR}/${PN}-patches/08_${PN}-pcsc-lite-fix.patch"
+}
+
+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 $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
+		elog "You should remove libcoolkey from your PKCS11 library."
+	fi
+}