From f885b708ebc5effedafc5c87df00ee55fcf7fd37 Mon Sep 17 00:00:00 2001
From: Brian Harring <ferringb@gentoo.org>
Date: Sat, 7 Jan 2006 23:46:57 +0000
Subject: look ma, I'm touching eclasses! introducing PORTAGE_ACTUAL_DISTDIR
 support for bug 117440, DISTDIR symlink indirection (blocks all unstated
 access to DISTDIR). Also breaks these eclasses since they have unstated
 access...

---
 eclass/cvs.eclass        | 4 ++--
 eclass/horde.eclass      | 4 ++--
 eclass/subversion.eclass | 4 ++--
 eclass/vim.eclass        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'eclass')

diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index 19449d1d7e85..c077cb39c960 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.62 2005/12/24 04:57:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.63 2006/01/07 23:46:57 ferringb Exp $
 
 inherit eutils
 
@@ -64,7 +64,7 @@ inherit eutils
 # ECVS_TOP_DIR -- The directory under which CVS modules are checked
 # out.
 
-[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
+[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src"
 
 # ECVS_SERVER -- CVS path
 #
diff --git a/eclass/horde.eclass b/eclass/horde.eclass
index 759a725ca755..42c03f4e8391 100644
--- a/eclass/horde.eclass
+++ b/eclass/horde.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/horde.eclass,v 1.26 2005/12/13 03:17:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/horde.eclass,v 1.27 2006/01/07 23:46:57 ferringb Exp $
 #
 # Help manage the horde project http://www.horde.org/
 #
@@ -40,7 +40,7 @@ if [[ ${PN} != ${PN/-cvs} ]] ; then
 
 	ECVS_SERVER="anoncvs.horde.org:/repository"
 	ECVS_MODULE="${HORDE_PN}"
-	ECVS_TOP_DIR="${DISTDIR}/cvs-src/${PN}"
+	ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src/${PN}"
 	ECVS_USER="cvsread"
 	ECVS_PASS="horde"
 
diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
index a6704a43128b..6b652fb498d0 100644
--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.25 2005/12/24 14:18:18 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.26 2006/01/07 23:46:57 ferringb Exp $
 
 ## --------------------------------------------------------------------------- #
 # Author: Akinori Hattori <hattya@gentoo.org>
@@ -32,7 +32,7 @@ DEPEND="dev-util/subversion"
 
 ## -- ESVN_STORE_DIR:  subversion sources store directory
 #
-ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src"
 
 
 ## -- ESVN_FETCH_CMD:  subversion fetch command
diff --git a/eclass/vim.eclass b/eclass/vim.eclass
index ef36b7ce7ca5..7da3366b0ebc 100644
--- a/eclass/vim.eclass
+++ b/eclass/vim.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.137 2005/12/24 21:20:14 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.138 2006/01/07 23:46:57 ferringb Exp $
 
 # Authors:
 # 	Ryan Phillips <rphillips@gentoo.org>
@@ -240,7 +240,7 @@ vim_src_unpack() {
 		else
 			ECVS_MODULE="vim"
 		fi
-		ECVS_TOP_DIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
+		ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src/${ECVS_MODULE}"
 		cvs_src_unpack
 
 	else
-- 
cgit v1.2.3-65-gdbad