Version bump

(Portage version: 2.1.3.19)

7 files changed, 16 insertions, 95 deletions

diff --git a/app-crypt/openssl-tpm-engine/ChangeLog b/app-crypt/openssl-tpm-engine/ChangeLog
index 126b58bb95b1..d15d782aee9a 100644
--- a/app-crypt/openssl-tpm-engine/ChangeLog
+++ b/app-crypt/openssl-tpm-engine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/openssl-tpm-engine
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/openssl-tpm-engine/ChangeLog,v 1.4 2007/01/12 20:40:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/openssl-tpm-engine/ChangeLog,v 1.5 2007/11/10 13:04:43 alonbl Exp $
+
+*openssl-tpm-engine-0.4.1 (10 Nov 2007)
+
+  10 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/openssl-tpm-engine-0.3-openssl.patch,
+  -openssl-tpm-engine-0.3.ebuild, -openssl-tpm-engine-0.4.ebuild,
+  +openssl-tpm-engine-0.4.1.ebuild:
+  Version bump, cleanup
 
   12 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org>
   openssl-tpm-engine-0.3.ebuild:
diff --git a/app-crypt/openssl-tpm-engine/files/digest-openssl-tpm-engine-0.3 b/app-crypt/openssl-tpm-engine/files/digest-openssl-tpm-engine-0.3
deleted file mode 100644
index f70207a37f1c..000000000000
--- a/app-crypt/openssl-tpm-engine/files/digest-openssl-tpm-engine-0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 873e185dc646a574944cf7df39f127e5 openssl_tpm_engine-0.3.tar.gz 639149
-RMD160 7b5360621e21cc253b573b45c0e510d371399aeb openssl_tpm_engine-0.3.tar.gz 639149
-SHA256 00582e4a416de468e9e92c6e33e08a4b0827a4a33a0f93ebef80f0792b12464b openssl_tpm_engine-0.3.tar.gz 639149
diff --git a/app-crypt/openssl-tpm-engine/files/digest-openssl-tpm-engine-0.4 b/app-crypt/openssl-tpm-engine/files/digest-openssl-tpm-engine-0.4
deleted file mode 100644
index b6cd6907f5da..000000000000
--- a/app-crypt/openssl-tpm-engine/files/digest-openssl-tpm-engine-0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2a8b8d6a1eb6487379abcb5f7fe41d20 openssl_tpm_engine-0.4.tar.gz 646459
-RMD160 fa215e1f2dc5a25145eecd01fcca0ff01cd784ea openssl_tpm_engine-0.4.tar.gz 646459
-SHA256 48d39e02c5b65d34a7483f6215f1fb74bf17f1a8c5f69d25057b7d3cc15cfbfa openssl_tpm_engine-0.4.tar.gz 646459
diff --git a/app-crypt/openssl-tpm-engine/files/digest-openssl-tpm-engine-0.4.1 b/app-crypt/openssl-tpm-engine/files/digest-openssl-tpm-engine-0.4.1
new file mode 100644
index 000000000000..45fa88209e91
--- /dev/null
+++ b/app-crypt/openssl-tpm-engine/files/digest-openssl-tpm-engine-0.4.1
@@ -0,0 +1,3 @@
+MD5 05d8fce1dc84c1c492a2e6a21db6616a openssl_tpm_engine-0.4.1.tar.gz 648249
+RMD160 7165f9cdd756873cb0f7b4e1c457f1b408800fd1 openssl_tpm_engine-0.4.1.tar.gz 648249
+SHA256 01d1244f1985d5ba1720a64d04de9080acd9b1c08cc04a2f1b7beb6850deae67 openssl_tpm_engine-0.4.1.tar.gz 648249
diff --git a/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.3-openssl.patch b/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.3-openssl.patch
deleted file mode 100644
index d785295381be..000000000000
--- a/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.3-openssl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- openssl_tpm_engine-0.3/configure.in	2005-12-03 06:03:27.000000000 +1100
-+++ /tmp/configure.in	2006-05-07 13:17:55.000000000 +1000
-@@ -21,7 +21,12 @@
- 	fi
- fi
- 
--OPENSSL_LIB_DIR="/usr/local/ssl/lib"
-+if test "${OPENSSL_LIB_DIR+set}" != set; then
-+	OPENSSL_LIB_DIR="/usr/local/ssl/lib"
-+fi
-+if test "${OPENSSL_INCLUDE_DIR+set}" != set; then
-+	OPENSSL_INCLUDE_DIR="/usr/local/ssl/include"
-+fi
- 
- # Non-standard OpenSSL
- AC_MSG_CHECKING([Non-standard OpenSSL])
-@@ -36,8 +41,8 @@
- 		CFLAGS="$CFLAGS -L$OPENSSL_LIB_DIR -I$OPENSSL_INCLUDE_DIR"
- 	 fi],
- 	[AC_MSG_RESULT([no])
--	 AC_SUBST([OPENSSL_LIB_DIR], [/usr/local/ssl/lib])
--	 AC_SUBST([OPENSSL_INCLUDE_DIR], [/usr/local/ssl/include]) ] )
-+	 AC_SUBST(OPENSSL_LIB_DIR)
-+	 AC_SUBST(OPENSSL_INCLUDE_DIR)])
- 
- # for the correct install target
- libdir="$OPENSSL_LIB_DIR/engines"
---- openssl_tpm_engine-0.3/Makefile.am.orig	2006-05-07 13:49:41.000000000 +1000
-+++ openssl_tpm_engine-0.3/Makefile.am	2006-05-07 13:58:10.000000000 +1000
-@@ -1,10 +1,11 @@
-+EXTRA_DIST = README  openssl.cnf.sample
-+
- lib_LTLIBRARIES=libtpm.la
--noinst_PROGRAMS=create_tpm_key
-+bin_PROGRAMS=create_tpm_key
- 
--libtpm_la_LIBADD=@OPENSSL_LIB_DIR@/libcrypto.a
--libtpm_la_LDFLAGS=-lc
-+libtpm_la_LIBADD=-lcrypto -lc
- libtpm_la_CFLAGS=-I@OPENSSL_INCLUDE_DIR@
- libtpm_la_SOURCES=e_tpm.c e_tpm.h e_tpm_err.c
- 
- create_tpm_key_SOURCES=create_tpm_key.c
--create_tpm_key_LDFLAGS=-ltspi
-+create_tpm_key_LDADD=-ltspi
diff --git a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.3.ebuild b/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.3.ebuild
deleted file mode 100644
index 4e7da34769f6..000000000000
--- a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 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.3.ebuild,v 1.3 2007/01/12 20:40:41 alonbl Exp $
-
-inherit autotools eutils
-
-MY_P="${P/-tpm-/_tpm_}"
-
-DESCRIPTION="This provides a OpenSSL engine that uses private keys stored in TPM hardware"
-HOMEPAGE="http://trousers.sourceforge.net"
-SRC_URI="mirror://sourceforge/trousers/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RDEPEND=">=dev-libs/openssl-0.9.8
-	>=app-crypt/trousers-0.2.6"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-openssl.patch"
-	eautoreconf || die 'eautoreconf failed'
-}
-
-src_compile() {
-	econf OPENSSL_LIB_DIR=/usr/lib OPENSSL_INCLUDE_DIR=/usr/include/openssl || die 'configure failed'
-	emake || die 'make failed'
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die 'install failed'
-	dodoc openssl.cnf.sample README
-}
diff --git a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.ebuild b/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.1.ebuild
index 2bbd0d3c7a26..e44f9aad16c3 100644
--- a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.ebuild
+++ b/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2007 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.ebuild,v 1.2 2007/01/07 17:33:05 alonbl Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.1.ebuild,v 1.1 2007/11/10 13:04:43 alonbl Exp $
 
 MY_P="${P/-tpm-/_tpm_}"
 
@@ -20,11 +18,11 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
-	econf --with-openssl=/usr
-	emake
+	econf --with-openssl=/usr || die
+	emake || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die 'install failed'
+	emake DESTDIR="${D}" install || die
 	dodoc openssl.cnf.sample README
 }