diff options
| author |   Dane Smith <c1pher@gentoo.org> | 2011-06-01 19:51:23 +0000 |
|---|---|---|
| committer | Dane Smith <c1pher@gentoo.org> | 2011-06-01 19:51:23 +0000 |
| commit | 544d8f55f4eeeaa8c8e9daff2188f9c23b6a4bdc (patch) | |
| tree | 43873c7df6bb3e6f621cd47d5e8c3d8a945362a1 /app-crypt/truecrypt | |
| parent | Marking yakuake-2.9.8 ppc for bug 354033 (diff) | |
| download | gentoo-2-544d8f55f4eeeaa8c8e9daff2188f9c23b6a4bdc.tar.gz gentoo-2-544d8f55f4eeeaa8c8e9daff2188f9c23b6a4bdc.tar.bz2 gentoo-2-544d8f55f4eeeaa8c8e9daff2188f9c23b6a4bdc.zip | |
app-crypt/truecrypt: Revbump. Better, more genertic fix for bug 369203. Also fix bug 369691.
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/truecrypt')
| -rw-r--r-- | app-crypt/truecrypt/ChangeLog | 13 | ||||
| -rw-r--r-- | app-crypt/truecrypt/files/makefile-archdetect.diff | 18 | ||||
| -rw-r--r-- | app-crypt/truecrypt/truecrypt-7.0a-r4.ebuild (renamed from app-crypt/truecrypt/truecrypt-7.0a-r3.ebuild) | 12 |
3 files changed, 27 insertions, 16 deletions
diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog index a5e2bd96d697..bf9d6f2fed4c 100644 --- a/app-crypt/truecrypt/ChangeLog +++ b/app-crypt/truecrypt/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for app-crypt/truecrypt # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.62 2011/06/01 14:46:10 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.63 2011/06/01 19:51:23 c1pher Exp $ + +*truecrypt-7.0a-r4 (01 Jun 2011) + + 01 Jun 2011; Dane Smith <c1pher@gentoo.org> -truecrypt-7.0a-r3.ebuild, + +truecrypt-7.0a-r4.ebuild, files/makefile-archdetect.diff: + Revbump and remove old r3. + Modify my patch to better detect all arches. Prior way didn't work + effectively. + Add depend on dev-lang/nasm if not powerpc since it's now needed for x86 and + amd64 wrt bug 369691. + Remove double RDEPEND. *truecrypt-7.0a-r3 (01 Jun 2011) diff --git a/app-crypt/truecrypt/files/makefile-archdetect.diff b/app-crypt/truecrypt/files/makefile-archdetect.diff index c01c670bbdaf..312dcfa27002 100644 --- a/app-crypt/truecrypt/files/makefile-archdetect.diff +++ b/app-crypt/truecrypt/files/makefile-archdetect.diff @@ -1,11 +1,11 @@ --- Makefile 2010-09-05 10:32:10.000000000 -0400 -+++ Makefile.new 2011-06-01 10:17:41.575000055 -0400 -@@ -128,7 +128,7 @@ - ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH))) - CPU_ARCH = x86 - ASM_OBJ_FORMAT = elf32 --else ifneq (,$(filter x86_64 x86-64 amd64 x64,$(ARCH))) -+else ifneq (,$(filter i3 i5 i7 x86_64 x86-64 amd64 x64,$(ARCH))) - CPU_ARCH = x64 - ASM_OBJ_FORMAT = elf64 ++++ Makefile.new 2011-06-01 15:23:24.975000088 -0400 +@@ -120,7 +120,7 @@ + + export CPU_ARCH ?= unknown + +-ARCH = $(shell uname -p) ++ARCH = $(shell uname -m) + ifeq "$(ARCH)" "unknown" + ARCH = $(shell uname -m) endif diff --git a/app-crypt/truecrypt/truecrypt-7.0a-r3.ebuild b/app-crypt/truecrypt/truecrypt-7.0a-r4.ebuild index cbb474998993..d0a09329b4f1 100644 --- a/app-crypt/truecrypt/truecrypt-7.0a-r3.ebuild +++ b/app-crypt/truecrypt/truecrypt-7.0a-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.0a-r3.ebuild,v 1.1 2011/06/01 14:46:10 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.0a-r4.ebuild,v 1.1 2011/06/01 19:51:23 c1pher Exp $ EAPI="2" @@ -13,17 +13,17 @@ SRC_URI="${P}.tar.gz" LICENSE="truecrypt-3.0" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="-* ~amd64 ~ppc ~x86" IUSE="X" RESTRICT="mirror fetch bindist" 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 )" -RDEPEND="${RDEPEND} + 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" |