From 43783511f6027a4989e068a579ef5940437219d4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 23 Dec 2012 18:20:22 +0000 Subject: Use EAPI=4 default src_install and usex. (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) --- app-crypt/tpm-tools/ChangeLog | 5 ++++- app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild | 17 +++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'app-crypt/tpm-tools') diff --git a/app-crypt/tpm-tools/ChangeLog b/app-crypt/tpm-tools/ChangeLog index d2099c2063a6..d56917c05d23 100644 --- a/app-crypt/tpm-tools/ChangeLog +++ b/app-crypt/tpm-tools/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-crypt/tpm-tools # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.19 2012/09/11 00:55:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.20 2012/12/23 18:20:22 vapier Exp $ + + 23 Dec 2012; Mike Frysinger tpm-tools-1.3.5-r1.ebuild: + Use EAPI=4 default src_install and usex. 11 Sep 2012; Mike Frysinger tpm-tools-1.3.5-r1.ebuild: Drop -m64 hardcode. 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 index 4a623d2eb851..0563c67a64a9 100644 --- a/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild +++ b/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.3 2012/09/11 00:55:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild,v 1.4 2012/12/23 18:20:22 vapier Exp $ EAPI=4 inherit autotools eutils flag-o-matic @@ -8,6 +8,7 @@ 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 ~arm ~x86" @@ -33,17 +34,13 @@ src_prepare() { } src_configure() { - local myconf="$(use_enable nls)" - + local myconf # 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} -} + append-flags $(usex debug -DDEBUG -DNDEBUG) -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README + econf \ + $(use_enable nls) \ + ${myconf} } -- cgit v1.2.3-65-gdbad