Remove unnecessary USE static-libs requirement from dev-libs/openssl. Remove unnecessary libkpass.la when USE static-libs is not enabled.

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

3 files changed, 28 insertions, 8 deletions

diff --git a/dev-libs/libkpass/ChangeLog b/dev-libs/libkpass/ChangeLog
index d9d8547b9d77..92308c9929ce 100644
--- a/dev-libs/libkpass/ChangeLog
+++ b/dev-libs/libkpass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libkpass
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libkpass/ChangeLog,v 1.2 2011/12/13 18:12:19 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libkpass/ChangeLog,v 1.3 2011/12/14 15:07:52 ssuominen Exp $
+
+  14 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> libkpass-3.ebuild:
+  Remove unnecessary USE static-libs requirement from dev-libs/openssl. Remove
+  unnecessary libkpass.la when USE static-libs is not enabled.
 
   13 Dec 2011; Christian Birchinger <joker@gentoo.org> libkpass-3.ebuild:
   Changed static use flag to static-libs. Removed || die from emake
diff --git a/dev-libs/libkpass/Manifest b/dev-libs/libkpass/Manifest
index 19f4033d4d81..35e95880fb46 100644
--- a/dev-libs/libkpass/Manifest
+++ b/dev-libs/libkpass/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libkpass-3.tar.gz 313707 RMD160 380dbf9fd8d3f2ba79d85dbf1a02a7d850231574 SHA1 0d5c2562dfdcfc3cff76e1a4214246dc74df62a5 SHA256 390ebca29040ae1a015f4c067de16fe585693d2b4f95caca24529917bdb2dfec
-EBUILD libkpass-3.ebuild 698 RMD160 7f5f0ffd5c5d6dd61f5dce0422321fe4a088826d SHA1 cfa17709e882bf744c55ff0307848fc8e1ad7436 SHA256 f739d93e3fe9c00bd0b3ab9296a7f0618d076161bf30ecff81111ddaeb5e3ee4
-MISC ChangeLog 487 RMD160 9a4da10f84145304fcdef698e52665685ca05570 SHA1 e5d39cef1e34c5f9969b6fb33a7e415050178b68 SHA256 f0839f1c823a210921febdef4a352f7ef28ccd6ffbcc0c08ceba9f98062c2af6
+EBUILD libkpass-3.ebuild 727 RMD160 0414bfb71f700650a0bdb1a0082fbc6552e3d488 SHA1 b8782702fa71f1cd8c3e9ce2b649ac224d458d89 SHA256 5dcf2f0263a0dace34311141dd773244213ee467a711d4e88508d209e77676c6
+MISC ChangeLog 707 RMD160 ed60bf44df06ed18b261136981dd4551aea196e6 SHA1 a2335abf260754fd8405948fd130013f81c2ad68 SHA256 8daf7768626bb8b67f2198a4ab8fd86a56453f22eb233dfce804d2cb8a881f61
 MISC metadata.xml 232 RMD160 93ccc67358af36e10e76ddc15178b39cf358d09a SHA1 6a5a10006ff1564c21e620f195103f34bf44c703 SHA256 3fec936c3c12346c6d8ce15a91b235820d02ded00bede44570bf3d833bf327fc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJO6Lu+AAoJEEdUh39IaPFNG+EH/icOeVlGFM6IlI1kWKBNOH6x
+WoaY1V77vsUitmJGW4OM7VOg2i+BBHwazqK1z+KQYjoQKy+WCa0DupKcQidoeJuz
+b459ayuE1hEk0O1TPy/t1NWRhHBNcKvRdiVdajoNfI7BbrZclOATPQVwaVEyhAym
+RZz7f8o12EF/3/ZYkgIXQwjTDs+tRo4WWDA5TynbFEzG4IlnYyMi0PTO5B9gbIuk
+vFQmijZErr4lj4m7itT+/GxIpLenWxu7PbKMm7+6FcIQ5uUNJFOqFpZjXFv0eRr3
+2FCn/nY9qVViJoC6NuxdmkaeemXYEAzfP+WC8RTtizB6U+N9tWksB74mX2cuwaY=
+=YBZe
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libkpass/libkpass-3.ebuild b/dev-libs/libkpass/libkpass-3.ebuild
index dbea237ccd4b..5390ecb3d251 100644
--- a/dev-libs/libkpass/libkpass-3.ebuild
+++ b/dev-libs/libkpass/libkpass-3.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/libkpass/libkpass-3.ebuild,v 1.2 2011/12/13 18:12:19 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libkpass/libkpass-3.ebuild,v 1.3 2011/12/14 15:07:52 ssuominen Exp $
 
 EAPI=4
 
@@ -13,14 +13,16 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="static-libs"
 
-DEPEND="dev-libs/openssl[static-libs?]"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-libs/openssl-1"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog README TODO )
 
 src_configure() {
 	econf $(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc TODO README AUTHORS ChangeLog
+	default
+	use static-libs || rm -f "${ED}"/usr/lib*/${PN}.la
 }