Add pkg-config, bug#205187, cleanups

Package-Manager: portage-2.1.4_rc14

3 files changed, 23 insertions, 20 deletions

diff --git a/sys-auth/pam_pkcs11/ChangeLog b/sys-auth/pam_pkcs11/ChangeLog
index 7e230d343bae..e679412d945d 100644
--- a/sys-auth/pam_pkcs11/ChangeLog
+++ b/sys-auth/pam_pkcs11/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-auth/pam_pkcs11
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/ChangeLog,v 1.9 2007/12/21 22:02:41 alonbl Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/ChangeLog,v 1.10 2008/01/10 13:13:05 alonbl Exp $
+
+  10 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org> pam_pkcs11-0.6.0-r1.ebuild:
+  Add pkg-config, bug#205187, cleanups
 
 *pam_pkcs11-0.6.0-r1 (21 Dec 2007)
 
diff --git a/sys-auth/pam_pkcs11/Manifest b/sys-auth/pam_pkcs11/Manifest
index efcee2169938..6b5212d7e247 100644
--- a/sys-auth/pam_pkcs11/Manifest
+++ b/sys-auth/pam_pkcs11/Manifest
@@ -1,12 +1,12 @@
 DIST pam_pkcs11-0.6.0.tar.gz 1062205 RMD160 dce7b637170c07f364553c9c9ed9f82a758af356 SHA1 eef40325afc426e5364f0d9762a8e0aded34a6c2 SHA256 170db26eb9610dde5d3307771ed0e0e14cc0778aaacd3b3d4e71240ccb61cec6
-EBUILD pam_pkcs11-0.6.0-r1.ebuild 995 RMD160 a0803a8a4d0c67ee85d6995e65b454141a0503ad SHA1 cbb83cc06b3a3ff15b23f2e3a25f975447dd7418 SHA256 a1f27dd7605657a506c1baadac11426b9e9d07ea927d3ac568c8118f8b8a30bf
-MD5 ca5d179c376ee3d462d6ba8e328cf298 pam_pkcs11-0.6.0-r1.ebuild 995
-RMD160 a0803a8a4d0c67ee85d6995e65b454141a0503ad pam_pkcs11-0.6.0-r1.ebuild 995
-SHA256 a1f27dd7605657a506c1baadac11426b9e9d07ea927d3ac568c8118f8b8a30bf pam_pkcs11-0.6.0-r1.ebuild 995
-MISC ChangeLog 2585 RMD160 ac411c7f1f1b8546ea47d3f635801b64a7dc13db SHA1 50185e9184ee025bf3760b7539ea1d9e0e2b6656 SHA256 4028ec2f3feb98ba47647db57c3d4809a3e4a5e15fa04f7eb9b0586555c667d3
-MD5 d1c40ae6227d1d471041bcf4fafa9b1b ChangeLog 2585
-RMD160 ac411c7f1f1b8546ea47d3f635801b64a7dc13db ChangeLog 2585
-SHA256 4028ec2f3feb98ba47647db57c3d4809a3e4a5e15fa04f7eb9b0586555c667d3 ChangeLog 2585
+EBUILD pam_pkcs11-0.6.0-r1.ebuild 1065 RMD160 73eed81acd322b446bf1b7067b85b57c9ce2293e SHA1 71989d087c95593198f4454b1865a0882acf82ba SHA256 a7b5ee51f0cce357540a742f5ed8dfc403bf9499b958501d74a12c0570fd8fce
+MD5 ff3389b0ccb4c5421a6a75a5c8212994 pam_pkcs11-0.6.0-r1.ebuild 1065
+RMD160 73eed81acd322b446bf1b7067b85b57c9ce2293e pam_pkcs11-0.6.0-r1.ebuild 1065
+SHA256 a7b5ee51f0cce357540a742f5ed8dfc403bf9499b958501d74a12c0570fd8fce pam_pkcs11-0.6.0-r1.ebuild 1065
+MISC ChangeLog 2702 RMD160 9bb5dfc9ee272b93e23c6657e5536d35d41df0ba SHA1 5b8a2ffbc96832cb42dd130772149442dcc7cb7c SHA256 0ec0421950f4f91b0016e26d9499ffa989c6faee33eaadc2c984a9a9dacc4f6c
+MD5 169a1ffd90ecb68b8891ec2cac227b24 ChangeLog 2702
+RMD160 9bb5dfc9ee272b93e23c6657e5536d35d41df0ba ChangeLog 2702
+SHA256 0ec0421950f4f91b0016e26d9499ffa989c6faee33eaadc2c984a9a9dacc4f6c ChangeLog 2702
 MISC metadata.xml 248 RMD160 d300a6a39cab5cfc836dd8154166ea93795e7682 SHA1 651e99b4c63f219da583fdc286e904f57bfa7741 SHA256 cab631a70b543455c36e9f6125586ae2421fb453f6b20a158fcdd7317b57f2aa
 MD5 59af1ba132e999b7d1c7b6d42ed4b1e7 metadata.xml 248
 RMD160 d300a6a39cab5cfc836dd8154166ea93795e7682 metadata.xml 248
diff --git a/sys-auth/pam_pkcs11/pam_pkcs11-0.6.0-r1.ebuild b/sys-auth/pam_pkcs11/pam_pkcs11-0.6.0-r1.ebuild
index 0455bc380d3e..1a36aa60a9bf 100644
--- a/sys-auth/pam_pkcs11/pam_pkcs11-0.6.0-r1.ebuild
+++ b/sys-auth/pam_pkcs11/pam_pkcs11-0.6.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/pam_pkcs11-0.6.0-r1.ebuild,v 1.1 2007/12/21 22:02:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/pam_pkcs11-0.6.0-r1.ebuild,v 1.2 2008/01/10 13:13:05 alonbl Exp $
 
-inherit eutils
+inherit multilib
 
 DESCRIPTION="PKCS11 Pam library"
 HOMEPAGE="http://www.opensc-project.org/pam_pkcs11"
@@ -13,12 +13,13 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="curl ldap pcsc-lite"
 
-DEPEND="
-	sys-libs/pam
+RDEPEND="sys-libs/pam
+	dev-libs/openssl
 	curl? ( net-misc/curl )
 	ldap? ( net-nds/openldap )
-	pcsc-lite? ( sys-apps/pcsc-lite )
-	dev-libs/openssl"
+	pcsc-lite? ( sys-apps/pcsc-lite )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_compile() {
 		econf \
@@ -26,15 +27,14 @@ src_compile() {
 			$(use_with pcsc-lite) \
 			$(use_with ldap) \
 			|| die "econf failed"
-
 		emake || die "emake failed"
 }
 
 src_install() {
 		make DESTDIR="${D}" install || die "install failed"
 
-		dodir /lib/security
-		dosym ../../usr/lib/security/pam_pkcs11.so /lib/security/
+		dodir /$(get_libdir)/security
+		dosym ../../usr/$(get_libdir)/security/pam_pkcs11.so /$(get_libdir)/security/
 
 		dodoc NEWS README
 }