--- /usr/portage/app-crypt/truecrypt/truecrypt-7.1a.ebuild	2013-12-08 21:01:03.000000000 +0100
+++ veracrypt/veracrypt-1.0f-r2.ebuild	2015-04-12 08:27:44.015200848 +0100
@@ -1,48 +1,51 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.1a.ebuild,v 1.7 2013/12/08 19:57:54 alonbl Exp $
+# $Header: $
 
 EAPI="4"
 
 inherit flag-o-matic linux-info multilib toolchain-funcs wxwidgets eutils pax-utils
 
+if [[ "${PR}" != "r0" ]]; then
+        my_release="-${PR:1}"
+else
+        my_release=""
+fi
+
 DESCRIPTION="Free open-source disk encryption software"
-HOMEPAGE="http://www.truecrypt.org/"
-SRC_URI="${P}.tar.gz
-	${P}-pkcs11.h"
+HOMEPAGE="http://www.veracrypt.org/"
+SRC_URI="
+	https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_${PV}${release}.tar.gz -> ${PF}.tar.gz
+	http://git.gnupg.org/cgi-bin/gitweb.cgi?p=scute.git;a=blob_plain;f=src/pkcs11.h;hb=38bdba0bb1ab93950489c645938c93ed577f9139 -> ${P}-pkcs11.h
+	"
 
+#### well, it's actually VeraCrypt license, which states "VeraCrypt is governed by the TrueCrypt License version 3.0"
 LICENSE="truecrypt-3.0"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~ppc ~x86"
 IUSE="X +asm"
-RESTRICT="mirror fetch bindist"
+RESTRICT="mirror bindist"
+
+WX_GTK_VER="3.0"
+
 
-RDEPEND=">=sys-fs/lvm2-2.02.45
+RDEPEND="
+	>=sys-fs/lvm2-2.02.45
 	sys-fs/fuse
-	x11-libs/wxGTK:2.8[X?]
-	app-admin/sudo"
-DEPEND="${RDEPEND}
-	!ppc? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${P}-source"
-
-#See bug 241650.
-pkg_nofetch() {
-	elog "Please download the source archive \"TrueCrypt ${PV} Source.tar.gz\" from:"
-	elog "http://www.truecrypt.org/downloads2"
-	elog "Then put the file in ${DISTDIR}/${P}.tar.gz"
-
-	# until we support restricted fetch per URI
-	elog ""
-	elog "Please execute:"
-	elog "curl 'http://git.gnupg.org/cgi-bin/gitweb.cgi?p=scute.git;a=blob_plain;f=src/pkcs11.h;hb=38bdba0bb1ab93950489c645938c93ed577f9139' > ${DISTDIR}/${P}-pkcs11.h"
-}
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	"
+DEPEND="
+	${RDEPEND}
+	!ppc? ( dev-lang/nasm )
+	"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
 
 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
@@ -58,7 +61,9 @@
 
 	epatch "${FILESDIR}/makefile-archdetect.diff"
 	epatch "${FILESDIR}/execstack-fix.diff"
-	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-1.Makefile.patch"
+	epatch "${FILESDIR}/remove-packaging-from-makefile.patch"
+
 	mkdir "${T}"/pkcs11 || die
 	ln -s "${DISTDIR}"/${P}-pkcs11.h "${T}"/pkcs11/pkcs11.h || die
 }
@@ -87,40 +92,40 @@
 }
 
 src_test() {
-	"${S}/Main/truecrypt" --text --test || die "tests failed"
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
 }
 
 src_install() {
-	dobin Main/truecrypt
-	dodoc Readme.txt "Release/Setup Files/TrueCrypt User Guide.pdf"
+	dobin Main/veracrypt
+	dodoc Readme.txt "Release/Setup Files/VeraCrypt User Guide.pdf"
 	exeinto "/$(get_libdir)/rcscripts/addons"
 	newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh"
 
 	newinitd "${FILESDIR}/${PN}.init" ${PN}
 
 	if use X; then
-		newicon Resources/Icons/TrueCrypt-48x48.xpm truecrypt.xpm
-		make_desktop_entry ${PN} "TrueCrypt" ${PN} "System"
+		newicon Resources/Icons/VeraCrypt-48x48.xpm veracrypt.xpm
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "System"
 	fi
 
-	pax-mark -m "${D}/usr/bin/truecrypt"
+	pax-mark -m "${D}/usr/bin/veracrypt"
 }
 
 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 "There is an init script for VeraCrypt for Baselayout-2."
+	elog "If you are a baselayout-2 user and you would like the VeraCrypt"
 	elog "mappings removed on shutdown in order to prevent other file systems"
 	elog "from unmounting then run:"
-	elog "rc-update add truecrypt boot"
+	elog "rc-update add veracrypt 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 "it's a known upstream bug. To use VeraCrypt 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 a very restrictive license. Please be explicitly aware"
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
 	ewarn "of the limitations on redistribution of binaries or modified source."
 }