[gentoo-commits] gentoo-x86 commit in dev-libs/opencryptoki: ChangeLog opencryptoki-2.2.4.1.ebuild opencryptoki-2.2.4-r1.ebuild

[gentoo-commits] gentoo-x86 commit in dev-libs/opencryptoki: ChangeLog opencryptoki-2.2.4.1.ebuild opencryptoki-2.2.4-r1.ebuild

[Alon Bar-Lev (alonbl)]

alonbl      07/11/10 15:03:29

  Modified:             ChangeLog opencryptoki-2.2.4.1.ebuild
  Removed:              opencryptoki-2.2.4-r1.ebuild
  Log:
  Cleanups
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.5                  dev-libs/opencryptoki/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/opencryptoki/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/opencryptoki/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/opencryptoki/ChangeLog?r1=1.4&r2=1.5

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog	29 Aug 2007 19:00:50 -0000	1.4
+++ ChangeLog	10 Nov 2007 15:03:29 -0000	1.5
@@ -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



1.3                  dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild?r1=1.2&r2=1.3

Index: opencryptoki-2.2.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opencryptoki-2.2.4.1.ebuild	12 Jul 2007 02:25:35 -0000	1.2
+++ opencryptoki-2.2.4.1.ebuild	10 Nov 2007 15:03:29 -0000	1.3
@@ -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 @@
 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 @@
 	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 @@
 	dodoc doc/pkcsslotd_man.txt
 }
 
-pkg_setup() {
-	enewgroup pkcs11
-}



-- 
gentoo-commits@gentoo.org mailing list