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

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

5 files changed, 24 insertions, 277 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/Manifest b/app-crypt/truecrypt/Manifest
index 1d01113ff9fb..883cdbc3c46f 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -5,27 +5,25 @@ AUX execstack-fix.diff 1955 RMD160 bac693c2ef2029f3d3ba8fb6fb5943404108c085 SHA1
 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
+DIST truecrypt-7.1.tar.gz 1950519 RMD160 b01cbbd764c403dbd6d2e7f30044894c233c01f7 SHA1 b46c0fa5e1cbad25197b02d5232f5355b7abb1c9 SHA256 94815d6c72f36fb194fc53d2527088f3bf7060797530f7eafd63d1b9596fd9f4
 DIST truecrypt-pkcs11.h.bz2 8286 RMD160 15c22390f81a1cb0bfd6699b08acd84cffad9bae SHA1 59d02f97c565f006f2265ff0f4c9a23c3323bff8 SHA256 9e7782dd93f7e37fc0eaa118f9fbce7c643555e134fd39f2076e0fc541ac3494
-EBUILD truecrypt-7.0a-r2.ebuild 3458 RMD160 0f1d3b6d529fa89809ca4944cae0e292c015f1a2 SHA1 e8c8aea3b7800df23498096dc485c9ae8a7a62e2 SHA256 0088a216a26381427e8de29354a7a1ad1b5fe28a80192bb7bc71d64f4d89df69
-EBUILD truecrypt-7.0a-r5.ebuild 3956 RMD160 fa4f8cad6b926b46b42523ede3dca3d808964b50 SHA1 ece0bfb7df34d6298fd717e82a1eb52e2c5f4ed3 SHA256 6ddff384a1adc857d428271da21623dd9808905872a3742709928b2a94b1a237
-EBUILD truecrypt-7.0a-r6.ebuild 3420 RMD160 1cbb84a4e028ea12d1bcf1676160c3909ba6f5ad SHA1 099f4f2322c5567c0614691f4a8da9743f7df8a3 SHA256 e00e6cd23a93066d08212e41fe95f48a907b2956434c2e2a7af0b722552f0b13
-MISC ChangeLog 13186 RMD160 83d7695b02300b8b69f46e8ced0fd3efc584ce74 SHA1 e6af15a2f8f3f3a29fcd80918c986a0b76abb1c7 SHA256 04ee1cc8932d06f33b7970ca32ab4f096e24292935214b91168aaee3a2c1de48
+EBUILD truecrypt-7.1.ebuild 3416 RMD160 7845d58e46d8ebfd6bfcc1724a05038428069c55 SHA1 57bf7ea800b0162be4092ad186c31dbdb502853c SHA256 d92ac1af692824449a905bd7e1879e829c1652ee1c65939b66a8948880011ef1
+MISC ChangeLog 13425 RMD160 d9902f7482b3eb2e059750f45523ef83431e8958 SHA1 090bfbc325cfcdd7304cb7937978eada009d70ae SHA256 152b379349dff71924b1258c9258f6680accfc98cf47d77fab3de9f273e1f52a
 MISC metadata.xml 250 RMD160 0ed9b992d346dffc7427a6f36ad6db15f099542f SHA1 906ae1d1afaf4c06a5b54cf7e25843dbac2bb5ba SHA256 c4dab52dbdf0558df59853ea282e0b1deb4cb968914468a648070dcd31a456d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOIH52AAoJEEsurZwMLhUx48YQAL+fhyC1zlZabQgjZRB0KpKb
-g9reeFklANzidOwfHtO15lONzPn/2RD8kXAj9ZzJL2ewYGsi9lwfYSlRJrkAagPV
-uJMfMS/lT6r1w4As5MXZbKg1TpjYic7411VHVc7m1jBQe9RgWgbdryd08nwoeU8N
-zXQWBc83jqSNwxaeudX45PU3GnaxGgu8yyOwmm3EDzfmbF3IaJrfI9Ee0VhL0bXP
-FqMtfRT7l0L/bUr50gwpA+Xl1vwXKKk81WOK2yGlXz4y5AL5OPb9Qeu89eUdA+6X
-oImlHefXNBtoMrM3E71YAHjsVuuo+GDHOh60GYfCSv5xSWdyrZfvKusMAeJ6xwDm
-+OBEleGyMUEkgfCqtaPxiRYGmJZppsfnHjBUluWJ0MX92xoG+h44fffh666YDISs
-VlKTKD/Ac1U8OmbuqUdQJOZKFHFa3zNkMDAAqsKaQ79YmzF6Q14xbmgHp+fL18Yc
-7S2kbWD11Y8dryiSe3UNn37ygpdtNEpm2ubPjOzeIhOXBAc8KtOo9sEt7dqHh3zu
-MP2kzJDJtthVbnq7n4C+CNf9mB4Ja0zsc5YvAHPrO0vybrktOtsMtG3k1q+5Al+1
-E32HQHpB1MGDlSGLK/iReYwZWoTEvjeiG/h3GYk5IWdR3SR8AmpKq93RTvMacvmr
-+mPtWmF6K/UnVTZmOqZ3
-=l7Pi
+iQIcBAEBCAAGBQJO351fAAoJEDhV2qHwDPIG674P/0mUK6SWX/LrN/Mvvrls0x0p
+Oieva1956B/ikd25vcoKSgVK7m0qTiU/QYIDZufFoDBHmxcBWTKH4LLuD1mRxc0D
+q0sFblnXMUd2ns5zby/eowqJGyd24X85jMticQu876uM0dHqgiAyuwVQEq4Xa/Ad
+D3475iYVtX9dIOq2fwStB4DA5PIv05Tm/qpuQopv13IpORet7183hfxj0zyJTTXb
+SS6nle4tpYEwSjGSf3J5S+nR/vpwpcFPacZHUkQtVYVxMMjZWrJuh2/dPy6VfNyg
+IgWPVPslw3vbuaEzVRjF9LcO9f8SSBf1egWckC4PmBUxe6dNhsW4ylvaiF1TGdwI
+RybSi40P7DP4aSUJjxDbIGIY6CXih6w/bIGcyzaZFLBBz8a+ZWzC2OXr9BLYMybH
+L2BaKRgeh1POQXTJImypDg3fEo+Qxqg68SpmHnypaKMbYT+mkieKaFlAn567ECed
+8i54uBV4QHlTdOvEn6RupT56ERZeQUaNA8gNtLkad5LEMNJ/ZvY7oPxQ43QWvn+z
+l5zoqTlywJKwav0gMMK7RIhG/H9DiRFNx2dILml2JUAQg3kvFhb4Ggs5Kfx0eMUE
+Yei21qONBdMDiiKLDJkqcjWr7BBYyPiv0kVYv6y5tMehJvjH5jwBcxul9+pcnfpu
+lFSQYAsEjGc/JQJKj6bU
+=lSuG
 -----END PGP SIGNATURE-----
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"