diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-01-31 00:12:52 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-01-31 00:12:52 +0000 |
commit | 75f49d1245fff74048a7282035724df66852fd19 (patch) | |
tree | f5313f70c3642299b26cd912a5956a612d2f9008 /dev-libs/opencryptoki | |
parent | Sign Manifest (diff) | |
download | gentoo-2-75f49d1245fff74048a7282035724df66852fd19.tar.gz gentoo-2-75f49d1245fff74048a7282035724df66852fd19.tar.bz2 gentoo-2-75f49d1245fff74048a7282035724df66852fd19.zip |
Remove compatibility symlink (we don't have software needing them in Portage), and move libopencryptoki to the linkers' search path instead of changing those paths.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/opencryptoki')
-rw-r--r-- | dev-libs/opencryptoki/ChangeLog | 10 | ||||
-rw-r--r-- | dev-libs/opencryptoki/opencryptoki-2.3.3-r3.ebuild (renamed from dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild) | 14 |
2 files changed, 17 insertions, 7 deletions
diff --git a/dev-libs/opencryptoki/ChangeLog b/dev-libs/opencryptoki/ChangeLog index 32d4eed1b06d..beb4c5eb0025 100644 --- a/dev-libs/opencryptoki/ChangeLog +++ b/dev-libs/opencryptoki/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/opencryptoki # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.17 2011/01/21 03:26:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.18 2011/01/31 00:12:52 flameeyes Exp $ + +*opencryptoki-2.3.3-r3 (31 Jan 2011) + + 31 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> + -opencryptoki-2.3.3-r2.ebuild, +opencryptoki-2.3.3-r3.ebuild: + Remove compatibility symlink (we don't have software needing them in + Portage), and move libopencryptoki to the linkers' search path instead of + changing those paths. 21 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> -opencryptoki-2.3.2.ebuild, opencryptoki-2.3.3-r2.ebuild: diff --git a/dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild b/dev-libs/opencryptoki/opencryptoki-2.3.3-r3.ebuild index 0d299b8fee3a..d3c08bc8e54d 100644 --- a/dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild +++ b/dev-libs/opencryptoki/opencryptoki-2.3.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild,v 1.5 2011/01/21 03:26:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.3-r3.ebuild,v 1.1 2011/01/31 00:12:52 flameeyes Exp $ EAPI="2" @@ -84,6 +84,13 @@ src_configure() { src_install() { emake install DESTDIR="${D}" || die "emake install failed" + # Install libopencryptoki in the standard directory for libraries. + mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die + + # Remove compatibility symlinks as we _never_ required those and + # they seem unused even upstream. + find "${D}" -name 'PKCS11_*' -delete + # doesn't use libltdl; only dlopen()-based interfaces find "${D}" -name '*.la' -delete @@ -100,10 +107,5 @@ src_install() { newinitd "${T}/pkcsslotd.init" pkcsslotd - dodir /etc/env.d - cat - > "${D}"/etc/env.d/50${PN} <<EOF -LDPATH=/usr/$(get_libdir)/opencryptoki:/usr/$(get_libdir)/opencryptoki/stdll -EOF - dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf || die } |