diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-18 03:40:46 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-18 03:40:46 +0000 |
| commit | d398e7213b1ae70bae8d4bc3f546b4172c060b53 (patch) | |
| tree | eb5f1b3ce27b9d8a15aead7192e2c43b9bb091ac /app-crypt/truecrypt | |
| parent | Version bump. (diff) | |
| download | historical-d398e7213b1ae70bae8d4bc3f546b4172c060b53.tar.gz historical-d398e7213b1ae70bae8d4bc3f546b4172c060b53.tar.bz2 historical-d398e7213b1ae70bae8d4bc3f546b4172c060b53.zip | |
Allow to use pkcs11.h from dev-libs/pkcs11-helper.
Package-Manager: portage-13623-svn/cvs/Linux x86_64
Diffstat (limited to 'app-crypt/truecrypt')
| -rw-r--r-- | app-crypt/truecrypt/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/truecrypt/Manifest | 4 | ||||
| -rw-r--r-- | app-crypt/truecrypt/truecrypt-6.2.ebuild | 18 |
3 files changed, 20 insertions, 8 deletions
diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog index 48212cce7861..2c17ba85fb02 100644 --- a/app-crypt/truecrypt/ChangeLog +++ b/app-crypt/truecrypt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/truecrypt # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.43 2009/05/18 02:30:33 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.44 2009/05/18 03:40:46 arfrever Exp $ + + 18 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + truecrypt-6.2.ebuild: + Allow to use pkcs11.h from dev-libs/pkcs11-helper. *truecrypt-6.2 (18 May 2009) diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest index ddcdf6633c28..e87fca7b6755 100644 --- a/app-crypt/truecrypt/Manifest +++ b/app-crypt/truecrypt/Manifest @@ -5,6 +5,6 @@ AUX truecrypt-stop.sh 308 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 SHA1 7 DIST truecrypt-4.3a-source-code.tar.gz 1110554 RMD160 1a24ae6132b43876161a090751c19afed7c5c996 SHA1 30c91901171c3c8290d4d0de856774cdf7ee4ed6 SHA256 d5515cfeb1bb328ad6f13ef347cd9422b4bb15bf849aabc4cd4f2f69a3e0c74a DIST truecrypt-6.2.tar.gz 1793484 RMD160 91763eb3451387a2c6d0a204c7f465b026405c7d SHA1 a97ea8a68f10d38218d925a96f53de280d548abb SHA256 fef81746948b8e395a866509df337ec4a68475c3df755e527c2788f3111824fe EBUILD truecrypt-4.3a.ebuild 3359 RMD160 c906d30caafec0a2ef8b14d1b10ee6e607499f1d SHA1 91b4c79009ecd25fdf9cd3bb049c8d20c8d8680c SHA256 ff320f67b93eeee426144d1f3151218e7fea0548416fd7ca0d9cb86acbdb7a25 -EBUILD truecrypt-6.2.ebuild 1828 RMD160 44f7625c2b01703bcdf17441c159686c472c5ee9 SHA1 5871f40d43c20ae30b19b479baef0f5f3b759941 SHA256 79e9cbe790a95705b054d6849abe5118580af6eed6665e588a8a4a392d87219c -MISC ChangeLog 7994 RMD160 6f2e636211cecbb910268441239044ece3daa0cf SHA1 86eaaeae29f80c2b5ea3a2bfc8b5760c21df6157 SHA256 4dbade2bce4255bc6a60bb1c4480385057cf10bf28cf0256b05302d176b2bd78 +EBUILD truecrypt-6.2.ebuild 2058 RMD160 24d8986cba31a69477481d546ce0b4cdfbab46f5 SHA1 8c39780245137fda4525245c6803b52e0dee8415 SHA256 19573c843da1db66c1006d4799835b45a3976c7426187996c73c8c49ff064122 +MISC ChangeLog 8145 RMD160 7082ab468e5b8c8e42a31537733d2ffdd8f46691 SHA1 9462dbdb17d7dc085ce65836809e0153cd58bc7a SHA256 e39e8c04976342af63fdfe1fe3ebe5267b0aab580101adb90bbd31e04dd23d9e MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86 diff --git a/app-crypt/truecrypt/truecrypt-6.2.ebuild b/app-crypt/truecrypt/truecrypt-6.2.ebuild index 4b6508110ab7..371472eb4977 100644 --- a/app-crypt/truecrypt/truecrypt-6.2.ebuild +++ b/app-crypt/truecrypt/truecrypt-6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-6.2.ebuild,v 1.1 2009/05/18 02:30:33 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-6.2.ebuild,v 1.2 2009/05/18 03:40:46 arfrever Exp $ EAPI="2" @@ -19,7 +19,7 @@ RESTRICT="bindist fetch mirror" RDEPEND="sys-fs/fuse x11-libs/wxGTK:2.8" DEPEND="${RDEPEND} - dev-libs/opensc" + || ( dev-libs/pkcs11-helper dev-libs/opensc )" S="${WORKDIR}/${P}-source" @@ -39,9 +39,17 @@ pkg_setup() { } src_compile() { - append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1 - local EXTRA + local EXTRA pkcs11_include_directory + use X || EXTRA+=" NOGUI=1" + + if has_version dev-libs/pkcs11-helper; then + pkcs11_include_directory="/usr/include/pkcs11-helper-1.0" + else + pkcs11_include_directory="/usr/include/opensc" + fi + append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1 + emake \ ${EXTRA} \ NOSTRIP=1 \ @@ -55,7 +63,7 @@ src_compile() { TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \ TC_EXTRA_LFLAGS="${LDFLAGS}" \ WX_CONFIG="${WX_CONFIG}" \ - PKCS11_INC="/usr/include/opensc" \ + PKCS11_INC="${pkcs11_include_directory}" \ || die "emake failed" } |