Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 369781 | Differences between
and this patch

Collapse All | Expand All

(-)truecrypt-7.0a-r5.ebuild.org (-16 / +6 lines)
Lines 23-29 RDEPEND="|| ( >=sys-fs/lvm2-2.02.45 sys- Link Here
23
	x11-libs/wxGTK:2.8[X?]
23
	x11-libs/wxGTK:2.8[X?]
24
	app-admin/sudo"
24
	app-admin/sudo"
25
DEPEND="${RDEPEND}
25
DEPEND="${RDEPEND}
26
	|| ( dev-libs/pkcs11-helper dev-libs/opensc )
27
	!ppc? ( dev-lang/nasm )"
26
	!ppc? ( dev-lang/nasm )"
28
27
29
S="${WORKDIR}/${P}-source"
28
S="${WORKDIR}/${P}-source"
Lines 55-80 src_prepare() { Link Here
55
54
56
	epatch "${FILESDIR}/makefile-archdetect.diff"
55
	epatch "${FILESDIR}/makefile-archdetect.diff"
57
	epatch "${FILESDIR}/execstack-fix.diff"
56
	epatch "${FILESDIR}/execstack-fix.diff"
58
	if ! has_version dev-libs/pkcs11-helper && \
57
59
		has_version "=dev-libs/opensc-0.12*"; then
58
	mkdir pkcs11 || die
60
		mkdir pkcs11 || die
59
	cp "${WORKDIR}"/truecrypt-pkcs11.h pkcs11/pkcs11.h || die
61
		cp "${WORKDIR}"/truecrypt-pkcs11.h pkcs11/pkcs11.h || die
62
	fi
63
}
60
}
64
61
65
src_compile() {
62
src_compile() {
66
	local EXTRA pkcs11_include_directory
63
	local EXTRA
67
64
68
	use X || EXTRA+=" NOGUI=1"
65
	use X || EXTRA+=" NOGUI=1"
69
66
70
	if has_version dev-libs/pkcs11-helper; then
67
	append-flags -I"${S}"/pkcs11
71
		pkcs11_include_directory="/usr/include/pkcs11-helper-1.0"
72
	elif has_version "=dev-libs/opensc-0.12*"; then
73
		pkcs11_include_directory="/usr/include/opensc"
74
		append-flags -I"${S}"/pkcs11
75
	else
76
		pkcs11_include_directory="/usr/include/opensc"
77
	fi
78
	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
68
	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
79
69
80
	emake \
70
	emake \
Lines 90-96 src_compile() { Link Here
90
		TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
80
		TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
91
		TC_EXTRA_LFLAGS="${LDFLAGS}" \
81
		TC_EXTRA_LFLAGS="${LDFLAGS}" \
92
		WX_CONFIG="${WX_CONFIG}" \
82
		WX_CONFIG="${WX_CONFIG}" \
93
		PKCS11_INC="${pkcs11_include_directory}" \
83
		PKCS11_INC="${S}/pkcs11" \
94
		|| die "emake failed"
84
		|| die "emake failed"
95
}
85
}
96
86

Return to bug 369781