Version bump

Package-Manager: portage-2.1.3.19

8 files changed, 28 insertions, 119 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/Manifest b/app-crypt/openssl-tpm-engine/Manifest
index 98d94674a986..dd78ce7dfa0a 100644
--- a/app-crypt/openssl-tpm-engine/Manifest
+++ b/app-crypt/openssl-tpm-engine/Manifest
@@ -1,28 +1,16 @@
-AUX openssl-tpm-engine-0.3-openssl.patch 1425 RMD160 2aaa50d7325b3a65ef58b1747741d53f3fb27ccf SHA1 050f9e4d5491b38601b70e82b32c6d50a7475b78 SHA256 f4b14ce8ad39edd85e05d3b5e2125141bd4e9117e747e2644d64c0c4eda22322
-MD5 e67b1152c21ec8bc50bf597e9ee707b8 files/openssl-tpm-engine-0.3-openssl.patch 1425
-RMD160 2aaa50d7325b3a65ef58b1747741d53f3fb27ccf files/openssl-tpm-engine-0.3-openssl.patch 1425
-SHA256 f4b14ce8ad39edd85e05d3b5e2125141bd4e9117e747e2644d64c0c4eda22322 files/openssl-tpm-engine-0.3-openssl.patch 1425
-DIST openssl_tpm_engine-0.3.tar.gz 639149 RMD160 7b5360621e21cc253b573b45c0e510d371399aeb SHA1 466b160d05066c070c6911777939be8248793965 SHA256 00582e4a416de468e9e92c6e33e08a4b0827a4a33a0f93ebef80f0792b12464b
-DIST openssl_tpm_engine-0.4.tar.gz 646459 RMD160 fa215e1f2dc5a25145eecd01fcca0ff01cd784ea SHA1 75bfedb7f5444b94c998202707e7f7e8b7c5596b SHA256 48d39e02c5b65d34a7483f6215f1fb74bf17f1a8c5f69d25057b7d3cc15cfbfa
-EBUILD openssl-tpm-engine-0.3.ebuild 1014 RMD160 8e63214507b483a3154802f3bc4eab6dc9743fd4 SHA1 fb87eec010cc7729ac31d9a46835fea0c5f7959b SHA256 78a23c8ff99757c9ebc0f2eb79fc11669c0d8cf3525b557fdf02a68760303b9c
-MD5 8c2461b72f1260192486f47bb6d6ddc9 openssl-tpm-engine-0.3.ebuild 1014
-RMD160 8e63214507b483a3154802f3bc4eab6dc9743fd4 openssl-tpm-engine-0.3.ebuild 1014
-SHA256 78a23c8ff99757c9ebc0f2eb79fc11669c0d8cf3525b557fdf02a68760303b9c openssl-tpm-engine-0.3.ebuild 1014
-EBUILD openssl-tpm-engine-0.4.ebuild 786 RMD160 9acace3544fdab40596d1a784a6f22e1bc239cef SHA1 ecc4cce6593a5bafaa20450c9de5c1fa9f6dd1e3 SHA256 892c5c90b81da03c299fdf4f9d17e51e33ebb6620e71a4c1166aaab3e3fb7150
-MD5 c850b64960ae95e2d9fc379370c2e4a7 openssl-tpm-engine-0.4.ebuild 786
-RMD160 9acace3544fdab40596d1a784a6f22e1bc239cef openssl-tpm-engine-0.4.ebuild 786
-SHA256 892c5c90b81da03c299fdf4f9d17e51e33ebb6620e71a4c1166aaab3e3fb7150 openssl-tpm-engine-0.4.ebuild 786
-MISC ChangeLog 854 RMD160 40b7efa35dce6151e931dfa59c6bcbe1ae2fffeb SHA1 dcc036f1dea902db406547a2b40ca62a219978a9 SHA256 62f7567b42ace2332a680923750d47400b25e4b5124e499e222e54a0c371b2a9
-MD5 d12611b45aa7f53c71de87425475e577 ChangeLog 854
-RMD160 40b7efa35dce6151e931dfa59c6bcbe1ae2fffeb ChangeLog 854
-SHA256 62f7567b42ace2332a680923750d47400b25e4b5124e499e222e54a0c371b2a9 ChangeLog 854
+DIST openssl_tpm_engine-0.4.1.tar.gz 648249 RMD160 7165f9cdd756873cb0f7b4e1c457f1b408800fd1 SHA1 11af51fa40b1d5310ee3317719f77063db43c27a SHA256 01d1244f1985d5ba1720a64d04de9080acd9b1c08cc04a2f1b7beb6850deae67
+EBUILD openssl-tpm-engine-0.4.1.ebuild 769 RMD160 ce8521839d69ff8e86d40a7d51db1bc40dbe0294 SHA1 437cf3a8821454a60ebc270666cd35e015559ab5 SHA256 34fd7b832863d57ecd716555dda0d42a0a25a89139357a1b638081555f1bdd68
+MD5 00b4b435289d54b99cb77db677b2a2af openssl-tpm-engine-0.4.1.ebuild 769
+RMD160 ce8521839d69ff8e86d40a7d51db1bc40dbe0294 openssl-tpm-engine-0.4.1.ebuild 769
+SHA256 34fd7b832863d57ecd716555dda0d42a0a25a89139357a1b638081555f1bdd68 openssl-tpm-engine-0.4.1.ebuild 769
+MISC ChangeLog 1117 RMD160 c76e96b6c8bfa1025e6cf403f403eb556341108f SHA1 ed3c8f290ed954de434723df6c7c65331ebf06f5 SHA256 c3403f805db529a9594529138502318b254629f3ec5776fc956b91dc4b4b6f0f
+MD5 c9fce46aac39a78fbe8991797f94661a ChangeLog 1117
+RMD160 c76e96b6c8bfa1025e6cf403f403eb556341108f ChangeLog 1117
+SHA256 c3403f805db529a9594529138502318b254629f3ec5776fc956b91dc4b4b6f0f ChangeLog 1117
 MISC metadata.xml 251 RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f SHA1 563aa19984b291a6cade6d6487dbf4a2a17e6874 SHA256 1739a4e8833a2a5b9501182eb830cbd3e26014ccef5e9ae1b4d7a0686c665c1b
 MD5 2603eeeb20b24caddac3e9ce6996f357 metadata.xml 251
 RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f metadata.xml 251
 SHA256 1739a4e8833a2a5b9501182eb830cbd3e26014ccef5e9ae1b4d7a0686c665c1b metadata.xml 251
-MD5 e7e4d4cf6c6e2cc9f3a587cb52202cea files/digest-openssl-tpm-engine-0.3 268
-RMD160 6d24c71e8d04f05f9d73a1b1fddfbe5384a98325 files/digest-openssl-tpm-engine-0.3 268
-SHA256 cab1002531f1b0ab7d97eadfaba27ca65b0960e9df58c186eaa701aeb787a86b files/digest-openssl-tpm-engine-0.3 268
-MD5 014efd0469e49cfff2859659a368d3eb files/digest-openssl-tpm-engine-0.4 268
-RMD160 3022966c60b1c02cd2710cdd7b9b4e26c9745db6 files/digest-openssl-tpm-engine-0.4 268
-SHA256 bd2e22db174bed45a2fc36818f854a6f32de452c0efb9cde0750d45dc20fdce9 files/digest-openssl-tpm-engine-0.4 268
+MD5 2b07a5d2c00ad3b46f14200fc9551615 files/digest-openssl-tpm-engine-0.4.1 274
+RMD160 9e764efe990ef31c5272aa3b7d4be1a739caeb30 files/digest-openssl-tpm-engine-0.4.1 274
+SHA256 f0684bbc8eeec0e0ed89369471fe37459c934f53929b2a645f291ea17d2ba59d files/digest-openssl-tpm-engine-0.4.1 274
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
 }