[patch] truecrypt-7.0a-r5.ebuild.diff

truecrypt-7.0a-r5.ebuild.diff (text/plain), 1.48 KB, created by Alon Bar-Lev on 2011-07-15 17:09:44 UTC

--- truecrypt-7.0a-r5.ebuild.org	2011-07-15 20:05:23.292530466 +0300
+++ truecrypt-7.0a-r5.ebuild	2011-07-15 20:07:34.254506688 +0300
@@ -23,7 +23,6 @@ RDEPEND="|| ( >=sys-fs/lvm2-2.02.45 sys-
 	x11-libs/wxGTK:2.8[X?]
 	app-admin/sudo"
 DEPEND="${RDEPEND}
-	|| ( dev-libs/pkcs11-helper dev-libs/opensc )
 	!ppc? ( dev-lang/nasm )"
 
 S="${WORKDIR}/${P}-source"
@@ -55,26 +54,17 @@ src_prepare() {
 
 	epatch "${FILESDIR}/makefile-archdetect.diff"
 	epatch "${FILESDIR}/execstack-fix.diff"
-	if ! has_version dev-libs/pkcs11-helper && \
-		has_version "=dev-libs/opensc-0.12*"; then
-		mkdir pkcs11 || die
-		cp "${WORKDIR}"/truecrypt-pkcs11.h pkcs11/pkcs11.h || die
-	fi
+
+	mkdir pkcs11 || die
+	cp "${WORKDIR}"/truecrypt-pkcs11.h pkcs11/pkcs11.h || die
 }
 
 src_compile() {
-	local EXTRA pkcs11_include_directory
+	local EXTRA
 
 	use X || EXTRA+=" NOGUI=1"
 
-	if has_version dev-libs/pkcs11-helper; then
-		pkcs11_include_directory="/usr/include/pkcs11-helper-1.0"
-	elif has_version "=dev-libs/opensc-0.12*"; then
-		pkcs11_include_directory="/usr/include/opensc"
-		append-flags -I"${S}"/pkcs11
-	else
-		pkcs11_include_directory="/usr/include/opensc"
-	fi
+	append-flags -I"${S}"/pkcs11
 	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
 
 	emake \
@@ -90,7 +80,7 @@ src_compile() {
 		TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
 		TC_EXTRA_LFLAGS="${LDFLAGS}" \
 		WX_CONFIG="${WX_CONFIG}" \
-		PKCS11_INC="${pkcs11_include_directory}" \
+		PKCS11_INC="${S}/pkcs11" \
 		|| die "emake failed"
 }