diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-21 17:39:53 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-21 17:39:53 +0000 |
| commit | 0b54bf56d5dfb1349e9010330c8dbfd85721afba (patch) | |
| tree | fa0a6856e82c26864f0f5c888b1a29a9bc9e8dde /app-crypt | |
| parent | Sparc stable, part of Bug #270738. (diff) | |
| download | historical-0b54bf56d5dfb1349e9010330c8dbfd85721afba.tar.gz historical-0b54bf56d5dfb1349e9010330c8dbfd85721afba.tar.bz2 historical-0b54bf56d5dfb1349e9010330c8dbfd85721afba.zip | |
Fix building with USE="-X" when x11-libs/wxGTK is built with USE="X" (bug #270279). Fix dependencies (bug #270441). Check for appropriate kernel configuration.
Package-Manager: portage-13625-svn/cvs/Linux x86_64
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/truecrypt/ChangeLog | 8 | ||||
| -rw-r--r-- | app-crypt/truecrypt/Manifest | 4 | ||||
| -rw-r--r-- | app-crypt/truecrypt/truecrypt-6.2.ebuild | 21 |
3 files changed, 25 insertions, 8 deletions
diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog index 3aa4ab48e8ba..8edbd3b01e2e 100644 --- a/app-crypt/truecrypt/ChangeLog +++ b/app-crypt/truecrypt/ChangeLog @@ -1,6 +1,12 @@ # 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.45 2009/05/18 04:39:01 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.46 2009/05/21 17:39:53 arfrever Exp $ + + 21 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + truecrypt-6.2.ebuild: + Fix building with USE="-X" when x11-libs/wxGTK is built with USE="X" (bug + #270279). Fix dependencies (bug #270441). Check for appropriate kernel + configuration. 18 May 2009; Robin H. Johnson <robbat2@gentoo.org> truecrypt-4.3a.ebuild, truecrypt-6.2.ebuild: diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest index 6bd6ac39f10e..22dce371d815 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 3561 RMD160 53c02158d6cdda3f9dcd4dc27be87394b6548d67 SHA1 9674e9119abb3135e8068652c995aea509f4bc69 SHA256 3a918bc9f4ae780c9b161b2442134a1cc05c793f812aa45d2dee0489300fd28a -EBUILD truecrypt-6.2.ebuild 2236 RMD160 c5a72e9947e0703bbbc862ba28111f3e183c3439 SHA1 a1ffeb62b2c7443250e81728fb63b3a40dd98507 SHA256 3e94c78e9b2afd7300e3bb3c74654ed0fb07a686e82445a6f47685bdce2e8924 -MISC ChangeLog 8424 RMD160 5ebc2bd324250bacbf5d5ae73e869a479ce485e9 SHA1 f1984bb6f712350ea5e60dd8331f6c2d8397ac4d SHA256 840bb60dfb4b4bf92ea52ee2d2a494cbf43ce65df6b1e29c3da577d44939a614 +EBUILD truecrypt-6.2.ebuild 2578 RMD160 9c2a5be9b20af09d2c9ed5afc0cab65c574cfd7f SHA1 1b1aa202b0c9844ac10412135b972b66cc61824a SHA256 6116f3869a818648ba0943398e86c4d0fc321dce81a4b6833abcd2f546477bfe +MISC ChangeLog 8689 RMD160 2af0a5c9b94a5c82cc9ee5703b0fad2931b3c397 SHA1 c65ce1897e54484713db6c7044f1f258a3d0de64 SHA256 270d803236ff4a5ac45365d9ebd81711e017261b7e23e503c5ed45c627d99910 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 4e6a81b45502..98b2264bdd5c 100644 --- a/app-crypt/truecrypt/truecrypt-6.2.ebuild +++ b/app-crypt/truecrypt/truecrypt-6.2.ebuild @@ -1,10 +1,10 @@ # 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.3 2009/05/18 04:39:01 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-6.2.ebuild,v 1.4 2009/05/21 17:39:53 arfrever Exp $ EAPI="2" -inherit flag-o-matic multilib toolchain-funcs wxwidgets +inherit flag-o-matic linux-info multilib toolchain-funcs wxwidgets DESCRIPTION="Free open-source disk encryption software" HOMEPAGE="http://www.truecrypt.org/" @@ -16,8 +16,9 @@ KEYWORDS="~amd64 ~x86" IUSE="X" RESTRICT="bindist fetch mirror" -RDEPEND="sys-fs/fuse - x11-libs/wxGTK:2.8" +RDEPEND="|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) + sys-fs/fuse + x11-libs/wxGTK:2.8[X?]" DEPEND="${RDEPEND} || ( dev-libs/pkcs11-helper dev-libs/opensc )" @@ -30,7 +31,10 @@ pkg_nofetch() { } pkg_setup() { - WX_GTK_VER="2.8" + local CONFIG_CHECK="BLK_DEV_DM DM_CRYPT FUSE_FS CRYPTO" + linux-info_pkg_setup + + local WX_GTK_VER="2.8" if use X; then need-wxwidgets unicode else @@ -38,6 +42,13 @@ pkg_setup() { fi } +src_prepare() { + if has_version x11-libs/wxGTK[X]; then + # Fix linking when NOGUI=1 + sed -e "s/WX_CONFIG_LIBS := base/&,core/" -i Main/Main.make || die "sed Main/Main.make failed" + fi +} + src_compile() { local EXTRA pkcs11_include_directory |