remove version 5.1a as it cannot be downloaded and is on fetch restriction - thanks Arfrever. remove gcc patch on 6.0a as it compiles fine on gcc-4.3.1

(Portage version: 2.2_rc1/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64)

5 files changed, 9 insertions, 146 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 79da16a0cf71..6415da51e693 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.38 2008/07/09 07:53:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.39 2008/07/09 23:00:46 dragonheart Exp $
+
+  09 Jul 2008; Daniel Black <dragonheart@gentoo.org>
+  -files/truecrypt-5.1a-gcc-4.3.patch, -files/truecrypt-6.0a-gcc-4.3.patch,
+  -truecrypt-5.1a.ebuild, truecrypt-6.0a.ebuild:
+  remove version 5.1a as it cannot be downloaded and is on fetch restriction -
+  thanks Arfrever. remove gcc patch on 6.0a as it compiles fine on gcc-4.3.1
 
 *truecrypt-6.0a (09 Jul 2008)
 
diff --git a/app-crypt/truecrypt/files/truecrypt-5.1a-gcc-4.3.patch b/app-crypt/truecrypt/files/truecrypt-5.1a-gcc-4.3.patch
deleted file mode 100644
index acd92a2eb23e..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-5.1a-gcc-4.3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ubr ./truecrypt-5.1a-source/Core/FatFormatter.cpp ./truecrypt-5.1a-source-patch/Core/FatFormatter.cpp
---- ./truecrypt-5.1a-source/Core/FatFormatter.cpp	2008-02-04 18:28:50.000000000 +0100
-+++ ./truecrypt-5.1a-source-patch/Core/FatFormatter.cpp	2008-04-17 18:58:06.000000000 +0200
-@@ -13,6 +13,7 @@
- #include "Common/Tcdefs.h"
- #include "Platform/Platform.h"
- #include "FatFormatter.h"
-+#include <cstring>
- 
- namespace TrueCrypt
- {
-diff -ubr ./truecrypt-5.1a-source/Platform/Memory.cpp ./truecrypt-5.1a-source-patch/Platform/Memory.cpp
---- ./truecrypt-5.1a-source/Platform/Memory.cpp	2008-02-04 12:14:46.000000000 +0100
-+++ ./truecrypt-5.1a-source-patch/Platform/Memory.cpp	2008-04-17 18:58:06.000000000 +0200
-@@ -8,6 +8,7 @@
- 
- #include "Memory.h"
- #include "Exception.h"
-+#include <cstring>
- 
- namespace TrueCrypt
- {
-diff -ubr ./truecrypt-5.1a-source/Volume/EncryptionTest.cpp ./truecrypt-5.1a-source-patch/Volume/EncryptionTest.cpp
---- ./truecrypt-5.1a-source/Volume/EncryptionTest.cpp	2008-02-04 12:14:12.000000000 +0100
-+++ ./truecrypt-5.1a-source-patch/Volume/EncryptionTest.cpp	2008-04-17 18:58:06.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/files/truecrypt-6.0a-gcc-4.3.patch b/app-crypt/truecrypt/files/truecrypt-6.0a-gcc-4.3.patch
deleted file mode 100644
index 9855c8eea612..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-6.0a-gcc-4.3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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-5.1a.ebuild b/app-crypt/truecrypt/truecrypt-5.1a.ebuild
deleted file mode 100644
index f5ce651c074b..000000000000
--- a/app-crypt/truecrypt/truecrypt-5.1a.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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-5.1a.ebuild,v 1.2 2008/04/18 05:26:42 alonbl Exp $
-
-inherit eutils toolchain-funcs multilib wxwidgets
-
-DESCRIPTION="Free open-source disk encryption software"
-HOMEPAGE="http://www.truecrypt.org/"
-SRC_URI="${P}.tar.gz"
-
-LICENSE="truecrypt-collective-1.3"
-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}/${P}.tar.gz"
-}
-
-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}/${P}-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"
-}
diff --git a/app-crypt/truecrypt/truecrypt-6.0a.ebuild b/app-crypt/truecrypt/truecrypt-6.0a.ebuild
index df67bc4d4b34..2248cf09a909 100644
--- a/app-crypt/truecrypt/truecrypt-6.0a.ebuild
+++ b/app-crypt/truecrypt/truecrypt-6.0a.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-6.0a.ebuild,v 1.2 2008/07/09 23:00:46 dragonheart Exp $
 
 inherit eutils toolchain-funcs multilib wxwidgets
 
@@ -39,7 +39,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+#	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"