app-crypt/truecrypt - Version bump wrt bug 381717. Drop old wrt bug 382663.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

4 files changed, 8 insertions, 259 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index a222cfec6e60..425ccf0508ff 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.66 2011/07/15 17:53:07 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.67 2011/12/07 17:06:56 c1pher Exp $
+
+*truecrypt-7.1 (07 Dec 2011)
+
+  07 Dec 2011; Dane Smith <c1pher@gentoo.org> -truecrypt-7.0a-r2.ebuild,
+  -truecrypt-7.0a-r5.ebuild, -truecrypt-7.0a-r6.ebuild, +truecrypt-7.1.ebuild:
+  Version bump wrt bug 381717. Drop old wrt bug 382663.
 
 *truecrypt-7.0a-r6 (15 Jul 2011)
 
diff --git a/app-crypt/truecrypt/truecrypt-7.0a-r2.ebuild b/app-crypt/truecrypt/truecrypt-7.0a-r2.ebuild
deleted file mode 100644
index 8ad970e51bb9..000000000000
--- a/app-crypt/truecrypt/truecrypt-7.0a-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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-r2.ebuild,v 1.3 2011/04/25 14:15:37 c1pher Exp $
-
-EAPI="2"
-
-inherit flag-o-matic linux-info multilib toolchain-funcs wxwidgets eutils
-
-DESCRIPTION="Free open-source disk encryption software"
-HOMEPAGE="http://www.truecrypt.org/"
-SRC_URI="${P}.tar.gz"
-
-LICENSE="truecrypt-3.0"
-SLOT="0"
-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}
-	app-admin/sudo"
-
-S="${WORKDIR}/${P}-source"
-
-#See bug 241650.
-pkg_nofetch() {
-	elog "Please download ${P}-linux-{86,64}.tar.gz source from:"
-	elog "http://www.truecrypt.org/downloads2"
-	elog "Then put the file in ${DISTDIR}/${P}.tar.gz"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~BLK_DEV_DM ~DM_CRYPT ~FUSE_FS ~CRYPTO ~CRYPTO_XTS"
-	linux-info_pkg_setup
-
-	local WX_GTK_VER="2.8"
-	if use X; then
-		need-wxwidgets unicode
-	else
-		need-wxwidgets base-unicode
-	fi
-}
-
-src_prepare() {
-	if has_version x11-libs/wxGTK[X]; then
-		# Fix linking when NOGUI=1
-		sed -e "s/WX_CONFIG_LIBS := base/&,core/" -i Main/Main.make || die "sed Main/Main.make failed"
-	fi
-}
-
-src_compile() {
-	local EXTRA pkcs11_include_directory
-
-	use X || EXTRA+=" NOGUI=1"
-
-	if has_version dev-libs/pkcs11-helper; then
-		pkcs11_include_directory="/usr/include/pkcs11-helper-1.0"
-	else
-		pkcs11_include_directory="/usr/include/opensc"
-	fi
-	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
-
-	emake \
-		${EXTRA} \
-		NOSTRIP=1 \
-		NOTEST=1 \
-		VERBOSE=1 \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		TC_EXTRA_CFLAGS="${CFLAGS}" \
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		TC_EXTRA_LFLAGS="${LDFLAGS}" \
-		WX_CONFIG="${WX_CONFIG}" \
-		PKCS11_INC="${pkcs11_include_directory}" \
-		|| die "emake failed"
-}
-
-src_test() {
-	"${S}/Main/truecrypt" --text --test || die "tests failed"
-}
-
-src_install() {
-	dobin Main/truecrypt || die
-	dodoc Readme.txt "Release/Setup Files/TrueCrypt User Guide.pdf" || die
-	exeinto "/$(get_libdir)/rcscripts/addons"
-	newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh" || die
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN} || die
-
-	if use X; then
-		newicon Resources/Icons/TrueCrypt-48x48.xpm truecrypt.xpm || die
-		make_desktop_entry ${PN} "TrueCrypt" ${PN} "System" || die
-	fi
-}
-
-pkg_postinst() {
-	elog "There is now an init script for TrueCrypt for Baselayout-2."
-	elog "If you are a baselayout-2 user and you would like the TrueCrypt"
-	elog "mappings removed on shutdown in order to prevent other file systems"
-	elog "from unmounting then run:"
-	elog "rc-update add truecrypt boot"
-	elog ""
-
-	ewarn "If you're getting errors about DISPLAY while using the terminal"
-	ewarn "it's a known upstream bug. To use TrueCrypt from the terminal"
-	ewarn "all that's necessary is to run: unset DISPLAY"
-	ewarn "This will make the display unaccessable from that terminal "
-	ewarn "but at least you will be able to access your volumes."
-	ewarn ""
-
-	ewarn "TrueCrypt has very restrictive license."
-	ewarn "Please read the ${LICENSE} license in ${PORTDIR}/licenses"
-	ewarn "directory before using TrueCrypt. Please be explicitly aware of"
-	ewarn "the limitations on redistribution of binaries or modified source."
-}
diff --git a/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild b/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild
deleted file mode 100644
index 492137cda58f..000000000000
--- a/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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-r5.ebuild,v 1.2 2011/07/15 13:10:37 c1pher Exp $
-
-EAPI="2"
-
-inherit flag-o-matic linux-info multilib toolchain-funcs wxwidgets eutils \
-	pax-utils
-
-DESCRIPTION="Free open-source disk encryption software"
-HOMEPAGE="http://www.truecrypt.org/"
-SRC_URI="${P}.tar.gz\
-	mirror://gentoo/${PN}-pkcs11.h.bz2"
-
-LICENSE="truecrypt-3.0"
-SLOT="0"
-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?]
-	app-admin/sudo"
-DEPEND="${RDEPEND}
-	|| ( dev-libs/pkcs11-helper dev-libs/opensc )
-	!ppc? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${P}-source"
-
-#See bug 241650.
-pkg_nofetch() {
-	elog "Please download ${P}-linux-{86,64}.tar.gz source from:"
-	elog "http://www.truecrypt.org/downloads2"
-	elog "Then put the file in ${DISTDIR}/${P}.tar.gz"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~BLK_DEV_DM ~DM_CRYPT ~FUSE_FS ~CRYPTO ~CRYPTO_XTS"
-	linux-info_pkg_setup
-
-	local WX_GTK_VER="2.8"
-	if use X; then
-		need-wxwidgets unicode
-	else
-		need-wxwidgets base-unicode
-	fi
-}
-
-src_prepare() {
-	if has_version x11-libs/wxGTK[X]; then
-		# Fix linking when NOGUI=1
-		sed -e "s/WX_CONFIG_LIBS := base/&,core/" -i Main/Main.make || die "sed Main/Main.make failed"
-	fi
-
-	epatch "${FILESDIR}/makefile-archdetect.diff"
-	epatch "${FILESDIR}/execstack-fix.diff"
-	if ! has_version dev-libs/pkcs11-helper && \
-		has_version "=dev-libs/opensc-0.12*"; then
-		mkdir pkcs11 || die
-		cp "${WORKDIR}"/truecrypt-pkcs11.h pkcs11/pkcs11.h || die
-	fi
-}
-
-src_compile() {
-	local EXTRA pkcs11_include_directory
-
-	use X || EXTRA+=" NOGUI=1"
-
-	if has_version dev-libs/pkcs11-helper; then
-		pkcs11_include_directory="/usr/include/pkcs11-helper-1.0"
-	elif has_version "=dev-libs/opensc-0.12*"; then
-		pkcs11_include_directory="/usr/include/opensc"
-		append-flags -I"${S}"/pkcs11
-	else
-		pkcs11_include_directory="/usr/include/opensc"
-	fi
-	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
-
-	emake \
-		${EXTRA} \
-		NOSTRIP=1 \
-		NOTEST=1 \
-		VERBOSE=1 \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		TC_EXTRA_CFLAGS="${CFLAGS}" \
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		TC_EXTRA_LFLAGS="${LDFLAGS}" \
-		WX_CONFIG="${WX_CONFIG}" \
-		PKCS11_INC="${pkcs11_include_directory}" \
-		|| die "emake failed"
-}
-
-src_test() {
-	"${S}/Main/truecrypt" --text --test || die "tests failed"
-}
-
-src_install() {
-	dobin Main/truecrypt || die
-	dodoc Readme.txt "Release/Setup Files/TrueCrypt User Guide.pdf" || die
-	exeinto "/$(get_libdir)/rcscripts/addons"
-	newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh" || die
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN} || die
-
-	if use X; then
-		newicon Resources/Icons/TrueCrypt-48x48.xpm truecrypt.xpm || die
-		make_desktop_entry ${PN} "TrueCrypt" ${PN} "System" || die
-	fi
-
-	pax-mark -m "${D}/usr/bin/truecrypt" || die
-}
-
-pkg_postinst() {
-	elog "There is now an init script for TrueCrypt for Baselayout-2."
-	elog "If you are a baselayout-2 user and you would like the TrueCrypt"
-	elog "mappings removed on shutdown in order to prevent other file systems"
-	elog "from unmounting then run:"
-	elog "rc-update add truecrypt boot"
-	elog ""
-
-	ewarn "If you're getting errors about DISPLAY while using the terminal"
-	ewarn "it's a known upstream bug. To use TrueCrypt from the terminal"
-	ewarn "all that's necessary is to run: unset DISPLAY"
-	ewarn "This will make the display unaccessable from that terminal "
-	ewarn "but at least you will be able to access your volumes."
-	ewarn ""
-
-	ewarn "TrueCrypt has very restrictive license."
-	ewarn "Please read the ${LICENSE} license in ${PORTDIR}/licenses"
-	ewarn "directory before using TrueCrypt. Please be explicitly aware of"
-	ewarn "the limitations on redistribution of binaries or modified source."
-}
diff --git a/app-crypt/truecrypt/truecrypt-7.0a-r6.ebuild b/app-crypt/truecrypt/truecrypt-7.1.ebuild
index f991dbd8e7d2..eea6dca30c4a 100644
--- a/app-crypt/truecrypt/truecrypt-7.0a-r6.ebuild
+++ b/app-crypt/truecrypt/truecrypt-7.1.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-r6.ebuild,v 1.1 2011/07/15 17:53:07 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.1.ebuild,v 1.1 2011/12/07 17:06:56 c1pher Exp $
 
 EAPI="4"