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.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

3 files changed, 22 insertions, 12 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/Manifest b/dev-libs/opencryptoki/Manifest
index 867080d200bb..bd70d533bf3e 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 AUX pkcsslotd.init.2 663 RMD160 f572831162024c441589986ce36021fc48aca7ff SHA1 d82db8e526ddc2307200e1767aa2e55184d068c1 SHA256 80c2e13cb0e9255fa3fc13977c4d1c73a10be4740a50959b8d487d328a1e1192
 DIST opencryptoki-2.3.3-backports-3.tar.bz2 5972 RMD160 e26505faab863710e1d1b6fc78f712dbfb9a54b9 SHA1 54f50f2814478e450513620842fe80303d7318a8 SHA256 fb913dbb5c2b0d87067d9738892b2a4c4a7c192d6335cc0bae2a7083e913aa74
 DIST opencryptoki-2.3.3.tar.bz2 694854 RMD160 a9ccedf5242dd611a50820fbdbb4dd9ee87a11d0 SHA1 663b1767ff33c71bd65e30e6d13d213f50528d6c SHA256 7ccae6350a7043c2abade1eb1517edb987f13e98584dd28733172e8d36600aa2
-EBUILD opencryptoki-2.3.3-r2.ebuild 3342 RMD160 ab56410bb812fb20a9d7cffdbc05cd039c60542b SHA1 ef1218052048bd09186b21831b20f71c05f94c42 SHA256 12ae2e9b0524c3d53ee89002277fedfbbc53169bcc3b1841ecbe86a00dd5e2da
-MISC ChangeLog 3993 RMD160 65e2cb979cb00902d9eded62c0c5203a7c5f3436 SHA1 767da341859d9786a7b875ee1a3d86378570ec8b SHA256 d5cfb08751348f1db74d12621c7d6a1e3964eff6915640b03336ebabe07a8276
+EBUILD opencryptoki-2.3.3-r3.ebuild 3505 RMD160 679057222b9d04829eadb8bcc4cc5eef867e7709 SHA1 1e0a917dfb8d0c294eb38e551c71753aa5dcbd66 SHA256 9a8bf89857ff9d751a80b19ca5cbd61158c2ba851d48362dde486e4718731aec
+MISC ChangeLog 4323 RMD160 1af99e25a4d6a7f99baf816e2c7a68d818ac6969 SHA1 5334dcae2dbd697093adaedc9d47bb8385429e21 SHA256 62fbc7b63038e737ca2333963ebe20e7f13d4992ca33f23007007079a9c4b781
 MISC metadata.xml 303 RMD160 c584fb11ce80c614b24f441dee3dc359c032c585 SHA1 72be61c516f86101ea2c6fec4d831a36c9371435 SHA256 6f37596c4a13d63dcbfe0b13494aacf994e803dbdf3190d1545f9fd8b355cead
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk04/O8ACgkQAiZjviIA2XjuhACeLAyblxPVWsG8ZTI5jVrOR7MR
-bowAoNh/tfG1SdwAmnQOxvxO46gE/C6b
-=n04c
+iEYEARECAAYFAk1F/oMACgkQAiZjviIA2XhBpACgx1yLy9LcpICs1lusi7bfEtEg
+ChYAnR8+HLs67pSdfTNc+qTpOfJpyLOh
+=ILfH
 -----END PGP SIGNATURE-----
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
 }