Build failure, fixes bug#514310

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

3 files changed, 23 insertions, 19 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/Manifest b/app-crypt/openssl-tpm-engine/Manifest
index 5bcbd188c2ea..70ec56dcbf98 100644
--- a/app-crypt/openssl-tpm-engine/Manifest
+++ b/app-crypt/openssl-tpm-engine/Manifest
@@ -2,17 +2,13 @@
 Hash: SHA256
 
 DIST openssl_tpm_engine-0.4.1.tar.gz 648249 SHA256 01d1244f1985d5ba1720a64d04de9080acd9b1c08cc04a2f1b7beb6850deae67 SHA512 5904f268cb3ecf2243ed87d4813597418b8df27bf3dc20ba2af4b30c2fd946584581fb108eee490649700fc1d491a439e5bbc1514aa6b44ce2bed75b289c7485 WHIRLPOOL d0e59c85276657f421d650a387f57541f9e4f0b67805d6181417670763ca9e5dbbbcfc0c64f83411960b20dd143c6f1d43e775994f34826037c711b2231eb4d6
-EBUILD openssl-tpm-engine-0.4.1.ebuild 777 SHA256 83e896332a0e0c40ee6eac82adf9cc276509b2e0709ee1e148c0163530e9b5eb SHA512 3a75522ee6735c12e46e1c32ba525a7702a2e54202c58a272e3981bf17d78ecd2a2d359d760b78f3ed4b2f0ebde581c377bf8a238d264bff29aee3624f80c31a WHIRLPOOL 599f41da40f225558bfe6d3e8d58bfcd77ce634b893cb060b7aed5637f205393c9d6f81d96f11bd38470ba6d816ef0cdac36576a0213f868746ac7cdc4f41828
-MISC ChangeLog 1348 SHA256 8e7032ec195dbbf2e96c3ec62fa0b96456face0bb53dd9341579f8c2a189900e SHA512 431ebfd97a7d7bed4e0c4694e63c1e73d6bbeec0e12bf2776d0a13c7fde57ba7c18dab05c09e87d3cfcccfb2a8cb960aa49b119a5168f864b02290bad099a02d WHIRLPOOL 49ca65c75c9ad647f43195a662dc90bb89a6ac491760f78b17ebe3f19f5c1be9ee49c2646fb21987911cd71e2d372b8ce4e5b00dc8613ffe42f714f9a127e851
+EBUILD openssl-tpm-engine-0.4.1.ebuild 906 SHA256 b5c948188249565de8c74346daa8bb90e1991a9e83a8511e47c7fd6c76340da3 SHA512 95dc4c95d9379b7cbc8182d2e2aeb01a19f9c84b0e44a54ce1634a6844c38613bf1ea0b3133666da2019d5cc7b34eca0eb79a93b31cb4d9853c8366003884cf6 WHIRLPOOL 3026aa76c073f5dd635e31c62a224ead39ee616f88a508330ce6eb8ed0ad17bbb898b5defb0e18dfe1a7b3c8dca8bd469a22093037503852e4d25725d79cbb36
+MISC ChangeLog 1460 SHA256 9829a9a3befe25d8aac2b10d4c12bd1af417ad139ac9d4ba2c9f0407dc43490b SHA512 6a6b542402cb04f030c14aa55ccb0d7f1b835ec97e1d33593d909f55b505eb4eaffc281a47904a5771d1a612a283c1da28a48a95959f2046007e1dd59753f146 WHIRLPOOL 17b17f1e63ef7ea2d91a499dee451e7519914350e37c0bce6e3d8c96f68f5f5d4cc77353e7a526ce2e0890ca850290fefe47d878d3615626d639fe752b05b6af
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJQSqh+AAoJEEqz6FtPBkyjxwwH/jJw1+3rZ7LhlOs6VvugGvVj
-+3N4PMZUUl/HPC6qEarZKznrjw/kRf4b31FV0H7DNzczhoFd/xHw+hLmn9bg6Z+Z
-2NdNIIks47cyN+ddKZ2kn73VFiwGxBhnTLYQYNGMXMCq+cB/GoTqpcMjyax4YZ3/
-ZprYC1PZVfNLTqhDxD9YWMzLx7OGwg0qADqyemRsC+6dMCbfboHd72glypIUfFyW
-iizC+dTSGQDTurvtYNpYpIJWXAb6yIjstN352tCnOllxkF6pp88D5sf5sdmAWry7
-tRG2wP4BdIwCMXLn+YcGpwrfz7tGNbuajjJPqh5tqA1h1sR7ahRL5LWG8etsGT0=
-=MtgC
+iF4EAREIAAYFAlO5iwcACgkQXYk9GL8g3FFZIQD9GOHPeiEsIL9JeNXdDTgcoMGb
+PyUhkX8u+9nxnJMWDvYA/0LldLYXaC9soF4zLn5i/jsBSZeRekk5JDMkym2Z6mIp
+=XLgx
 -----END PGP SIGNATURE-----
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
 }