app-crypt/truecrypt: Revbump. Better, more genertic fix for bug 369203. Also fix bug 369691.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 43 insertions, 32 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/Manifest b/app-crypt/truecrypt/Manifest
index edcf8ffcdf9c..663c75d6c86d 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX makefile-archdetect.diff 388 RMD160 d79dabb86a9f5e90eefdd3a0a42e4c64243dccb7 SHA1 bad18f8d1c09f52299993bdc03f9bf99204e2307 SHA256 cccaaa28059718c992a52060d26f37714cdb49818977d0744a21f5b9ef2a8ae7
+AUX makefile-archdetect.diff 266 RMD160 9cb64f2d12174d458e6268802aaf92ae6e0de4a9 SHA1 d935b856299a78f1c818b3b989849d9f165015a3 SHA256 aa201bb7c93852c814d71c963b1d416d62aa2d1e685f9f5149b1388dca9ae883
 AUX truecrypt-stop.sh 308 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 SHA1 7139ba403e482a4746e1d545115b74760b1438ea SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c
 AUX truecrypt.init 729 RMD160 63472dd371afd892e6b00de0e3e516c74ed0075a SHA1 8cb25b2093322e449715abcb3034454fcc6ef77f SHA256 6530577c5f86800a7d92a76b927538006a27f57cf517c6f2bdb793cebaa70b59
 DIST truecrypt-7.0a.tar.gz 1996312 RMD160 92b01f87c725feb43aded666ba44fcbd3e3ac740 SHA1 42be0f333e6791e7a122b3e1183e014cd3860198 SHA256 6c845153ee868429e2a531407383e9349754d1579cf66fc838632c44baaba021
 EBUILD truecrypt-7.0a-r2.ebuild 3458 RMD160 0f1d3b6d529fa89809ca4944cae0e292c015f1a2 SHA1 e8c8aea3b7800df23498096dc485c9ae8a7a62e2 SHA256 0088a216a26381427e8de29354a7a1ad1b5fe28a80192bb7bc71d64f4d89df69
-EBUILD truecrypt-7.0a-r3.ebuild 3565 RMD160 75cc7590ae5136b1a745b3a3e5fee5e1bcd2abf1 SHA1 a2861a11e355998b73e623af70fe61da3e411feb SHA256 3aefab93ac26226bd95a44f1fbcf8b82060e473f835ee5ea822d2711e8995d5c
-MISC ChangeLog 12020 RMD160 dbdb090d9c9bb5d5ca41015d1a4edaddf8e0549d SHA1 ffe1335bb97e8297720190ec02fec4a76c1e7230 SHA256 35ea83ab9d834838a52860c5e5081d601aa26920667740f53f596a00bfa30cdc
+EBUILD truecrypt-7.0a-r4.ebuild 3572 RMD160 f17930cf342e2df087baae80eebf158851d4fbc9 SHA1 2cf9efae07304d0ed0fc259ab387de17fde5518a SHA256 35371f93a1d38bd008a84ae85aa6b9f28dea2d3e88e5977c09c2dd44fa6cf371
+MISC ChangeLog 12430 RMD160 ef0036d1b6b0d628bab241f7c6369b6621ac80f8 SHA1 6cfe9c01e28993abb78b251d8ea09f4213e6e0d5 SHA256 d7d973de45f75fcafad6fe669e169ee7563a4f99cef54cde80deafb2d83a156f
 MISC metadata.xml 250 RMD160 0ed9b992d346dffc7427a6f36ad6db15f099542f SHA1 906ae1d1afaf4c06a5b54cf7e25843dbac2bb5ba SHA256 c4dab52dbdf0558df59853ea282e0b1deb4cb968914468a648070dcd31a456d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJN5k+cAAoJEEsurZwMLhUxpTMP/1hSkheuVXGPmDAyacqfxEDw
-bkhEb0QdGy/9NlCTWlAFYDCKLemUsXAKbFqdvTLpr5DvD5zBA0mP0KC07KCpuToh
-CEzwSY3QsIrxQF4HmuMnowZa8NwT9UYDgddUAgCdHCO6lCm4xcvrIeCFT64EbLmR
-qLF/22X/SwehiK0guIFQ7+nsUYIRKmho3lV3GfPnkRP6+7L+6elqaJNVnzqmUQJL
-l1vuqBhOtO8gbIhQf1sgQU5AEOMtheHkFGvqV/5+mhBLIWFQZP6tWbwcLSL6PD54
-eJld1MJbDxIg7YKJk2kJULSlzj4f33isNgGsE5lHx+HLOAqKCKE7gYfZ7cXxr5v5
-j6IPP5b4+sIugnIBUpcVJNne2SyDIg+Dc0eP1okIEqHNAF0tgHW86Wz+mBkUX0ws
-KYbTO1FVXwfSFo2+8eHxph+Ia9wapvisHCRclSfaebSlVYyBivxhbjXkf5ZbtRkl
-SNDNsfQwVCyggQGyj7iay83FIps3wSyBGnJmNiK1Ov4AkWU+y/+I9a8X3cscnmph
-ihRAAPA2fCKsNQjVPXaBffiROABVpJY96xE2zedBfC6uliLJ9O7qKk055/5n+p7j
-ENQb5gHhCl4pMDfx9N5hG4sXNBFZ9CuZvrLUvMSnTAiKfSxXF79QyC43+HkvxGw8
-AfMD6pxRK6j2DgXhaJhS
-=baAU
+iQIcBAEBAgAGBQJN5pcjAAoJEEsurZwMLhUxV90P/RTMmN8hfaEDxKoYsq3BOS4n
+SeetAU8KJhCBHcxIaSzlrwoxFHkFVgRTSN1HTBj/xibwSHpRBUzeY/fugiE8O78K
+yc/iCy8D4N1Mmw3EX6LFJSTMZ1aV7oH8bdEMtsqV4QSzQzzEX3mnvJPs2YkI/ODa
++/YxdbouTPID1spULEEKrWu5DT2hHxAvVrmM/yh8IrWDv7N3WLO9am/fjCb3QMMB
+oayVII+c9S1RpIA4nWnaM4nwU6wYSlVFmNQ+Li4SL8SAkOo3hXKYceSbkLtvrCV/
+g/9o5TJSjLp8kqSE0EZeROSviKJK+U6voSjY2vx3VirZKYWHAF39jJ+O3BSJdl1+
+RHzRnBjVEEwXgUHFkin+aQdMyIN4J0qj1maTV93NSS4MwasOE6CAo4nu1tweDFbr
+iX4MRavD6b3BI5gWmJlyCBRfDYfUOvXajSsCZ9RtV8sV7aaid6RaD8W3WSS+kqEA
+dbrz0ZWH32yCa3eFaWJOw+kV2JALhcCRRI62gVlrSgyGjPYNyLvWuSxpL1Q1dhCT
+3d+JzYcrvzUJm6UAIa96kiz929nii4I9q3dGzzJuJutCQewfzK35BPp4peMV2TOo
+jrsUS1tImp5iwa6lzLq6YzyvpB0FjROJaE273Wk+B9ZavScmeD6rTHAo05eeHyaH
+vQ6vS3eS5/6kTnqdhVLW
+=SPwd
 -----END PGP SIGNATURE-----
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"