Include fixes from the previous version

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x0151863A67652900!)

3 files changed, 11 insertions, 34 deletions

diff --git a/dev-libs/libkpass/ChangeLog b/dev-libs/libkpass/ChangeLog
index eb950f6ea585..5bc7b6648795 100644
--- a/dev-libs/libkpass/ChangeLog
+++ b/dev-libs/libkpass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libkpass
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libkpass/ChangeLog,v 1.4 2013/10/23 13:17:19 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libkpass/ChangeLog,v 1.5 2013/10/23 13:22:47 joker Exp $
+
+  23 Oct 2013; Christian Birchinger <joker@gentoo.org> -libkpass-3.ebuild:
+  Remove outdated version
 
 *libkpass-6 (23 Oct 2013)
 
diff --git a/dev-libs/libkpass/libkpass-3.ebuild b/dev-libs/libkpass/libkpass-3.ebuild
deleted file mode 100644
index 88b9f84c9459..000000000000
--- a/dev-libs/libkpass/libkpass-3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 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.4 2013/10/23 13:17:19 joker Exp $
-
-EAPI=4
-
-DESCRIPTION="Libkpass is a from-scratch C implementation of accessing KeePass 1.x format password databases"
-HOMEPAGE="http://libkpass.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/openssl-1"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}"/usr/lib*/${PN}.la
-}
diff --git a/dev-libs/libkpass/libkpass-6.ebuild b/dev-libs/libkpass/libkpass-6.ebuild
index 6094f1de7974..9dd598ddad03 100644
--- a/dev-libs/libkpass/libkpass-6.ebuild
+++ b/dev-libs/libkpass/libkpass-6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libkpass/libkpass-6.ebuild,v 1.1 2013/10/23 13:17:19 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libkpass/libkpass-6.ebuild,v 1.2 2013/10/23 13:22:47 joker Exp $
 
 EAPI=5
 
@@ -11,16 +11,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="static"
+IUSE="static-libs"
 
-DEPEND="dev-libs/openssl"
+DEPEND=">=dev-libs/openssl-1"
 RDEPEND="${DEPEND}"
 
+DOCS=( AUTHORS ChangeLog README TODO )
+
 src_configure() {
-	econf $(use_enable static)
+	econf $(use_enable static-libs static)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc TODO README AUTHORS ChangeLog
+	use static-libs || rm -f "${ED}"/usr/lib*/${PN}.la
 }