summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/opencryptoki/ChangeLog6
-rw-r--r--dev-libs/opencryptoki/files/digest-opencryptoki-2.2.4-r16
-rw-r--r--dev-libs/opencryptoki/opencryptoki-2.2.4-r1.ebuild55
-rw-r--r--dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild23
4 files changed, 16 insertions, 74 deletions
diff --git a/dev-libs/opencryptoki/ChangeLog b/dev-libs/opencryptoki/ChangeLog
index d5b4dd778532..2962a1cfd69d 100644
--- a/dev-libs/opencryptoki/ChangeLog
+++ b/dev-libs/opencryptoki/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/opencryptoki
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.4 2007/08/29 19:00:50 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.5 2007/11/10 15:03:29 alonbl Exp $
+
+ 10 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org>
+ -opencryptoki-2.2.4-r1.ebuild, opencryptoki-2.2.4.1.ebuild:
+ Cleanups
29 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
Removing kaiowas from metadata due to his retirement (see #61930 for
diff --git a/dev-libs/opencryptoki/files/digest-opencryptoki-2.2.4-r1 b/dev-libs/opencryptoki/files/digest-opencryptoki-2.2.4-r1
deleted file mode 100644
index e7109d86f67a..000000000000
--- a/dev-libs/opencryptoki/files/digest-opencryptoki-2.2.4-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f27dfd8e680fe8321ba3a2fa39d816d2 opencryptoki-2.2.4.tar.bz2 606881
-RMD160 fc31c97c4ae269d00b756a29212629ab90f40177 opencryptoki-2.2.4.tar.bz2 606881
-SHA256 802d8034fddf0dd73d444682c9f197d6f764bb306caf9fdee98dbea23999b043 opencryptoki-2.2.4.tar.bz2 606881
-MD5 56d44fa2c280937d8ebdeb834d017192 opencryptoki-tpm_stdll-sw_fallback-June012006.patch.bz2 3199
-RMD160 779cdb6c86c1d3b923f2349d4d3f3ff9bf720c54 opencryptoki-tpm_stdll-sw_fallback-June012006.patch.bz2 3199
-SHA256 599b4ce1daea201756bbe1a615b74cc40c8a9a635bc1baffa942fe91f5f82f8b opencryptoki-tpm_stdll-sw_fallback-June012006.patch.bz2 3199
diff --git a/dev-libs/opencryptoki/opencryptoki-2.2.4-r1.ebuild b/dev-libs/opencryptoki/opencryptoki-2.2.4-r1.ebuild
deleted file mode 100644
index 58885586bb65..000000000000
--- a/dev-libs/opencryptoki/opencryptoki-2.2.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.2.4-r1.ebuild,v 1.3 2007/07/12 02:25:35 mr_bones_ Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="PKCS#11 provider for IBM cryptographic hardware"
-HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
-SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.bz2
- mirror://gentoo/opencryptoki-tpm_stdll-sw_fallback-June012006.patch.bz2"
-LICENSE="CPL-0.5"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- sed -i '/groupadd/d' ${S}/usr/lib/pkcs11/api/Makefile.am
- sed -i 's|$(DESTDIR)||' ${S}/usr/include/pkcs11/Makefile.am
-
- # enable fallback operation mode for imported keys
- # patch written by Kent Yoder
- epatch "${WORKDIR}/opencryptoki-tpm_stdll-sw_fallback-June012006.patch" || die
-
- eautoreconf
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die "emake install failed"
-
- newinitd "${FILESDIR}/pkcsslotd.init" pkcsslotd
-
- # no need for this
- rm -rf "${D}/etc/ld.so.conf.d"
-
- # tpmtoken_* binaries expect to find the libs in /usr/lib/
- ln -s pkcs11/stdll/libpkcs11_sw.so.0.0.0 "${D}/usr/lib/libpkcs11_sw.so"
- ln -s pkcs11/stdll/libpkcs11_tpm.so.0.0.0 "${D}/usr/lib/libpkcs11_tpm.so"
-
- # we have no man pages so at least these should be installed
- dodoc doc/openCryptoki-HOWTO.pdf
- dodoc doc/opencryptoki_man.txt
- dodoc doc/pk_config_data_man.txt
- dodoc doc/pkcs11_startup_man.txt
- dodoc doc/pkcsconf_man.txt
- dodoc doc/pkcsslotd_man.txt
-}
-
-pkg_setup() {
- enewgroup pkcs11
-}
diff --git a/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild b/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild
index 4c3ac953188a..c38e61ddc06b 100644
--- a/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild,v 1.2 2007/07/12 02:25:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild,v 1.3 2007/11/10 15:03:29 alonbl Exp $
-inherit autotools eutils
+inherit autotools eutils multilib
DESCRIPTION="PKCS#11 provider for IBM cryptographic hardware"
HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
@@ -16,23 +16,25 @@ IUSE="tpmtok"
RDEPEND=""
DEPEND="${RDEPEND}"
+pkg_setup() {
+ enewgroup pkcs11
+}
+
src_unpack() {
unpack ${A}
cd "${S}"
- sed -i '/groupadd/d' ${S}/usr/lib/pkcs11/api/Makefile.am
- sed -i 's|$(DESTDIR)||' ${S}/usr/include/pkcs11/Makefile.am
+ sed -i '/groupadd/d' usr/lib/pkcs11/api/Makefile.am
+ sed -i 's|$(DESTDIR)||' usr/include/pkcs11/Makefile.am
# enable fallback operation mode for imported keys
# patch written by Kent Yoder
epatch "${WORKDIR}/opencryptoki-tpm_stdll-sw_fallback-June012006.patch" || die
-
epatch "${FILESDIR}/opencryptoki-2.2.4.1-tpm_util.c.patch" || die
-
eautoreconf
}
src_compile() {
- econf `use_enable tpmtok` || die "econf failed"
+ econf $(use_enable tpmtok) || die "econf failed"
emake || die "emake failed"
}
@@ -45,8 +47,8 @@ src_install() {
rm -rf "${D}/etc/ld.so.conf.d"
# tpmtoken_* binaries expect to find the libs in /usr/lib/
- ln -s pkcs11/stdll/libpkcs11_sw.so.0.0.0 "${D}/usr/lib/libpkcs11_sw.so"
- ln -s pkcs11/stdll/libpkcs11_tpm.so.0.0.0 "${D}/usr/lib/libpkcs11_tpm.so"
+ dosym opencryptoki/stdll/libpkcs11_sw.so.0.0.0 "/usr/$(get_libdir)/libpkcs11_sw.so"
+ dosym opencryptoki/stdll/libpkcs11_tpm.so.0.0.0 "/usr/$(get_libdir)/libpkcs11_tpm.so"
# we have no man pages so at least these should be installed
dodoc doc/openCryptoki-HOWTO.pdf
@@ -57,6 +59,3 @@ src_install() {
dodoc doc/pkcsslotd_man.txt
}
-pkg_setup() {
- enewgroup pkcs11
-}