Version bump (bug #245322).

(Portage version: 13623-svn/cvs/Linux x86_64)

6 files changed, 37 insertions, 114 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 88fb930f9aea..48212cce7861 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.42 2009/04/20 00:07:22 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.43 2009/05/18 02:30:33 arfrever Exp $
+
+*truecrypt-6.2 (18 May 2009)
+
+  18 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  truecrypt-4.3a.ebuild, -files/truecrypt-5.0-bool.patch,
+  -files/truecrypt-5.1-64bit.patch, -files/truecrypt-5.1a-external-wx.patch,
+  -truecrypt-6.0a.ebuild, +truecrypt-6.2.ebuild:
+  Version bump (bug #245322).
 
   20 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   +files/truecrypt-4.3a-2.6.29.patch, truecrypt-4.3a:
diff --git a/app-crypt/truecrypt/files/truecrypt-5.0-bool.patch b/app-crypt/truecrypt/files/truecrypt-5.0-bool.patch
deleted file mode 100644
index ac381c6e8bdf..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-5.0-bool.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-xwGTK undef BOOL if ODBC is used.
-Next version of xwGTK does not have db support.
-
----
-
-diff -urNp truecrypt-5.0-source/Common/Crypto.h truecrypt-5.0-source.new/Common/Crypto.h
---- truecrypt-5.0-source/Common/Crypto.h	2008-02-04 19:15:38.000000000 +0200
-+++ truecrypt-5.0-source.new/Common/Crypto.h	2008-02-10 22:40:55.000000000 +0200
-@@ -29,6 +29,10 @@
- 
- #include "Tcdefs.h"
- 
-+#ifndef BOOL
-+#define BOOL BOOL1
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-diff -urNp truecrypt-5.0-source/Makefile truecrypt-5.0-source.new/Makefile
---- truecrypt-5.0-source/Makefile	2008-02-04 20:19:02.000000000 +0200
-+++ truecrypt-5.0-source.new/Makefile	2008-02-10 22:40:34.000000000 +0200
-@@ -42,7 +42,8 @@ export CFLAGS := -W
- export CXXFLAGS := -Wall
- 
- C_CXX_FLAGS := -MMD -I$(BASE_DIR) -I$(BASE_DIR)/Crypto
- C_CXX_FLAGS += -DBOOL=int -DFALSE=0 -DTRUE=1
-+C_CXX_FLAGS += -DBOOL1=int
- ifeq "$(origin USE64BIT)" "command line"
- C_CXX_FLAGS += -D__int8=char -D__int16=short -D__int32=int '-D__int64=long'  # Tested in PlatformTest
- else
diff --git a/app-crypt/truecrypt/files/truecrypt-5.1-64bit.patch b/app-crypt/truecrypt/files/truecrypt-5.1-64bit.patch
deleted file mode 100644
index e354c7b5502d..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-5.1-64bit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- truecrypt-5.0a-source.org/Makefile	2008-02-04 20:19:02.000000000 +0200
-+++ truecrypt-5.0a-source/Makefile	2008-02-13 19:47:58.000000000 +0200
-@@ -42,7 +42,11 @@ export CFLAGS := -W
- export CXXFLAGS := -Wall
- 
- C_CXX_FLAGS := -MMD -I$(BASE_DIR) -I$(BASE_DIR)/Crypto
- C_CXX_FLAGS += -DBOOL=int -DFALSE=0 -DTRUE=1
-+ifeq "$(origin USE64BIT)" "command line"
-+C_CXX_FLAGS += -D__int8=char -D__int16=short -D__int32=int '-D__int64=long'  # Tested in PlatformTest
-+else
- C_CXX_FLAGS += -D__int8=char -D__int16=short -D__int32=int '-D__int64=long long'  # Tested in PlatformTest
-+endif
- 
- export LFLAGS :=
diff --git a/app-crypt/truecrypt/files/truecrypt-5.1a-external-wx.patch b/app-crypt/truecrypt/files/truecrypt-5.1a-external-wx.patch
deleted file mode 100644
index 2cdd183b169b..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-5.1a-external-wx.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urNp truecrypt-5.1a-source.org/Main/Main.make truecrypt-5.1a-source/Main/Main.make
---- truecrypt-5.1a-source.org/Main/Main.make	2008-03-11 20:48:42.000000000 +0200
-+++ truecrypt-5.1a-source/Main/Main.make	2008-03-21 18:38:43.000000000 +0200
-@@ -70,21 +70,25 @@ CXXFLAGS += -I$(BASE_DIR)/Main
- 
- #------ wxWidgets configuration ------
- 
-+WX_CONFIG ?= $(WX_BUILD_DIR)/wx-config
-+WX_CONFIG_EXTRA ?= --static
-+
- ifdef TC_NO_GUI
- WX_CONFIG_LIBS := base
- else
- WX_CONFIG_LIBS := adv,core,base
- endif
-+WX_CONFIG_LIBS =
- 
- ifeq "$(TC_BUILD_CONFIG)" "Release"
- 
--CXXFLAGS += $(shell $(WX_BUILD_DIR)/wx-config --unicode --static --cxxflags)
--WX_LIBS = $(shell $(WX_BUILD_DIR)/wx-config --unicode --static --libs $(WX_CONFIG_LIBS))
-+CXXFLAGS += $(shell $(WX_CONFIG) --unicode $(WX_CONFIG_EXTRA) --cxxflags)
-+WX_LIBS = $(shell $(WX_CONFIG) --unicode $(WX_CONFIG_EXTRA) --libs $(WX_CONFIG_LIBS))
- 
- else
- 
--CXXFLAGS += $(shell $(WX_BUILD_DIR)/wx-config --debug --unicode --static --cxxflags)
--WX_LIBS = $(shell $(WX_BUILD_DIR)/wx-config --debug --unicode --static --libs $(WX_CONFIG_LIBS))
-+CXXFLAGS += $(shell $(WX_CONFIG) --debug --unicode $(WX_CONFIG_EXTRA) --cxxflags)
-+WX_LIBS = $(shell $(WX_CONFIG) --debug --unicode $(WX_CONFIG_EXTRA) --libs $(WX_CONFIG_LIBS))
- 
- endif
- 
diff --git a/app-crypt/truecrypt/truecrypt-4.3a.ebuild b/app-crypt/truecrypt/truecrypt-4.3a.ebuild
index 9d4984fc520c..f7a3cfd48069 100644
--- a/app-crypt/truecrypt/truecrypt-4.3a.ebuild
+++ b/app-crypt/truecrypt/truecrypt-4.3a.ebuild
@@ -1,6 +1,6 @@
 # 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-4.3a.ebuild,v 1.9 2009/04/20 00:07:22 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.3a.ebuild,v 1.10 2009/05/18 02:30:33 arfrever Exp $
 
 #
 # NOTES:
@@ -20,9 +20,9 @@ SRC_URI="http://www.truecrypt.org/downloads/truecrypt-${PV}-source-code.tar.gz"
 
 LICENSE="truecrypt-collective-1.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="mirror fetch bindist"
+RESTRICT="bindist fetch mirror"
 
 RDEPEND="|| ( >=sys-fs/lvm2-2.02.45
 	sys-fs/device-mapper )"
@@ -59,7 +59,7 @@ src_compile() {
 }
 
 src_test() {
-	"${S}/Linux/Cli/truecrypt" --test
+	"${S}/Linux/Cli/truecrypt" --test || die "tests failed"
 }
 
 src_install() {
diff --git a/app-crypt/truecrypt/truecrypt-6.0a.ebuild b/app-crypt/truecrypt/truecrypt-6.2.ebuild
index 4fbc96edf683..4b6508110ab7 100644
--- a/app-crypt/truecrypt/truecrypt-6.0a.ebuild
+++ b/app-crypt/truecrypt/truecrypt-6.2.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.0a.ebuild,v 1.3 2008/11/03 17:24:42 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-6.2.ebuild,v 1.1 2009/05/18 02:30:33 arfrever Exp $
 
-inherit eutils toolchain-funcs multilib wxwidgets
+EAPI="2"
+
+inherit flag-o-matic multilib toolchain-funcs 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"
+LICENSE="truecrypt-2.6"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X"
-RESTRICT="mirror fetch bindist"
+RESTRICT="bindist fetch mirror"
 
 RDEPEND="sys-fs/fuse
-	=x11-libs/wxGTK-2.8*"
-DEPEND="${RDEPEND}"
+	x11-libs/wxGTK:2.8"
+DEPEND="${RDEPEND}
+	dev-libs/opensc"
 
 S="${WORKDIR}/${P}-source"
 
@@ -36,48 +38,40 @@ pkg_setup() {
 	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() {
+	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
 	local EXTRA
-	use amd64 && EXTRA="${EXTRA} USE64BIT=1"
-	use X || EXTRA="${EXTRA} NOGUI=1"
+	use X || EXTRA+=" NOGUI=1"
 	emake \
 		${EXTRA} \
 		NOSTRIP=1 \
-		VERBOSE=1 \
 		NOTEST=1 \
+		VERBOSE=1 \
 		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
 		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
 		RANLIB="$(tc-getRANLIB)" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
+		TC_EXTRA_CFLAGS="${CFLAGS}" \
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
+		TC_EXTRA_LFLAGS="${LDFLAGS}" \
 		WX_CONFIG="${WX_CONFIG}" \
-		WX_CONFIG_EXTRA="" \
-		|| die
+		PKCS11_INC="/usr/include/opensc" \
+		|| die "emake failed"
 }
 
 src_test() {
-	"${S}/Main/truecrypt" --text --test
+	"${S}/Main/truecrypt" --text --test || die "tests failed"
 }
 
 src_install() {
 	dobin Main/truecrypt
-	dodoc Readme.txt 'Release/Setup Files/TrueCrypt User Guide.pdf'
+	dodoc Readme.txt "Release/Setup Files/TrueCrypt User Guide.pdf"
 	insinto "/$(get_libdir)/rcscripts/addons"
 	newins "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh"
 }
 
 pkg_postinst() {
-	elog "potential legal problems - use at own risk"
-	elog "http://lists.freedesktop.org/archives/distributions/2008-October/000276.html"
+	ewarn "TrueCrypt has very restrictive license."
+	ewarn "Please read the ${LICENSE} license in ${PORTDIR}/licenses directory before using TrueCrypt."
+	ebeep 12
 }