Build failure, fixes bug#514310

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

2 files changed, 17 insertions, 9 deletions

diff --git a/app-crypt/openssl-tpm-engine/ChangeLog b/app-crypt/openssl-tpm-engine/ChangeLog
index fcfa11372ac1..0978bcea9f12 100644
--- a/app-crypt/openssl-tpm-engine/ChangeLog
+++ b/app-crypt/openssl-tpm-engine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/openssl-tpm-engine
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/openssl-tpm-engine/ChangeLog,v 1.7 2012/09/08 02:07:53 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/openssl-tpm-engine/ChangeLog,v 1.8 2014/07/06 17:44:29 alonbl Exp $
+
+  06 Jul 2014; Alon Bar-Lev <alonbl@gentoo.org> openssl-tpm-engine-0.4.1.ebuild:
+  Build failure, fixes bug#514310
 
   08 Sep 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Remove redundant maintainer from metadata.
@@ -37,4 +40,3 @@
   +files/openssl-tpm-engine-0.3-openssl.patch, +metadata.xml,
   +openssl-tpm-engine-0.3.ebuild:
   initial import by Daniel Black.
-
diff --git a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.1.ebuild b/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.1.ebuild
index f3e0afda1407..087fe8ae4884 100644
--- a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.1.ebuild
+++ b/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.1.ebuild,v 1.2 2009/05/10 23:13:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.1.ebuild,v 1.3 2014/07/06 17:44:29 alonbl Exp $
+
+EAPI=4
 
 MY_P="${P/-tpm-/_tpm_}"
 
@@ -17,12 +19,16 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
-	econf --with-openssl=/usr || die
-	emake || die
+src_prepare() {
+	# autotools way too old to fix it properly
+	sed -i 's/^\(create_tpm_key_LDADD.*\)/\1 -L@OPENSSL_LIB_DIR@ -lcrypto/' Makefile.in
+}
+
+src_configure() {
+	econf --with-openssl=/usr
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc openssl.cnf.sample README
 }