Disable opencryptoki/pkcs#11 in 1.3.5 stable ebuild (and fix up homepage). Revision bump: add pkcs11 USE flag to bring in opencryptoki, apply patch for linking with gold (thanks to Raymes Khoury from ChromiumOS), add debug USE flag.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

5 files changed, 87 insertions, 10 deletions

diff --git a/app-crypt/tpm-tools/ChangeLog b/app-crypt/tpm-tools/ChangeLog
index 004d2a2b649b..4bb6e4c9a0a3 100644
--- a/app-crypt/tpm-tools/ChangeLog
+++ b/app-crypt/tpm-tools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-crypt/tpm-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.14 2011/03/22 10:35:05 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.15 2011/03/31 22:19:40 flameeyes Exp $
+
+*tpm-tools-1.3.5-r1 (31 Mar 2011)
+
+  31 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/tpm-tools-1.3.1-gold.patch, tpm-tools-1.3.5.ebuild,
+  +tpm-tools-1.3.5-r1.ebuild, metadata.xml:
+  Disable opencryptoki/pkcs#11 in 1.3.5 stable ebuild (and fix up homepage).
+  Revision bump: add pkcs11 USE flag to bring in opencryptoki, apply patch for
+  linking with gold (thanks to Raymes Khoury from ChromiumOS), add debug USE
+  flag. 
 
   22 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -tpm-tools-1.3.1.ebuild:
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch b/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
new file mode 100644
index 000000000000..68d7ea3e26a5
--- /dev/null
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
@@ -0,0 +1,13 @@
+diff --git a/tpm-tools-1.3.1/src/data_mgmt/Makefile.am b/tpm-tools-1.3.1-orig/src/data_mgmt/Makefile.am
+index 697f031..cff5897 100644
+--- tpm-tools-1.3.1/src/data_mgmt/Makefile.am
++++ tpm-tools-1.3.1/src/data_mgmt/Makefile.am
+@@ -31,7 +31,7 @@ bin_PROGRAMS	=	tpmtoken_init		\
+ # Common build flags
+ AM_CPPFLAGS	=	-I$(top_builddir)/include -D_LINUX
+ 
+-LDADD		=	$(top_builddir)/lib/libtpm_pkcs11.la -ltspi
++LDADD		=	$(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl
+ 
+ 
+ #
diff --git a/app-crypt/tpm-tools/metadata.xml b/app-crypt/tpm-tools/metadata.xml
index 61e19f95d1e7..83f682ec87f4 100644
--- a/app-crypt/tpm-tools/metadata.xml
+++ b/app-crypt/tpm-tools/metadata.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
-	<maintainer>
-		<email>crypto@gentoo.org</email>
-		<name>Crypto Herd</name>
-	</maintainer>
+  <herd>crypto</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
+    <name>Crypto Herd</name>
+  </maintainer>
+
+  <use>
+    <flag name='pkcs11'>
+      Build Token data management utilities based on OpenCryptoki's
+      (<pkg>dev-libs/opencryptoki</pkg>) PKCS#11 implementation.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild
new file mode 100644
index 000000000000..2971207285f4
--- /dev/null
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 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.3.5-r1.ebuild,v 1.1 2011/03/31 22:19:40 flameeyes Exp $
+
+EAPI=4
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
+HOMEPAGE="http://trousers.sourceforge.net"
+SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls pkcs11 debug"
+
+COMMON_DEPEND="
+	>=app-crypt/trousers-0.3.0
+	dev-libs/openssl
+	pkcs11? ( dev-libs/opencryptoki )
+	"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i -e "s/-Werror //" configure.in || die "Sed failed"
+	epatch "${FILESDIR}"/${PN}-1.3.1-gold.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="$(use_enable nls)"
+
+	# don't use --enable-pkcs11-support, configure is a mess.
+	use pkcs11 || myconf+=" --disable-pkcs11-support"
+
+	use debug && append-flags -DDEBUG || append-flags -DNDEBUG
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README
+}
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild
index 2ff1bc56dcb8..1bec001c256b 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 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.3.5.ebuild,v 1.3 2011/03/21 09:57:05 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild,v 1.4 2011/03/31 22:19:40 flameeyes Exp $
 
 EAPI="2"
 inherit autotools
 
 DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sf.net"
+HOMEPAGE="http://trousers.sourceforge.net"
 SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
@@ -16,7 +16,6 @@ IUSE="nls"
 COMMON_DEPEND=">=app-crypt/trousers-0.3.0"
 RDEPEND="${COMMON_DEPEND}
 	nls? ( virtual/libintl )"
-# TODO: add optionnal opencryptoki support
 DEPEND="${COMMON_DEPEND}
 	nls? ( sys-devel/gettext )"
 
@@ -26,7 +25,8 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable nls)
+	econf $(use_enable nls) \
+		--disable-pkcs11-support
 }
 
 src_install() {