Version bump, cleanup

(Portage version: 2.1.3.19)

10 files changed, 15 insertions, 173 deletions

diff --git a/app-crypt/tpm-tools/ChangeLog b/app-crypt/tpm-tools/ChangeLog
index 051274298943..9d558ac4c5a7 100644
--- a/app-crypt/tpm-tools/ChangeLog
+++ b/app-crypt/tpm-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/tpm-tools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.5 2007/01/12 20:42:19 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.6 2007/11/10 13:11:48 alonbl Exp $
+
+*tpm-tools-1.3.0 (10 Nov 2007)
+
+  10 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/tpm-tools-1.1.0-as-needed.patch,
+  -files/tpm-tools-1.2.3-as-needed.patch, -tpm-tools-1.1.0.ebuild,
+  -tpm-tools-1.2.3.ebuild, -tpm-tools-1.2.5.ebuild, +tpm-tools-1.3.0.ebuild:
+  Version bump, cleanup
 
   12 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org> tpm-tools-1.2.5.ebuild:
   Remove WANT_AUTO*
diff --git a/app-crypt/tpm-tools/files/digest-tpm-tools-1.1.0 b/app-crypt/tpm-tools/files/digest-tpm-tools-1.1.0
deleted file mode 100644
index 02102fe38b9d..000000000000
--- a/app-crypt/tpm-tools/files/digest-tpm-tools-1.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 50e31ab36b4b84667c7d9b8d70f346a6 tpm-tools-1.1.0.tar.gz 717441
-RMD160 57974ac508b8daf917b9191b28a7404b20863c9b tpm-tools-1.1.0.tar.gz 717441
-SHA256 06ac96fc29d35dfa64d514e2761d8b11769f45de04f394cf1f25c5211928033b tpm-tools-1.1.0.tar.gz 717441
diff --git a/app-crypt/tpm-tools/files/digest-tpm-tools-1.2.3 b/app-crypt/tpm-tools/files/digest-tpm-tools-1.2.3
deleted file mode 100644
index 4f85ca0dcd7e..000000000000
--- a/app-crypt/tpm-tools/files/digest-tpm-tools-1.2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 29671c0ca5c8ea032b968f5ab4421de8 tpm-tools-1.2.3.tar.gz 845943
-RMD160 b1c4035314a929786360bbfaad3bd35e4a2abcc1 tpm-tools-1.2.3.tar.gz 845943
-SHA256 641331f126fdcfac773d09971fdd98069b96c56d5fd38be7d4e1a4e660a5b59d tpm-tools-1.2.3.tar.gz 845943
diff --git a/app-crypt/tpm-tools/files/digest-tpm-tools-1.2.5 b/app-crypt/tpm-tools/files/digest-tpm-tools-1.2.5
deleted file mode 100644
index 04fa42fb292d..000000000000
--- a/app-crypt/tpm-tools/files/digest-tpm-tools-1.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1f1065321c01ad5c438b48535ed4e9a1 tpm-tools-1.2.5.tar.gz 845913
-RMD160 a6b32d0eea6fd9761485aa550db742e388aa657b tpm-tools-1.2.5.tar.gz 845913
-SHA256 9e54cd4e98ed18d373fda0a92e3ebc2789b99d7b0a42cfbc56ffc878cdb263c6 tpm-tools-1.2.5.tar.gz 845913
diff --git a/app-crypt/tpm-tools/files/digest-tpm-tools-1.3.0 b/app-crypt/tpm-tools/files/digest-tpm-tools-1.3.0
new file mode 100644
index 000000000000..ccd013d3d40e
--- /dev/null
+++ b/app-crypt/tpm-tools/files/digest-tpm-tools-1.3.0
@@ -0,0 +1,3 @@
+MD5 5eba993d3207915058547afdd48a3a4f tpm-tools-1.3.0.tar.gz 468884
+RMD160 9afbf635a7beb930286f40cac0a7c0b3d58d3a8d tpm-tools-1.3.0.tar.gz 468884
+SHA256 9cf099ced3e48ddc23ee28b7d37c5b1c9d00ff9a50fa1eea06b64c2338e0c0c0 tpm-tools-1.3.0.tar.gz 468884
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.1.0-as-needed.patch b/app-crypt/tpm-tools/files/tpm-tools-1.1.0-as-needed.patch
deleted file mode 100644
index c9ff79a7c9ca..000000000000
--- a/app-crypt/tpm-tools/files/tpm-tools-1.1.0-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tpm-tools-1.1.0/src/tpm_mgmt/Makefile.am.orig	2006-04-30 22:01:47.000000000 +0200
-+++ tpm-tools-1.1.0/src/tpm_mgmt/Makefile.am	2006-04-30 22:02:05.000000000 +0200
-@@ -37,8 +37,6 @@
- 
- AM_CPPFLAGS	=	-I$(top_builddir)/include -D_LINUX
- 
--AM_LDFLAGS	=	-ltspi
--
- LDADD		=	$(top_builddir)/lib/libtpm_tspi.la
- 
- tpm_changeownerauth_SOURCES =	tpm_changeauth.c
---- tpm-tools-1.1.0/lib/Makefile.am.orig	2006-04-30 22:04:54.000000000 +0200
-+++ tpm-tools-1.1.0/lib/Makefile.am	2006-04-30 22:04:59.000000000 +0200
-@@ -40,7 +40,7 @@
- #
- # TSPI interface library
- libtpm_tspi_la_SOURCES	=	tpm_tspi.c
--libtpm_tspi_la_LIBADD	=	libtpm_utils.la
-+libtpm_tspi_la_LIBADD	=	libtpm_utils.la -ltspi
- 
- #
- # PKCS#11 interface library
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.2.3-as-needed.patch b/app-crypt/tpm-tools/files/tpm-tools-1.2.3-as-needed.patch
deleted file mode 100644
index 3b3e81b5eef6..000000000000
--- a/app-crypt/tpm-tools/files/tpm-tools-1.2.3-as-needed.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru tpm-tools-1.2.3.orig/lib/Makefile.am tpm-tools-1.2.3/lib/Makefile.am
---- tpm-tools-1.2.3.orig/lib/Makefile.am	2005-08-09 06:10:04.000000000 +1000
-+++ tpm-tools-1.2.3/lib/Makefile.am	2006-05-07 08:23:17.000000000 +1000
-@@ -40,7 +40,7 @@
- #
- # TSPI interface library
- libtpm_tspi_la_SOURCES	=	tpm_tspi.c
--libtpm_tspi_la_LIBADD	=	libtpm_utils.la
-+libtpm_tspi_la_LIBADD	=	libtpm_utils.la -ltspi
- 
- #
- # PKCS#11 interface library
-diff -ru tpm-tools-1.2.3.orig/src/tpm_mgmt/Makefile.am tpm-tools-1.2.3/src/tpm_mgmt/Makefile.am
---- tpm-tools-1.2.3.orig/src/tpm_mgmt/Makefile.am	2005-11-08 08:26:03.000000000 +1100
-+++ tpm-tools-1.2.3/src/tpm_mgmt/Makefile.am	2006-05-07 08:22:56.000000000 +1000
-@@ -39,8 +39,6 @@
- 
- AM_CPPFLAGS	=	-I$(top_builddir)/include -D_LINUX
- 
--AM_LDFLAGS	=	-ltspi
--
- LDADD		=	$(top_builddir)/lib/libtpm_tspi.la
- 
- tpm_startup_SOURCES = 		tpm_startup.c
diff --git a/app-crypt/tpm-tools/tpm-tools-1.1.0.ebuild b/app-crypt/tpm-tools/tpm-tools-1.1.0.ebuild
deleted file mode 100644
index f8b2c943ff00..000000000000
--- a/app-crypt/tpm-tools/tpm-tools-1.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.1.0.ebuild,v 1.3 2007/06/26 01:34:29 mr_bones_ Exp $
-
-inherit autotools
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.7
-	>=app-crypt/trousers-0.1.1"
-# TODO: add optionnal opencryptoki support
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# workaround econf "updating config.sub" sandbox violation
-	## (bug #96242 for instance):
-	#touch config.sub
-
-	# no translation so far -> no need to gettextize it
-	# (makes compilation a bit simpler...):
-	sed -i '/^gettextize/d' ./bootstrap.sh
-	sed -i '/\<po\>/d' Makefile.am
-	sed -i -e '/AM_GNU_GETTEXT/d' -e '\:po/Makefile.in:d' configure.in
-
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --disable-nls || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README
-}
diff --git a/app-crypt/tpm-tools/tpm-tools-1.2.3.ebuild b/app-crypt/tpm-tools/tpm-tools-1.2.3.ebuild
deleted file mode 100644
index 05a408d1b6ef..000000000000
--- a/app-crypt/tpm-tools/tpm-tools-1.2.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.2.3.ebuild,v 1.2 2007/06/26 01:34:29 mr_bones_ Exp $
-
-inherit autotools
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.7
-	>=app-crypt/trousers-0.1.1"
-# TODO: add optionnal opencryptoki support
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	cd "${S}"
-
-	# workaround econf "updating config.sub" sandbox violation
-	## (bug #96242 for instance):
-	#touch config.sub
-
-	# no translation so far -> no need to gettextize it
-	# (makes compilation a bit simpler...):
-	sed -i '/^gettextize/d' ./bootstrap.sh
-	sed -i '/\<po\>/d' Makefile.am
-	sed -i -e '/AM_GNU_GETTEXT/d' -e '\:po/Makefile.in:d' configure.in
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --disable-nls || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README
-}
diff --git a/app-crypt/tpm-tools/tpm-tools-1.2.5.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.0.ebuild
index aba50501d4ae..9efc5d114b2c 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.2.5.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.0.ebuild
@@ -1,6 +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/tpm-tools/tpm-tools-1.2.5.ebuild,v 1.3 2007/06/26 01:34:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.0.ebuild,v 1.1 2007/11/10 13:11:48 alonbl Exp $
 
 inherit autotools
 
@@ -12,28 +12,13 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.7
-	>=app-crypt/trousers-0.2.8"
+RDEPEND=">=app-crypt/trousers-0.3.0"
 # TODO: add optionnal opencryptoki support
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	# workaround econf "updating config.sub" sandbox violation
-	## (bug #96242 for instance):
-	#touch config.sub
-
-	# no translation so far -> no need to gettextize it
-	# (makes compilation a bit simpler...):
-	sed -i '/^gettextize/d' ./bootstrap.sh
-	sed -i '/\<po\>/d' Makefile.am
-	sed -i -e '/AM_GNU_GETTEXT/d' -e '\:po/Makefile.in:d' configure.in
-
 	eautoreconf
 }