version bump as per bug #230862 thanks to Sebastian and m.nawaz

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64

4 files changed, 122 insertions, 2 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 6ba515827c63..79da16a0cf71 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/truecrypt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.37 2008/04/18 05:26:42 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.38 2008/07/09 07:53:46 dragonheart Exp $
+
+*truecrypt-6.0a (09 Jul 2008)
+
+  09 Jul 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/truecrypt-6.0a-gcc-4.3.patch, +truecrypt-6.0a.ebuild:
+  version bump as per bug #230862 thanks to Sebastian and m.nawaz
 
   18 Apr 2008; Alon Bar-Lev <alonbl@gentoo.org>
   +files/truecrypt-5.1a-gcc-4.3.patch, truecrypt-5.1a.ebuild:
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index cc50249348d1..efeb0ff78203 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -4,10 +4,13 @@ AUX truecrypt-5.0-bool.patch 1032 RMD160 7e3aa621c6b47f92d0837bf7d0c07297bb1490a
 AUX truecrypt-5.1-64bit.patch 601 RMD160 479ea2a3c6809c9b9ea1febfa969fb25d02fd5ad SHA1 1448d11833aca850cebde2b0432c8f97df1fec1d SHA256 db767f5220077f6a97c8f3ba6e439cb27a45642a34004b1302401ad43fca1aee
 AUX truecrypt-5.1a-external-wx.patch 1272 RMD160 c63b166cfd26eebf2b70df9f4152523bc4d10f3c SHA1 5e6a2585ca8923b2af71c327adf3b7c48d9adbc4 SHA256 1c00a403f2be391f2779a9ade2c8f211bc7b7fe6616584568db2f24785afd4ad
 AUX truecrypt-5.1a-gcc-4.3.patch 1274 RMD160 094298efbe8eb9f2295ed1bb66e1daddf5dc57c1 SHA1 d69ab75c9b25435f9f1a455fa4a57944db3880e4 SHA256 b89d7e3b8a5ff06c28fd0ec0c91603a792e9a348a8f00a47acdb78de4200c6da
+AUX truecrypt-6.0a-gcc-4.3.patch 1243 RMD160 65e9835e23a6db2b19a260a2891ed7e96df91a27 SHA1 b18b8fbd74b1d1b4c537f482d86a372dbe353f7a SHA256 55f37fb7b69bd901b34702f234868df308915714e15c5850113eb72fd9655c52
 AUX truecrypt-stop.sh 308 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 SHA1 7139ba403e482a4746e1d545115b74760b1438ea SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c
 DIST truecrypt-4.3a-source-code.tar.gz 1110554 RMD160 1a24ae6132b43876161a090751c19afed7c5c996 SHA1 30c91901171c3c8290d4d0de856774cdf7ee4ed6 SHA256 d5515cfeb1bb328ad6f13ef347cd9422b4bb15bf849aabc4cd4f2f69a3e0c74a
 DIST truecrypt-5.1a.tar.gz 1630227 RMD160 5ade4071b7a7691e98fd2b3c7ab452747aa9124f SHA1 5453b855036f09361c5b970d4cd3069e62a7221b SHA256 ee2fa171eaa079f2c2ef091784263883b637e976f51ba455d4bc898cb372aa66
+DIST truecrypt-6.0a.tar.gz 1686350 RMD160 fafdbe596f1f9cab41917241b1da424635145a00 SHA1 5ebfe6a79620ced63e6eb33f2cbff6dfa5fd57e9 SHA256 dea0ac2f1f6964d7e88f6751fa9f0a89d0dbfb957e9a557e8dee48492d0b4fac
 EBUILD truecrypt-4.3a.ebuild 3092 RMD160 40a13fd5bd619f87b21f199f11a70c2f64dc6b93 SHA1 4995db75c00642921d84270604b1c9b0d68e2401 SHA256 b815d54e344efcc6eed990d85957c074e2177e1de3568c57d3e637a90b63d820
 EBUILD truecrypt-5.1a.ebuild 1748 RMD160 9c6edbecb6c9f4250c447b72c9bebf62cfb8c931 SHA1 bad5455a4a7bc06d58b1b353ff960e0507068243 SHA256 35d387f0ab3f6dc940e4568250d6f27a64679abf7d47d9ab8547af459465abe8
-MISC ChangeLog 6655 RMD160 a2e346b0c98944c5e8eb99d000b28bd4da223bd6 SHA1 54fc641a7af079e339b6fc0e41fd32e9ac1a8380 SHA256 059072777996ef40255e603bff54e86091bcf8e8f9523ffae3e7fe25130e8dd1
+EBUILD truecrypt-6.0a.ebuild 1799 RMD160 45d74223d7df507a1a0e7708ec70a9a54f68e633 SHA1 f7c6caa18136553baa45b02f3294a2c4feaeb3dc SHA256 7e9f8ba358a8e329c9575de3c9df2acdb483fe134fbfe55888ccf1f03c65e92c
+MISC ChangeLog 6874 RMD160 9864759bd9335ca8e9322c00f363eb96098b4007 SHA1 7492e671b99e980c55eea1580d29cefa8f970f8a SHA256 6501431336f18b41b6a0a70378c74c043c2d168784719d7bccfacfd6c1ddb4aa
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
diff --git a/app-crypt/truecrypt/files/truecrypt-6.0a-gcc-4.3.patch b/app-crypt/truecrypt/files/truecrypt-6.0a-gcc-4.3.patch
new file mode 100644
index 000000000000..9855c8eea612
--- /dev/null
+++ b/app-crypt/truecrypt/files/truecrypt-6.0a-gcc-4.3.patch
@@ -0,0 +1,33 @@
+diff -urNp truecrypt-6.0-source.dist/Core/FatFormatter.cpp truecrypt-6.0-source/Core/FatFormatter.cpp
+--- truecrypt-6.0-source.dist/Core/FatFormatter.cpp	2008-07-05 14:17:17.000000000 +0200
++++ truecrypt-6.0-source/Core/FatFormatter.cpp	2008-07-05 14:43:32.000000000 +0200
+@@ -14,6 +14,7 @@
+ #include "Platform/Platform.h"
+ #include "FatFormatter.h"
+ #include "RandomNumberGenerator.h"
++#include <cstring>
+ 
+ namespace TrueCrypt
+ {
+diff -urNp truecrypt-6.0-source.dist/Platform/Memory.cpp truecrypt-6.0-source/Platform/Memory.cpp
+--- truecrypt-6.0-source.dist/Platform/Memory.cpp	2008-07-05 14:17:17.000000000 +0200
++++ truecrypt-6.0-source/Platform/Memory.cpp	2008-07-05 14:42:53.000000000 +0200
+@@ -8,6 +8,7 @@
+ 
+ #include "Memory.h"
+ #include "Exception.h"
++#include <cstring>
+ 
+ namespace TrueCrypt
+ {
+diff -urNp truecrypt-6.0-source.dist/Volume/EncryptionTest.cpp truecrypt-6.0-source/Volume/EncryptionTest.cpp
+--- truecrypt-6.0-source.dist/Volume/EncryptionTest.cpp	2008-07-05 14:17:17.000000000 +0200
++++ truecrypt-6.0-source/Volume/EncryptionTest.cpp	2008-07-05 14:42:53.000000000 +0200
+@@ -15,6 +15,7 @@
+ #include "EncryptionModeXTS.h"
+ #include "EncryptionTest.h"
+ #include "Pkcs5Kdf.h"
++#include <cstring>
+ 
+ namespace TrueCrypt
+ {
diff --git a/app-crypt/truecrypt/truecrypt-6.0a.ebuild b/app-crypt/truecrypt/truecrypt-6.0a.ebuild
new file mode 100644
index 000000000000..df67bc4d4b34
--- /dev/null
+++ b/app-crypt/truecrypt/truecrypt-6.0a.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-6.0a.ebuild,v 1.1 2008/07/09 07:53:46 dragonheart Exp $
+
+inherit eutils toolchain-funcs multilib wxwidgets
+
+DESCRIPTION="Free open-source disk encryption software"
+HOMEPAGE="http://www.truecrypt.org/"
+#SRC_URI="TrueCrypt ${PV} Source.tar.gz"
+SRC_URI="${P}.tar.gz"
+
+LICENSE="truecrypt-collective-1.4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+RESTRICT="fetch"
+
+RDEPEND="sys-fs/fuse
+	=x11-libs/wxGTK-2.8*"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-source"
+
+pkg_nofetch() {
+	einfo "Please download tar.gz source from:"
+	einfo "http://www.truecrypt.org/downloads2.php"
+	einfo "Then put the file in ${DISTDIR}/${SRC_URI}"
+}
+
+pkg_setup() {
+	WX_GTK_VER="2.8"
+	if use X; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets base-unicode
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+	epatch "${FILESDIR}/${PN}-5.1a-external-wx.patch"
+	epatch "${FILESDIR}/${PN}-5.1-64bit.patch"
+	epatch "${FILESDIR}/${PN}-5.0-bool.patch"
+}
+
+src_compile() {
+	local EXTRA
+	use amd64 && EXTRA="${EXTRA} USE64BIT=1"
+	use X || EXTRA="${EXTRA} NOGUI=1"
+	emake \
+		${EXTRA} \
+		NOSTRIP=1 \
+		VERBOSE=1 \
+		NOTEST=1 \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		CXX="$(tc-getCXX)" \
+		RANLIB="$(tc-getRANLIB)" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_CXXFLAGS="${CXXFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		WX_CONFIG="${WX_CONFIG}" \
+		WX_CONFIG_EXTRA="" \
+		|| die
+}
+
+src_test() {
+	"${S}/Main/truecrypt" --text --test
+}
+
+src_install() {
+	dobin Main/truecrypt
+	dodoc Readme.txt 'Release/Setup Files/TrueCrypt User Guide.pdf'
+	insinto "/$(get_libdir)/rcscripts/addons"
+	newins "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh"
+}