Solve gentoo mirror breakage due to restrict fetch, bug#434458

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

3 files changed, 15 insertions, 22 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 2cbfe24a4ee5..137e063ddacd 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/truecrypt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.71 2012/08/02 18:25:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.72 2012/12/14 22:26:47 alonbl Exp $
+
+  14 Dec 2012;  <alonbl@gentoo.org> truecrypt-7.1a.ebuild:
+  Solve gentoo mirror breakage due to restrict fetch, bug#434458
 
   02 Aug 2012; Tim Harder <radhermit@gentoo.org> truecrypt-7.1a.ebuild:
   Remove PORTDIR from license warning (bug #416737).
@@ -365,4 +368,3 @@
   05 Jun 2006; Daniel Black <dragonheart@gentoo.org>
   +files/truecrypt-4.2-makefile.patch, +metadata.xml, +truecrypt-4.2.ebuild:
   initial ebuild as per bug #112197 largely based off ebuild by Greg Tassone
-
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index 03b1a0e66ec1..69ceff4f58b9 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -1,23 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX execstack-fix.diff 1955 SHA256 227c8e0bb04bd5f6915fc2570fbcbf1cca704b4b818bc5de283653197309a5fb SHA512 c64f9255303a521b4e531ebea574befe80a9f193c9aa42fd9cb552e56d087815ca161b50b593e7c3ede10a65c67dc36d0447dbffb0f4d4614f181a95759c2f79 WHIRLPOOL d1bcd4e09d7fccb2b10bdf53e21bff7da8dbce7b361c24ae6e8a9ab3fe772e9896d98068bfc7b6962186c010c956b73aad7da6d62fdc819205f66983888687ec
 AUX makefile-archdetect.diff 266 SHA256 aa201bb7c93852c814d71c963b1d416d62aa2d1e685f9f5149b1388dca9ae883 SHA512 68102ff27708df26b1844ed969d98d05f18782164ca349138a304ff69730560c544783c4544067eec90965e41e7fab8bb8eff4885787593840f44f7f0011769d WHIRLPOOL 0d11b8bfd85532067973aa07bd4f70489b3b22f6fb33c9c699b5ef30e504e57e60bbf8820bd414640d6f0943fb83b8528d61757bb77aacd66c4670ef4f3a3f22
 AUX truecrypt-stop.sh 308 SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c SHA512 d524fd0eb957ce6ea72590b6ddd0501f911e0ec4abdc4a9add34c021b6fa8bd65747c2dd9fd19bea8c093ec0df5d4a418f44c770e1e2dfaab6fede21de9b061d WHIRLPOOL 1829a4ffb28fa127ec5944492205c16c564e1fbb8874bc497e61576edf015c74b4c47f0792e94b6c05c5b251f058879ff76ee5a71572d566b53fd4c165538a7d
 AUX truecrypt.init 729 SHA256 6530577c5f86800a7d92a76b927538006a27f57cf517c6f2bdb793cebaa70b59 SHA512 0bb428457c5c5f5a5f5979291edbdba5fea6461e8a8103deab484b52746f677fd6e337650770eff8e52f7656d22436348d3589f60a17d2ec560be38d4b5028e3 WHIRLPOOL 3e3489fdf1cc4101e3ecb4a75f7f50d7d83fb89c43da72dca8daa8f7fd36901faf4ad1494a1e67d17f3d251d1b4e92383acb6a29d286c2ae0fde021c93b82960
+DIST truecrypt-7.1a-pkcs11.h 43544 SHA256 662d39cec5a0063c8aacc430d4fcba4b31b80a174f1e824dcc359f1c1420bc2c SHA512 bffce5344383a07c4313c30ee1cb0ed7063a749527521bd964263deb5d951cc181acf9c4386bcd2ad44d40be35b3a08d56b1404730b4994e43760db71649ef3c WHIRLPOOL bc5bfbcf711f8d8d8f13625bd2ea98b195662ca458b9186a6a1a01f51897ba1e9a488b91ddfec97af7fdbb770637db27b5c124ba5fa376a415c512af3c6aac74
 DIST truecrypt-7.1a.tar.gz 1949303 SHA256 e6214e911d0bbededba274a2f8f8d7b3f6f6951e20f1c3a598fc7a23af81c8dc SHA512 b5e766023168015cb91bfd85c9e2621055dd98408215e02704775861b5070c5a0234a00c64c1bf7faa34e6d0b51ac71cd36169dd7a6f84d7a34ad0cfa304796a WHIRLPOOL 5e7f4360746a30639aea96eaf4deac268289c111c0efa96f50487527f04064992c26ad4c8ae0fd565d80e77f0ce8add82b03930d877fe5adedc8a733b482fe38
-DIST truecrypt-pkcs11.h.bz2 8286 SHA256 9e7782dd93f7e37fc0eaa118f9fbce7c643555e134fd39f2076e0fc541ac3494 SHA512 06467f6887536e51316d2f1a64604dbde866ef581eda3e53f8ec9acdad689d9b3a7b1c1b439349b1a15988c724377a5049812b7f939f647758d0109f36c7028d WHIRLPOOL f686a492155e9ced0297e31b3581907c92fe89617e06a055f6562998f30058975e8773d2fb9e66cacc55decf2eb44923f7bcf2e95024e807442d3fc6b68739c9
-EBUILD truecrypt-7.1a.ebuild 3322 SHA256 e0b2de75a2bee8cf14cdfdbbe39aa62ad06e0c1e498da2d479c9473031074396 SHA512 78ba29dfe85470e87c159437133f1b5d64c61c064d927e9087937dc9e2bcfef04148bda14c0b0ad9b1653cf5c386b9885ca7310a14bb8fd3c78783ed157a3f06 WHIRLPOOL c2ae4f22efabdc36e72372506e662f35cc5841fe689ecb9b48fa9a5f9263f32184f5718b901ff209a6b07bdcb859e917462af699313804dbf19e82087d1866d5
-MISC ChangeLog 13942 SHA256 a4a201aa36dbb1302daa72cc03cd71644c96bf29c44e4eaffa1512f17785c418 SHA512 6a2d73ae2dd3f3597009aa85671026d16258c4659b9bcf60887253d5317714097ee816f77c19f48f0bd20c0fd878d6628ab49974e0489ebde11c1dc397a388f0 WHIRLPOOL 483a4c7615d7c4270919bdb1dec4eaf3ddcc4ecadd01f87a04668b2cb70d9bd9fb364878cbed09d11a48db4da3645a34c0710bbd370e193893736a190b29606f
+EBUILD truecrypt-7.1a.ebuild 3538 SHA256 a216fd9e877132a12cd4042879e5f2fc42310dc318f701022a4e6ed6b467e533 SHA512 18edb83b8b7d8ba28c5d97905196faa1034dfa4a78ab55903caa5a6e9be9fabccfa0b4d43edcfdc9bbf7883bad2a430fcf7b156fa8de6509090c1d2061a56312 WHIRLPOOL cc0df57c094e8547a5c1e7c5996ceae54824d9078f44021f8d2f40a076aa49afff85ffd6ca59d497bd62c765404ebdfc4fbb9522401585d2adecd0ec0459e024
+MISC ChangeLog 14063 SHA256 6f4add2af852af8c080cc7d2732c774fa3824a4b822c909cabb6d263ac3f1ce0 SHA512 de4c044dcc0162d8a824d182746c9fd2442270194b19c3fd78301a6c33e46dcfbb509c828270940f9b5f8746aa61a6ef28a6411753b384900e04671d4678de66 WHIRLPOOL e4e2d1c207c49c59928fb2682796a56dc58775c5a678b55d461b332a1e0ebeaf9027294d1d13e03936c31c789d5b9ad510ee6a4190ee73d1976475bdf4187105
 MISC metadata.xml 250 SHA256 c4dab52dbdf0558df59853ea282e0b1deb4cb968914468a648070dcd31a456d8 SHA512 73912ce8a65b144a8c2197aabe97ad7374bc6908de24c2e11098faf71ceaf7c445c1f66dff85ffec8f3c3d0d157ba18b53b24f6ace3c9f779cbab0c1ff854023 WHIRLPOOL 8f6b296710c9161c7575f94cf9cc8dbc5678f2fabd39c2867c0c4485572cfae0616217ae8de011cc25f7e2862819ade6a28e887cb73ed6a96c9a1224aef13a3d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQGsYGAAoJEEqz6FtPBkyjc4sH/inOMnv2VbfqlLWbjnJjfJcY
-0VNQHKfk145hGZ2f3QItogL5Tra7GNFUmO7JtsnsEQ4mdVJquy77doYdA88dikis
-B0g4KP60zha5GMw4cQqDqAfqMRuSFs/G947Rcfvk8k0gNSmBiBlE8uzJjjLL0p3m
-o6BiSdytSKTtQqtAu/IBBCPEk2KOfOp6PILCWm7scjBM3/SD7G7G475ze3wJlTYK
-2zgmqOltxx2uPClQNrA2hKPRfCWVBy/TzvvBMg6KHWGM3owdxi6jYi44y5/dHZJl
-6/EUm/R2hhDOIShfJqzrMvzLQkHUN4sPuxKDGO57u5PP/7dHiunzDuO+xzKBgy8=
-=Qzmf
------END PGP SIGNATURE-----
diff --git a/app-crypt/truecrypt/truecrypt-7.1a.ebuild b/app-crypt/truecrypt/truecrypt-7.1a.ebuild
index c4ac9f3b9a05..e256009b019a 100644
--- a/app-crypt/truecrypt/truecrypt-7.1a.ebuild
+++ b/app-crypt/truecrypt/truecrypt-7.1a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.3 2012/08/02 18:25:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.1a.ebuild,v 1.4 2012/12/14 22:26:47 alonbl Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ inherit flag-o-matic linux-info multilib toolchain-funcs wxwidgets eutils pax-ut
 DESCRIPTION="Free open-source disk encryption software"
 HOMEPAGE="http://www.truecrypt.org/"
 SRC_URI="${P}.tar.gz
-	mirror://gentoo/${PN}-pkcs11.h.bz2"
+	${P}-pkcs11.h"
 
 LICENSE="truecrypt-3.0"
 SLOT="0"
@@ -31,6 +31,11 @@ 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"
 }
 
 pkg_setup() {
@@ -54,7 +59,7 @@ src_prepare() {
 	epatch "${FILESDIR}/makefile-archdetect.diff"
 	epatch "${FILESDIR}/execstack-fix.diff"
 	mkdir "${T}"/pkcs11 || die
-	ln -s "${WORKDIR}"/truecrypt-pkcs11.h "${T}"/pkcs11/pkcs11.h || die
+	ln -s "${DISTDIR}"/${P}-pkcs11.h "${T}"/pkcs11/pkcs11.h || die
 }
 
 src_compile() {